You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/09/30 12:27:36 UTC
svn commit: r292694 - in /myfaces/sandbox/trunk: conf/faces-config.xml
src/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java
Author: mmarinschek
Date: Fri Sep 30 03:27:30 2005
New Revision: 292694
URL: http://svn.apache.org/viewcvs?rev=292694&view=rev
Log:
fixed component, renderer statement in faces-config.
Modified:
myfaces/sandbox/trunk/conf/faces-config.xml
myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java
Modified: myfaces/sandbox/trunk/conf/faces-config.xml
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/conf/faces-config.xml?rev=292694&r1=292693&r2=292694&view=diff
==============================================================================
--- myfaces/sandbox/trunk/conf/faces-config.xml (original)
+++ myfaces/sandbox/trunk/conf/faces-config.xml Fri Sep 30 03:27:30 2005
@@ -45,18 +45,23 @@
</component>
<component>
+ <component-type>org.apache.myfaces.HtmlAccordionPanel</component-type>
+ <component-class>org.apache.myfaces.custom.accordion.HtmlAccordionPanel</component-class>
+ </component>
+
+ <component>
<component-type>org.apache.myfaces.HtmlForm</component-type>
<component-class>org.apache.myfaces.custom.form.HtmlForm</component-class>
- </component>
-
- <component>
- <component-type>org.apache.myfaces.Fieldset</component-type>
- <component-class>org.apache.myfaces.custom.fieldset.Fieldset</component-class>
- </component>
-
- <component>
- <component-type>org.apache.myfaces.GraphicImageDynamic</component-type>
- <component-class>org.apache.myfaces.custom.graphicimagedynamic.GraphicImageDynamic</component-class>
+ </component>
+
+ <component>
+ <component-type>org.apache.myfaces.Fieldset</component-type>
+ <component-class>org.apache.myfaces.custom.fieldset.Fieldset</component-class>
+ </component>
+
+ <component>
+ <component-type>org.apache.myfaces.GraphicImageDynamic</component-type>
+ <component-class>org.apache.myfaces.custom.graphicimagedynamic.GraphicImageDynamic</component-class>
</component>
<!-- sandbox converters -->
@@ -102,31 +107,37 @@
<renderer>
<component-family>javax.faces.Data</component-family>
<renderer-type>org.apache.myfaces.AutoUpdateDataTable</renderer-type>
-<!-- <renderer-class>org.apache.myfaces.renderkit.html.ext.HtmlTableRenderer</renderer-class> -->
<renderer-class>org.apache.myfaces.custom.autoupdatedatatable.AutoUpdateDataTableRenderer</renderer-class>
</renderer>
+ <renderer>
+ <component-family>javax.faces.Panel</component-family>
+ <renderer-type>org.apache.myfaces.AccordionPanel</renderer-type>
+ <renderer-class>org.apache.myfaces.custom.accordion.HtmlAccordionPanelRenderer</renderer-class>
+ </renderer>
+
+
<renderer>
<component-family>javax.faces.Form</component-family>
<renderer-type>org.apache.myfaces.Form</renderer-type>
<renderer-class>org.apache.myfaces.custom.form.HtmlFormRenderer</renderer-class>
</renderer>
-
- <renderer>
- <component-family>javax.faces.Output</component-family>
- <renderer-type>org.apache.myfaces.FieldsetRenderer</renderer-type>
- <renderer-class>org.apache.myfaces.custom.fieldset.FieldsetRenderer</renderer-class>
- </renderer>
-
- <renderer>
- <component-family>javax.faces.Graphic</component-family>
- <renderer-type>org.apache.myfaces.GraphicImageDynamicRenderer</renderer-type>
- <renderer-class>org.apache.myfaces.custom.graphicimagedynamic.GraphicImageDynamicRenderer</renderer-class>
+
+ <renderer>
+ <component-family>javax.faces.Output</component-family>
+ <renderer-type>org.apache.myfaces.FieldsetRenderer</renderer-type>
+ <renderer-class>org.apache.myfaces.custom.fieldset.FieldsetRenderer</renderer-class>
+ </renderer>
+
+ <renderer>
+ <component-family>javax.faces.Graphic</component-family>
+ <renderer-type>org.apache.myfaces.GraphicImageDynamicRenderer</renderer-type>
+ <renderer-class>org.apache.myfaces.custom.graphicimagedynamic.GraphicImageDynamicRenderer</renderer-class>
</renderer>
</render-kit>
<lifecycle>
- <phase-listener>org.apache.myfaces.custom.ajax.api.AjaxPhaseListener</phase-listener>
+ <phase-listener>org.apache.myfaces.custom.ajax.api.AjaxPhaseListener</phase-listener>
<phase-listener>org.apache.myfaces.custom.graphicimagedynamic.GraphicImageDynamicPhaseListener</phase-listener>
</lifecycle>
Modified: myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java?rev=292694&r1=292693&r2=292694&view=diff
==============================================================================
--- myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java (original)
+++ myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/accordion/HtmlAccordionPanelRenderer.java Fri Sep 30 03:27:30 2005
@@ -122,11 +122,10 @@
String javascriptLocation = (String)component.getAttributes().get(JSFAttr.JAVASCRIPT_LOCATION);
+ AddResource.addJavaScriptToHeader(HtmlAccordionPanelRenderer.class, javascriptLocation, "dpdump.js", false, context);
AddResource.addJavaScriptToHeader(HtmlAccordionPanelRenderer.class, javascriptLocation, "prototype.js", false, context);
AddResource.addJavaScriptToHeader(HtmlAccordionPanelRenderer.class, javascriptLocation, "rico.js", false, context);
AddResource.addJavaScriptToHeader(HtmlAccordionPanelRenderer.class, javascriptLocation, "toggler.js", false, context);
- AddResource.addJavaScriptToHeader(HtmlAccordionPanelRenderer.class, javascriptLocation, "controls.js", false, context);
- AddResource.addJavaScriptToHeader(HtmlAccordionPanelRenderer.class, javascriptLocation, "myFaces.js", false, context);
context.getExternalContext().getRequestMap().put(JAVASCRIPT_ENCODED, Boolean.TRUE);
}