JBoss Rich Faces SVN: r8211 - trunk/ui/gmap/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-26 07:33:11 -0400 (Sat, 26 Apr 2008)
New Revision: 8211
Modified:
trunk/ui/gmap/src/main/config/component/gmap.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
http://jira.jboss.com/jira/browse/RF-2220
Corrected language and added default values
Modified: trunk/ui/gmap/src/main/config/component/gmap.xml
===================================================================
--- trunk/ui/gmap/src/main/config/component/gmap.xml 2008-04-26 11:33:00 UTC (rev 8210)
+++ trunk/ui/gmap/src/main/config/component/gmap.xml 2008-04-26 11:33:11 UTC (rev 8211)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
">
<components>
@@ -34,7 +34,7 @@
<name>gmapKey</name>
<classname>java.lang.String</classname>
<description>
- Google Map key. A single Maps API key is valid for a single "directory" on your web server
+ Google Map key. A single Map API key is valid for a single "directory" on your web server. Default value is "internal".
</description>
<defaultvalue>"internal"</defaultvalue>
</property>
@@ -52,7 +52,7 @@
<description>
The JavaScript variable that is used to access the Google Map API. If you have
more than one Google Map components on the same page, use individual
- key for each of them. The default variable name is "map" (without quotes)
+ key for each of them. The default variable name is "map" (without quotes).
</description>
<defaultvalue>"map"</defaultvalue>
</property>
@@ -60,7 +60,7 @@
<name>lat</name>
<classname>java.lang.String</classname>
<description>
- Initial latitude coordinate in degrees, as a number between -90 and +90
+ Initial latitude coordinate in degrees, as a number between -90 and +90. Default value is "37.9721046".
</description>
<defaultvalue>"37.9721046"</defaultvalue>
</property>
@@ -68,7 +68,7 @@
<name>lng</name>
<classname>java.lang.String</classname>
<description>
- Initial longitude coordinate in degrees, as a number between -180 and +180
+ Initial longitude coordinate in degrees, as a number between -180 and +180. Default value is "-122.0424842834".
</description>
<defaultvalue>"-122.0424842834"</defaultvalue>
</property>
@@ -76,7 +76,7 @@
<name>zoom</name>
<classname>java.lang.String</classname>
<description>
- Initial zoom level as a number between 1 and 18. The default value is 17
+ Initial zoom level as a number between 1 and 18. Default value is "17".
</description>
<defaultvalue>"17"</defaultvalue>
</property>
@@ -85,7 +85,7 @@
<classname>java.lang.String</classname>
<description>
Initial map type. The possible values are G_NORMAL_MAP, G_SATELLITE_MAP,
- G_HYBRID_MAP. The default value is G_SATELLITE_MAP
+ G_HYBRID_MAP. Default value is "G_SATELLITE_MAP".
</description>
<defaultvalue>"G_SATELLITE_MAP"</defaultvalue>
</property>
@@ -94,7 +94,7 @@
<classname>java.lang.String</classname>
<description>
The warning message that appears if a browser is not compatible with Google Map.
- The default value is "Your browser does not support Google Maps"
+ Default value is "Your browser does not support Google Maps".
</description>
<defaultvalue>"Your browser does not support Google Maps"</defaultvalue>
</property>
@@ -102,7 +102,7 @@
<name>showGMapTypeControl</name>
<classname>java.lang.String</classname>
<description>
- Shows the Type switch control. The default value is "true"
+ Shows the Type switch control. Default value is "true".
</description>
<defaultvalue>"true"</defaultvalue>
</property>
@@ -110,7 +110,7 @@
<name>showGScaleControl</name>
<classname>java.lang.String</classname>
<description>
- It shows the scale control. The default value is "true"
+ It shows the scale control. Default value is "true".
</description>
<defaultvalue>"true"</defaultvalue>
</property>
@@ -118,7 +118,7 @@
<name>showGLargeMapControl</name>
<classname>java.lang.String</classname>
<description>
- Shows the GLarge control. The default value is "true"
+ Shows the GLarge control. Default value is "true".
</description>
<defaultvalue>"true"</defaultvalue>
</property>
@@ -126,7 +126,7 @@
<name>enableDragging</name>
<classname>java.lang.String</classname>
<description>
- Enables a map dragging with the mouse. The default value is "true"
+ Enables a map dragging with the mouse. Default value is "true".
</description>
<defaultvalue>"true"</defaultvalue>
</property>
@@ -134,7 +134,7 @@
<name>enableInfoWindow</name>
<classname>java.lang.String</classname>
<description>
- Enables Info Window. The default value is "true"
+ Enables Info Window. Default value is "true".
</description>
<defaultvalue>"true"</defaultvalue>
</property>
@@ -142,7 +142,7 @@
<name>enableDoubleClickZoom</name>
<classname>java.lang.String</classname>
<description>
- Enables zooming in by a double click. The default value is "false"
+ Enables zooming in by a double click. Default value is "false".
</description>
<defaultvalue>"false"</defaultvalue>
</property>
@@ -150,7 +150,7 @@
<name>enableContinuousZoom</name>
<classname>java.lang.String</classname>
<description>
- Enables continuous smooth zooming for selected browsers. The default value is "false"
+ Enables continuous smooth zooming for selected browsers. Default value is "false".
</description>
<defaultvalue>"false"</defaultvalue>
</property>
16 years, 9 months
JBoss Rich Faces SVN: r8210 - trunk/ui/fileUpload/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-26 07:33:00 -0400 (Sat, 26 Apr 2008)
New Revision: 8210
Modified:
trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
http://jira.jboss.com/jira/browse/RF-2220
Corrected language and added default values
Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-04-26 11:32:51 UTC (rev 8209)
+++ trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-04-26 11:33:00 UTC (rev 8210)
@@ -91,7 +91,7 @@
<property>
<name>maxFilesQuantity</name>
<classname>java.lang.Integer</classname>
- <description>Defines max files count allowed for upload (optional).</description>
+ <description>Defines max files count allowed for upload (optional). Default value is "1".</description>
<defaultvalue>1</defaultvalue>
</property>
<property>
@@ -176,7 +176,7 @@
<name>listWidth</name>
<classname>java.lang.String</classname>
<description>
- Defines width of file list
+ Defines width of file list. Default value is "400px".
</description>
<defaultvalue>"400px"</defaultvalue>
</property>
@@ -184,7 +184,7 @@
<name>listHeight</name>
<classname>java.lang.String</classname>
<description>
- Defines height of file list
+ Defines height of file list. Default value is "210px".
</description>
<defaultvalue>"210px"</defaultvalue>
</property>
@@ -192,7 +192,8 @@
<name>disabled</name>
<classname>boolean</classname>
<description>
- Attribute 'disabled' provides possibility to make the whole component disabled if its value equals to "true".
+ Attribute 'disabled' provides a possibility to make the whole component disabled if its value equals to "true".
+ Default value is "false".
</description>
<defaultvalue>false</defaultvalue>
</property>
@@ -200,7 +201,8 @@
<name>autoclear</name>
<classname>boolean</classname>
<description>
- If this attribute is true files will be immediatelly removed from list after upload completed
+ If this attribute is "true" files will be immediately removed from list after upload completed.
+ Default value is "false".
</description>
<defaultvalue>false</defaultvalue>
</property>
@@ -208,7 +210,8 @@
<name>immediateUpload</name>
<classname>boolean</classname>
<description>
- If this attribute is true files will be immediatelly uploaded after they have been added in list
+ If this attribute is true files will be immediately uploaded after they have been added in list.
+ Default value is "false".
</description>
<defaultvalue>false</defaultvalue>
</property>
@@ -216,7 +219,8 @@
<name>noDuplicate</name>
<classname>boolean</classname>
<description>
- Defines if component should allow to add files that was already in list
+ Defines if component should allow to add files that were already in list. Default value is "false".
+
</description>
<defaultvalue>false</defaultvalue>
</property>
@@ -337,7 +341,7 @@
<classname>boolean</classname>
<description>
If this attribute set up in true upload request will be like as single.
- No components value in form will be updated after file uploaded.
+ No components value in form will be updated after file uploaded. Default value is "false".
</description>
<defaultvalue>false</defaultvalue>
</property>
16 years, 9 months
JBoss Rich Faces SVN: r8209 - trunk/ui/effect/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-26 07:32:51 -0400 (Sat, 26 Apr 2008)
New Revision: 8209
Modified:
trunk/ui/effect/src/main/config/component/effect.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
http://jira.jboss.com/jira/browse/RF-2220
Corrected language and added default values
Modified: trunk/ui/effect/src/main/config/component/effect.xml
===================================================================
--- trunk/ui/effect/src/main/config/component/effect.xml 2008-04-26 11:32:37 UTC (rev 8208)
+++ trunk/ui/effect/src/main/config/component/effect.xml 2008-04-26 11:32:51 UTC (rev 8209)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
">
<components>
@@ -81,7 +81,7 @@
<name>disableDefault</name>
<classname>boolean</classname>
<description>
- <![CDATA[Disable default action for target event ( append "return false;" to javascript )]]>
+ <![CDATA[Disable default action for target event ( append "return false;" to javascript ). Default value is "false". ]]>
</description>
<defaultvalue>false</defaultvalue>
</property>
16 years, 9 months
JBoss Rich Faces SVN: r8208 - trunk/ui/dropdown-menu/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-26 07:32:37 -0400 (Sat, 26 Apr 2008)
New Revision: 8208
Modified:
trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
http://jira.jboss.com/jira/browse/RF-2220
Corrected language and added default values
Modified: trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
===================================================================
--- trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2008-04-26 11:32:27 UTC (rev 8207)
+++ trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2008-04-26 11:32:37 UTC (rev 8208)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
">
<components>
@@ -36,14 +36,14 @@
</taghandler>
&ui_component_attributes;
-
- <property>
- <name>disabled</name>
- <classname>boolean</classname>
- <description>
- Attribute 'disabled' provides possibility to make the whole menu disabled if its value equals to "true".
- </description>
- <defaultvalue>false</defaultvalue>
+
+ <property>
+ <name>disabled</name>
+ <classname>boolean</classname>
+ <description>
+ Attribute 'disabled' provides possibility to make the whole menu disabled if its value equals to "true".
+ </description>
+ <defaultvalue>false</defaultvalue>
</property>
<property>
<name>event</name>
@@ -58,8 +58,9 @@
<name>submitMode</name>
<classname>java.lang.String</classname>
<description>
- Set the submission mode for all menu items of the menu except
- ones where this attribute redefined. (ajax,server(Default),none)
+ Sets the submission mode for all menu items of the menu except
+ ones where this attribute redefined.
+ Possible values are "ajax","server","none". Default value is "sever".
</description>
<defaultvalue>"server"</defaultvalue>
</property>
@@ -68,7 +69,7 @@
<name>showDelay</name>
<classname>java.lang.Integer</classname>
<description>
- Delay between event and menu showing.
+ Delay between event and menu showing. Default value is "50".
</description>
<defaultvalue><![CDATA[new Integer(50)]]></defaultvalue>
</property>
@@ -77,7 +78,7 @@
<name>hideDelay</name>
<classname>java.lang.Integer</classname>
<description>
- Delay between losing focus and menu closing.
+ Delay between losing focus and menu closing. Default value is "800".
</description>
<defaultvalue><![CDATA[new Integer(800)]]></defaultvalue>
</property>
@@ -94,8 +95,9 @@
<name>direction</name>
<classname>java.lang.String</classname>
<description>
- Defines direction of the popup list to appear (top-right,
- top-left bottom-right, bottom-left, auto(default))
+ Defines direction of the popup list to appear.
+ Possible values are "top-right", "top-right", "top-left", "bottom-right", "bottom-left", "auto".
+ Default value is "auto".
</description>
<defaultvalue>"auto"</defaultvalue>
</property>
@@ -105,7 +107,7 @@
<name>popupWidth</name>
<classname>java.lang.String</classname>
<description>
- Set minimal width for the all of the lists that will appear.
+ Sets minimal width for all lists that will appear.
</description>
</property>
@@ -113,8 +115,11 @@
<name>jointPoint</name>
<classname>java.lang.String</classname>
<description>
- Set the corner of the label for the popup to be connected with.
- (auto(default), tr, tl, bl, br, where tr top-right)
+ Sets the corner of the label for the pop-up to be connected with.
+ Possible values are "tr", "tl", "bl", "br", "bottom-left", "auto".
+ Default value is "auto".
+ "tr" stands for top-right.
+
</description>
<defaultvalue>"auto"</defaultvalue>
</property>
@@ -123,7 +128,7 @@
<name>horizontalOffset</name>
<classname>int</classname>
<description>
- Sets the horizontal offset between popup list and label element
+ Sets the horizontal offset between popup list and label element. Default value is "0".
conjunction point
</description>
<defaultvalue><![CDATA[0]]></defaultvalue>
@@ -133,7 +138,7 @@
<name>verticalOffset</name>
<classname>int</classname>
<description>
- Sets the vertical offset between popup list and label element
+ Sets the vertical offset between popup list and label element. Default value is "0".
conjunction point
</description>
<defaultvalue><![CDATA[0]]></defaultvalue>
@@ -155,7 +160,7 @@
<classname>java.lang.String</classname>
<description>
Space-separated list of CSS style class(es) that are be applied to selected item of this component.
- </description>
+ </description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -164,7 +169,7 @@
<classname>java.lang.String</classname>
<description>
CSS style(s) is/are to be applied to disabled item when this component is rendered.
- </description>
+ </description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -173,33 +178,33 @@
<classname>java.lang.String</classname>
<description>
Space-separated list of CSS style class(es) that are be applied to disabled item of this component
- </description>
+ </description>
<defaultvalue><![CDATA[""]]></defaultvalue>
- </property>
-
- <property>
- <name>disabledLabelClass</name>
- <classname>java.lang.String</classname>
- <description>
- Space-separated list of CSS style class(es) that are be applied to disabled label of DD menu
- </description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
- </property>
- <property>
- <name>selectedLabelClass</name>
- <classname>java.lang.String</classname>
- <description>
- Space-separated list of CSS style class(es) that are be applied to selected label of DD menu
- </description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
</property>
+
+ <property>
+ <name>disabledLabelClass</name>
+ <classname>java.lang.String</classname>
+ <description>
+ Space-separated list of CSS style class(es) that are be applied to disabled label of DD menu
+ </description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>selectedLabelClass</name>
+ <classname>java.lang.String</classname>
+ <description>
+ Space-separated list of CSS style class(es) that are be applied to selected label of DD menu
+ </description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
<property>
<name>itemStyle</name>
<classname>java.lang.String</classname>
<description>
CSS style(s) is/are to be applied to item when this component is rendered.
- </description>
+ </description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -208,7 +213,7 @@
<classname>java.lang.String</classname>
<description>
Space-separated list of CSS style class(es) that are be applied to item of this component
- </description>
+ </description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
16 years, 9 months
JBoss Rich Faces SVN: r8207 - trunk/ui/drag-drop/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-26 07:32:27 -0400 (Sat, 26 Apr 2008)
New Revision: 8207
Modified:
trunk/ui/drag-drop/src/main/config/component/dndParam.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
http://jira.jboss.com/jira/browse/RF-2220
Corrected language and added default values
Modified: trunk/ui/drag-drop/src/main/config/component/dndParam.xml
===================================================================
--- trunk/ui/drag-drop/src/main/config/component/dndParam.xml 2008-04-26 11:32:13 UTC (rev 8206)
+++ trunk/ui/drag-drop/src/main/config/component/dndParam.xml 2008-04-26 11:32:27 UTC (rev 8207)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd
">
<components>
@@ -41,7 +41,7 @@
<property>
<name>type</name>
<classname>java.lang.String</classname>
- <description>This attribute defines parameter functionality. Possible values are "drag", "drop" and "default"
+ <description>This attribute defines parameter functionality. Possible values are "drag", "drop" and "default". Default value is "default".
</description>
<defaultvalue>"default"</defaultvalue>
</property>
16 years, 9 months
JBoss Rich Faces SVN: r8206 - trunk/ui/drag-drop/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-26 07:32:13 -0400 (Sat, 26 Apr 2008)
New Revision: 8206
Modified:
trunk/ui/drag-drop/src/main/config/component/dragSupport.xml
trunk/ui/drag-drop/src/main/config/component/dropSupport.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
http://jira.jboss.com/jira/browse/RF-2220
Corrected language and added default values
Modified: trunk/ui/drag-drop/src/main/config/component/dragSupport.xml
===================================================================
--- trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2008-04-26 08:37:42 UTC (rev 8205)
+++ trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2008-04-26 11:32:13 UTC (rev 8206)
@@ -63,7 +63,7 @@
<name>grabCursors</name>
<classname>java.lang.String</classname>
<description>
- list of comma separated cursors that indicates then you can grab and drag an object
+ List of comma separated cursors that indicates then you can grab and drag an object
</description>
<defaultvalue>""</defaultvalue>
</property>
Modified: trunk/ui/drag-drop/src/main/config/component/dropSupport.xml
===================================================================
--- trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2008-04-26 08:37:42 UTC (rev 8205)
+++ trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2008-04-26 11:32:13 UTC (rev 8206)
@@ -55,7 +55,7 @@
<name>acceptCursors</name>
<classname>java.lang.String</classname>
<description>
- list of comma separated cursors that indicates when acceptable draggable over dropzone
+ List of comma separated cursors that indicates when acceptable draggable over dropzone
</description>
<defaultvalue>""</defaultvalue>
</property>
@@ -64,7 +64,7 @@
<name>rejectCursors</name>
<classname>java.lang.String</classname>
<description>
- list of comma separated cursors that indicates when rejectable draggable over dropzone
+ List of comma separated cursors that indicates when rejectable draggable over dropzone
</description>
<defaultvalue>""</defaultvalue>
</property>
@@ -73,7 +73,7 @@
<name>cursorTypeMapping</name>
<classname>java.lang.Object</classname>
<description>
- mapping between drop types and acceptable cursors
+ Mapping between drop types and acceptable cursors
</description>
</property>
16 years, 9 months
JBoss Rich Faces SVN: r8205 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-26 04:37:42 -0400 (Sat, 26 Apr 2008)
New Revision: 8205
Modified:
trunk/docs/userguide/en/src/main/docbook/included/column.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
Corrected language
Modified: trunk/docs/userguide/en/src/main/docbook/included/column.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/column.xml 2008-04-25 23:04:40 UTC (rev 8204)
+++ trunk/docs/userguide/en/src/main/docbook/included/column.xml 2008-04-26 08:37:42 UTC (rev 8205)
@@ -189,8 +189,8 @@
<section>
<title>Sorting</title>
<para>
- In order to sort the columns you could use <emphasis><property>"sortBy"</property></emphasis> attribute indicates what values to be sorted column.
- In order to sort the column should click on its header. See the following example.
+ In order to sort the columns you should use <emphasis><property>"sortBy"</property></emphasis> attribute that indicates what values to be sorted.
+ In order to sort the column you should click on its header. See the following example.
</para>
<para>
<emphasis role="bold">Example:</emphasis>
16 years, 9 months
JBoss Rich Faces SVN: r8204 - in trunk: samples/seamIntegration and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-04-25 19:04:40 -0400 (Fri, 25 Apr 2008)
New Revision: 8204
Added:
trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/StressBean.java
trunk/samples/seamIntegration/src/main/webapp/pages/stress.xhtml
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
trunk/samples/seamIntegration/pom.xml
trunk/test-applications/seleniumTest/src/main/webapp/META-INF/MANIFEST.MF
Log:
Start progress for a http://jira.jboss.com/jira/browse/RF-3131 issue.
Fix some bugs in the current implementation.
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-04-25 22:40:40 UTC (rev 8203)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-04-25 23:04:40 UTC (rev 8204)
@@ -314,7 +314,7 @@
_this.doFinish();
_this = undefined;
}
- }, 50);
+ }, 0);
} else
{
if (isLast)
@@ -969,7 +969,7 @@
window.document.open = oldDocOpen;
}
LOG.debug("page content has been replaced");
- },30);
+ },0);
}
@@ -1016,14 +1016,14 @@
}
// mark status object ( if any ) for complete request ;
A4J.AJAX.status(request.containerId,options.status,false);},
- 10);
+ 0);
} else if(options.oncomplete){
LOG.debug( "Call component oncomplete function after processing updates" );
window.setTimeout(function(){
options.oncomplete(request,request.domEvt,request.getJSON('_ajax:data'));
// mark status object ( if any ) for complete request ;
A4J.AJAX.status(request.containerId,options.status,false);},
- 10);
+ 0);
} else {
// mark status object ( if any ) for complete request ;
@@ -1033,11 +1033,12 @@
if(options.eventsQueue){
var eventsQueue = A4J.AJAX._eventsQueues[options.eventsQueue];
if( eventsQueue ) {
- A4J.AJAX._eventsQueues[options.eventsQueue]=false;
if(eventsQueue.wait){
LOG.debug("Queue not empty, execute next request in queue "+options.eventsQueue);
A4J.AJAX.SubmiteventsQueue(eventsQueue);
- }
+ } else {
+ A4J.AJAX._eventsQueues[options.eventsQueue]=false;
+ }
}
}
};
@@ -1403,5 +1404,5 @@
}
} catch(e){ /* Mozilla in XHTML mode not have innerHTML */ };
- },50);
+ },0);
}
Modified: trunk/samples/seamIntegration/pom.xml
===================================================================
--- trunk/samples/seamIntegration/pom.xml 2008-04-25 22:40:40 UTC (rev 8203)
+++ trunk/samples/seamIntegration/pom.xml 2008-04-25 23:04:40 UTC (rev 8204)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<artifactId>samples</artifactId>
<groupId>org.richfaces</groupId>
@@ -98,6 +98,10 @@
<artifactId>jboss-seam-debug</artifactId>
<version>2.0.1.GA</version>
</dependency>
- </dependencies>
-</project>
-
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/StressBean.java
===================================================================
--- trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/StressBean.java (rev 0)
+++ trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/StressBean.java 2008-04-25 23:04:40 UTC (rev 8204)
@@ -0,0 +1,31 @@
+/**
+ *
+ */
+package org.ajax4jsf;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+/**
+ * @author asmirnov
+ *
+ */
+@Name("stressBean") @Scope(ScopeType.SESSION)
+public class StressBean {
+
+ private int counter;
+
+ public int getCounter() {
+ return counter;
+ }
+
+ public void setCounter(int counter) {
+ this.counter = counter;
+ }
+
+ public String next() {
+ counter++;
+ return null;
+ }
+}
Property changes on: trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/StressBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/seamIntegration/src/main/webapp/pages/stress.xhtml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/pages/stress.xhtml (rev 0)
+++ trunk/samples/seamIntegration/src/main/webapp/pages/stress.xhtml 2008-04-25 23:04:40 UTC (rev 8204)
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ >
+ <head>
+ <title>Stress test for an AJAX requests</title>
+ <script type="text/javascript">
+ function inspect(data,time){
+ LOG.info("Data is "+data+" at time "+time);
+ }
+ </script>
+ </head>
+ <body>
+ <f:view>
+ <h1>Stress test for an AJAX requests</h1>
+ <h:form>
+ <a4j:jsFunction name="stress" action="#{stressBean.next}" reRender="text" eventsQueue="stress"/>
+ <h:panelGrid columns="2">
+ <a4j:commandButton value="Next" action="#{stressBean.next}" reRender="text" />
+ <h:outputText id="text" value="#{stressBean.counter}"/>
+ <input id="startBtn" type="button" value="Start" onclick="start()"/>
+ <input id="stopBtn" type="button" value="Stop" onclick="stop()" />
+ </h:panelGrid>
+ <script type="text/javascript">
+ // <![CDATA[
+ var stressInterval;
+ function start(){
+ stressInterval=window.setInterval(stress,20);
+ };
+ function stop() {
+ window.clearInterval(stressInterval);
+ };
+ // ]]>
+ </script>
+ </h:form>
+ <a4j:log hotkey="M" />
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/samples/seamIntegration/src/main/webapp/pages/stress.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/test-applications/seleniumTest/src/main/webapp/META-INF/MANIFEST.MF
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/META-INF/MANIFEST.MF 2008-04-25 22:40:40 UTC (rev 8203)
+++ trunk/test-applications/seleniumTest/src/main/webapp/META-INF/MANIFEST.MF 2008-04-25 23:04:40 UTC (rev 8204)
@@ -1,3 +1,2 @@
Manifest-Version: 1.0
-Class-Path:
16 years, 9 months
JBoss Rich Faces SVN: r8203 - in trunk/samples/richfaces-demo/src/main: webapp/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-04-25 18:40:40 -0400 (Fri, 25 Apr 2008)
New Revision: 8203
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java
trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/comboBox.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-3271
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2008-04-25 22:40:40 UTC (rev 8203)
@@ -20,18 +20,11 @@
private List components = null;
private ComponentDescriptor currentComponent;
private List componentGroups = null;
- private Object activeTab;
public boolean getHasCurrentComponent() {
return currentComponent!=null;
}
- public Object getActiveTab() {
- return activeTab;
- }
- public void setActiveTab(Object activeTab) {
- this.activeTab = activeTab;
- }
public ComponentDescriptor getCurrentComponent() {
String id = getComponentParam();
if (id!=null) {
@@ -88,14 +81,8 @@
public void setCurrentComponent(ComponentDescriptor currentComponent) {
if (currentComponent==null) {
- setActiveTab(null);
this.currentComponent = (ComponentDescriptor)components_().get(0);
}
- if (this.currentComponent!=null && currentComponent!=null & !this.currentComponent.equals(currentComponent)) {
- setActiveTab(null);
- } else if (this.currentComponent==null || currentComponent==null) {
- setActiveTab(null);
- }
this.currentComponent = currentComponent;
}
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/actionparam.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Action Parameter</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/actionparam/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Columns Component</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/columns/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/comboBox.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/comboBox.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/comboBox.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Combo Box Component</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/comboBox/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandButton.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Button</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/commandButton/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/commandLink.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax Link</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/commandLink/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Data FIlter Slider</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dataFilterSlider/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Grid</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dataGrid/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Lists</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dataLists/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Table</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dataTable/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Table Scroller</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dataTableScroller/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dragIndicator.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Drag-n-Drop. Drag Indicator</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/dragSupport/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/fileUpload.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Combo Box Component</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/fileUpload/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Table Filtering Feature</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Built-In Filtering Usage">
<ui:include src="/richfaces/filteringFeature/filteringUsage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -8,7 +8,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - jQuery Extension</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/jQuery/usage.xhtml"/>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jsFunction.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -8,7 +8,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Ajax JS Function</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/jsFunction/usage.xhtml"/>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -9,7 +9,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Panel</ui:define>
<ui:define name="current">panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" headerClass="header_tabs_class" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" headerClass="header_tabs_class" contentClass="content_tab" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/panel/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Repeat</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/repeat/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Scrollable Data Table</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/scrollableDataTable/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -7,7 +7,7 @@
<ui:composition template="/templates/main.xhtml">
<ui:define name="title">RichFaces - Open Source Rich JSF Components - TabPanel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/tabPanel/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -9,7 +9,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - PanelBar</ui:define>
<ui:define name="current">panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/toolTip/usage.xhtml"/>
</rich:tab>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml 2008-04-25 19:39:30 UTC (rev 8202)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree.xhtml 2008-04-25 22:40:40 UTC (rev 8203)
@@ -9,7 +9,7 @@
<ui:define name="title">RichFaces - Open Source Rich JSF Components - Tree</ui:define>
<ui:define name="current">panel</ui:define>
<ui:define name="body">
- <rich:tabPanel switchType="server" selectedTab="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Usage">
<ui:include src="/richfaces/tree/usage.xhtml"/>
</rich:tab>
16 years, 9 months
JBoss Rich Faces SVN: r8202 - trunk/framework/impl/src/main/java/org/richfaces/skin.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-04-25 15:39:30 -0400 (Fri, 25 Apr 2008)
New Revision: 8202
Added:
trunk/framework/impl/src/main/java/org/richfaces/skin/DefaultSkinImpl.java
Modified:
trunk/framework/impl/src/main/java/org/richfaces/skin/AbstractChainableSkinImpl.java
trunk/framework/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java
trunk/framework/impl/src/main/java/org/richfaces/skin/BasicSkinImpl.java
trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
trunk/framework/impl/src/main/java/org/richfaces/skin/SkinImpl.java
Log:
Skins implementation refeactored again, several issues fixed, tests added
Modified: trunk/framework/impl/src/main/java/org/richfaces/skin/AbstractChainableSkinImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/AbstractChainableSkinImpl.java 2008-04-25 19:39:22 UTC (rev 8201)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/AbstractChainableSkinImpl.java 2008-04-25 19:39:30 UTC (rev 8202)
@@ -35,39 +35,18 @@
public abstract class AbstractChainableSkinImpl extends BasicSkinImpl {
- protected SkinFactoryImpl factory;
-
- AbstractChainableSkinImpl(Map properties, SkinFactoryImpl factory) {
+ AbstractChainableSkinImpl(Map properties) {
super(properties);
- this.factory = factory;
}
- protected Skin getBaseSkin(FacesContext context) {
- Object object = getLocalParameter(context, Skin.baseSkin);
- boolean base = isBase();
- Skin skin = null;
-
- if (object != null) {
- skin = factory.getSkinByName(context, object, base);
- }
-
- if (skin == null) {
- if (base) {
- skin = factory.getDefaultSkin(context);
- } else {
- skin = factory.getBaseSkin(context);
- }
- }
-
- return skin;
- }
+ protected abstract Skin getBaseSkin(FacesContext context);
protected Object localResolveSkinParameter(FacesContext context, String name) {
- return super.resolveSkinParameter(context, name);
+ return getSkinParams().get(name);
}
protected boolean localContainsProperty(FacesContext context, String name) {
- return super.containsProperty(name);
+ return getSkinParams().containsKey(name);
}
private static abstract class Operation {
@@ -111,18 +90,17 @@
};
protected Object executeOperation(FacesContext context, Operation operation, String name, int[] singleInt) {
+ if (singleInt[0]++ > 1000) {
+ throw new FacesException(Messages.getMessage(
+ Messages.SKIN_CYCLIC_REFERENCE, name));
+ }
+
Object object = operation.doLocalCall(context, this, name);
if (object == null) {
Skin baseSkin = getBaseSkin(context);
if (baseSkin != null) {
if (baseSkin instanceof AbstractChainableSkinImpl) {
AbstractChainableSkinImpl skinImpl = (AbstractChainableSkinImpl) baseSkin;
-
- if (singleInt[0]++ > 1000) {
- throw new FacesException(Messages.getMessage(
- Messages.SKIN_CYCLIC_REFERENCE, name));
- }
-
object = operation.doChainedCall(context, skinImpl, name, singleInt);
} else {
object = operation.doExternalCall(context, baseSkin, name);
@@ -148,7 +126,6 @@
while (resolvedParameter instanceof String) {
String string = (String) resolvedParameter;
if (string.length() > 0 && string.charAt(0) == '&') {
- singleInt[0]++;
resolvedParameter = resolveSkinParameter(context, string.substring(1), singleInt);
if (resolvedParameter == null) {
throw new FacesException(Messages.getMessage(
@@ -169,5 +146,14 @@
return containsProperty(FacesContext.getCurrentInstance(), name, new int[] {0});
}
- protected abstract boolean isBase();
+ protected int computeHashCode(FacesContext context) {
+ int hash = super.computeHashCode(context);
+ Skin baseSkin = getBaseSkin(context);
+ if (baseSkin != null) {
+ hash = 31*hash + baseSkin.hashCode(context);
+ }
+
+ return hash;
+ }
+
}
Modified: trunk/framework/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java 2008-04-25 19:39:22 UTC (rev 8201)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java 2008-04-25 19:39:30 UTC (rev 8202)
@@ -23,6 +23,8 @@
import java.util.Map;
+import javax.faces.context.FacesContext;
+
/**
* @author nick belaevski
* @since 3.2
@@ -30,13 +32,27 @@
public class BaseSkinImpl extends AbstractChainableSkinImpl {
+ private SkinFactoryImpl factoryImpl;
+
BaseSkinImpl(Map properties, SkinFactoryImpl factory) {
- super(properties, factory);
+ super(properties);
+
+ this.factoryImpl = factory;
}
- @Override
- protected boolean isBase() {
- return true;
+ protected Skin getBaseSkin(FacesContext context) {
+ Object object = getLocalParameter(context, Skin.baseSkin);
+ Skin skin = null;
+
+ if (object != null) {
+ skin = factoryImpl.getSkinByName(context, object, true);
+ }
+
+ if (skin == null) {
+ skin = factoryImpl.getDefaultSkin(context);
+ }
+
+ return skin;
}
}
Modified: trunk/framework/impl/src/main/java/org/richfaces/skin/BasicSkinImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/BasicSkinImpl.java 2008-04-25 19:39:22 UTC (rev 8201)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/BasicSkinImpl.java 2008-04-25 19:39:30 UTC (rev 8202)
@@ -39,7 +39,7 @@
* @version $Revision: 1.1.2.1 $ $Date: 2007/01/09 18:59:41 $
*
*/
-public class BasicSkinImpl implements Skin {
+public abstract class BasicSkinImpl implements Skin {
public static final String RENDER_KIT_PARAMETER = "render.kit";
@@ -55,6 +55,10 @@
BasicSkinImpl(Map properties) {
this.skinParams = properties;
}
+
+ protected Map<String, Object> getSkinParams() {
+ return skinParams;
+ }
/* (non-Javadoc)
* @see org.richfaces.skin.Skin#getRenderKitId(javax.faces.context.FacesContext)
@@ -85,14 +89,8 @@
return getValueReference(context, skinParams.get(name));
}
- protected Object resolveSkinParameter(FacesContext context, String name) {
- return skinParams.get(name);
- }
+ protected abstract Object resolveSkinParameter(FacesContext context, String name);
- protected Skin getBaseSkin(FacesContext context) {
- return null;
- }
-
/**
* Calculate concrete value for property - if it stored as @see ValueBinding ,
* return interpreted value.
@@ -112,7 +110,19 @@
public String toString() {
return this.getClass().getSimpleName() + ": " + skinParams.toString();
}
+
+ protected int computeHashCode(FacesContext context) {
+ int hash = 0;
+ for (Iterator iter = skinParams.keySet().iterator(); iter.hasNext();) {
+ String key = (String) iter.next();
+ Object parameter = getParameter(context,key);
+ hash = 31*hash + key.hashCode();
+ hash = 31*hash + (parameter != null ? parameter.hashCode() : 0);
+ }
+ return hash;
+ }
+
/* (non-Javadoc)
* @see org.richfaces.skin.Skin#hashCode(javax.faces.context.FacesContext)
*/
@@ -130,28 +140,11 @@
Integer requestCode = (Integer) map.get(this);
if(null == requestCode){
- int hash = 0;
- for (Iterator iter = skinParams.keySet().iterator(); iter.hasNext();) {
- String key = (String) iter.next();
- Object parameter = getParameter(context,key);
- hash = 31*hash + key.hashCode();
- hash = 31*hash + (parameter != null ? parameter.hashCode() : 0);
- }
-
- Skin baseSkin = getBaseSkin(context);
- if (baseSkin != null) {
- hash = 31*hash + baseSkin.hashCode(context);
- }
-
- requestCode = new Integer(hash);
+ requestCode = new Integer(computeHashCode(context));
// store hash for this skin as request-skope parameter - not calculate on next calls for same request
map.putIfAbsent(this, requestCode);
}
return requestCode.intValue();
}
- public boolean containsProperty(String name) {
- return skinParams.containsKey(name);
- }
-
}
Added: trunk/framework/impl/src/main/java/org/richfaces/skin/DefaultSkinImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/DefaultSkinImpl.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/DefaultSkinImpl.java 2008-04-25 19:39:30 UTC (rev 8202)
@@ -0,0 +1,42 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.skin;
+
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * @author nick belaevski
+ * @since 3.2
+ */
+
+public class DefaultSkinImpl extends AbstractChainableSkinImpl {
+
+ DefaultSkinImpl(Map properties) {
+ super(properties);
+ }
+
+ protected Skin getBaseSkin(FacesContext context) {
+ return null;
+ }
+}
Modified: trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2008-04-25 19:39:22 UTC (rev 8201)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2008-04-25 19:39:30 UTC (rev 8202)
@@ -303,13 +303,16 @@
sourceProperties.put(name, skinParams);
}
+ BasicSkinImpl skinImpl;
if (DEFAULT_SKIN_NAME.equals(name)) {
- return new BasicSkinImpl(skinParams);
+ skinImpl = new DefaultSkinImpl(skinParams);
} else if (isBase) {
- return new BaseSkinImpl(skinParams, this);
+ skinImpl = new BaseSkinImpl(skinParams, this);
} else {
- return new SkinImpl(skinParams, this);
+ skinImpl = new SkinImpl(skinParams, this);
}
+
+ return skinImpl;
}
/**
Modified: trunk/framework/impl/src/main/java/org/richfaces/skin/SkinImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2008-04-25 19:39:22 UTC (rev 8201)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2008-04-25 19:39:30 UTC (rev 8202)
@@ -23,18 +23,35 @@
import java.util.Map;
+import javax.faces.context.FacesContext;
+
/**
* @author nick belaevski
* @since 3.2
*/
public class SkinImpl extends AbstractChainableSkinImpl {
- SkinImpl(Map properties, SkinFactoryImpl factory) {
- super(properties, factory);
+ private SkinFactoryImpl factoryImpl;
+
+ SkinImpl(Map properties, SkinFactoryImpl factoryImpl) {
+ super(properties);
+
+ this.factoryImpl = factoryImpl;
}
- protected boolean isBase() {
- return false;
+ protected Skin getBaseSkin(FacesContext context) {
+ Object object = getLocalParameter(context, Skin.baseSkin);
+ Skin skin = null;
+
+ if (object != null) {
+ skin = factoryImpl.getSkinByName(context, object, false);
+ }
+
+ if (skin == null) {
+ skin = factoryImpl.getBaseSkin(context);
+ }
+
+ return skin;
}
}
16 years, 9 months