JBoss Rich Faces SVN: r10144 - in trunk/test-applications/seleniumTest/src: main/webapp/WEB-INF and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-08-19 13:37:04 -0400 (Tue, 19 Aug 2008)
New Revision: 10144
Added:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JHTMLCommandLinkTestBean.java
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxHTMLCommandLink/ajaxHTMLLinkTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxHTMLCommandLinkTest.java
Log:
ajaxHTMLCommandLinkTest refactored
Added: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JHTMLCommandLinkTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JHTMLCommandLinkTestBean.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JHTMLCommandLinkTestBean.java 2008-08-19 17:37:04 UTC (rev 10144)
@@ -0,0 +1,54 @@
+package org.ajax4jsf.bean;
+
+import javax.faces.event.ActionEvent;
+
+public class A4JHTMLCommandLinkTestBean {
+
+ private boolean rendered = false;
+ private boolean isListenerInvoked = false;
+ private boolean isActionInvoked = false;
+
+ private String value;
+
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public String action() {
+ setActionInvoked(true);
+ return null;
+ }
+
+ public void actionListener (ActionEvent event) {
+ setListenerInvoked(true);
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public boolean isListenerInvoked() {
+ return isListenerInvoked;
+ }
+
+ public void setListenerInvoked(boolean isListenerInvoked) {
+ this.isListenerInvoked = isListenerInvoked;
+ }
+
+ public boolean isActionInvoked() {
+ return isActionInvoked;
+ }
+
+ public void setActionInvoked(boolean isActionInvoked) {
+ this.isActionInvoked = isActionInvoked;
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/A4JHTMLCommandLinkTestBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-08-19 16:05:59 UTC (rev 10143)
+++ trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-08-19 17:37:04 UTC (rev 10144)
@@ -210,8 +210,13 @@
<managed-bean-name>modalPanelBean</managed-bean-name>
<managed-bean-class>org.ajax4jsf.bean.ModalPanelTestBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>a4jHtmlCommandLinkBean</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.bean.A4JHTMLCommandLinkTestBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
</managed-bean>
- <navigation-rule>
+ <navigation-rule>
<from-view-id>/pages/ajaxInclude/step1.xhtml</from-view-id>
<navigation-case>
<from-outcome>next</from-outcome>
Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxHTMLCommandLink/ajaxHTMLLinkTest.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxHTMLCommandLinkTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxHTMLCommandLinkTest.java 2008-08-19 16:05:59 UTC (rev 10143)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxHTMLCommandLinkTest.java 2008-08-19 17:37:04 UTC (rev 10144)
@@ -2,11 +2,16 @@
import org.ajax4jsf.template.Template;
import org.richfaces.SeleniumTestBase;
-import org.testng.Assert;
import org.testng.annotations.Test;
public class AjaxHTMLCommandLinkTest extends SeleniumTestBase {
+ private final static String IS_ACTION_INVOKED = "_form:_action";
+
+ private final static String IS_LISTENER_INVOKED = "_form:_listener";
+
+ private final static String SUBMITTED_VALUE = "_form:_submittedValue";
+
@Test
public void testAjaxHTMLCommandLinkComponent(Template template) {
renderPage(template);
@@ -14,74 +19,63 @@
String parentId = getParentId() + "_form:";
String linkId = parentId + "l1";
- boolean immediate = false;
writeStatus("Click link 1");
- setValidation(true);
- clickById(linkId);
- waitForAjaxCompletion();
- waitForOnCompleteHndler();
- checkButton(linkId, true, immediate, true, true, true);
+ clickCommandAndWait(linkId);
+ assertValueSubmitted(true);
+ assertActionInvoked(true);
+ assertListenerInvoked(true);
linkId = parentId + "l2";
- immediate = false;
writeStatus("Click link 2");
- setValidation(false);
- clickById(linkId);
- waitForAjaxCompletion();
- waitForOnCompleteHndler();
- checkButton(linkId, false, immediate, false, false, false);
+ clickCommandAndWait(linkId);
+ assertValueSubmitted(false);
+ assertActionInvoked(false);
+ assertListenerInvoked(false);
linkId = parentId + "l3";
- immediate = true;
writeStatus("Click link 3");
- setValidation(true);
- clickById(linkId);
- waitForAjaxCompletion();
- waitForOnCompleteHndler();
- checkButton(linkId, true, immediate, true, true, false);
+ clickCommandAndWait(linkId);
+ assertValueSubmitted(false);
+ assertActionInvoked(true);
+ assertListenerInvoked(true);
linkId = parentId + "l4";
- immediate = true;
writeStatus("Click link 4");
- setValidation(false);
- clickById(linkId);
- waitForAjaxCompletion();
- waitForOnCompleteHndler();
- checkButton(linkId, true, immediate, true, true, false);
+ clickCommandAndWait(linkId);
+ assertValueSubmitted(false);
+ assertActionInvoked(true);
+ assertListenerInvoked(true);
}
- private void setValidation(boolean success) {
- StringBuffer buffer = new StringBuffer("setValidation(");
- buffer.append(success);
- buffer.append(");");
- runScript(buffer.toString());
+ private void assertValueSubmitted(boolean submitted) {
+ if (submitted) {
+ writeStatus("Check that a new value is submitted");
+ AssertTextEquals(getParentId() + SUBMITTED_VALUE, "text", "A new value is not submitted");
+ } else {
+ writeStatus("Check that a new value is not submitted");
+ AssertTextEquals(getParentId() + SUBMITTED_VALUE, "", "A new value is submitted");
+ }
}
- private void waitForOnCompleteHndler() {
- waiteForCondition("_onCompleteHandler == true;", 3000);
- runScript("_onCompleteHandler = false;");
+ private void assertActionInvoked(boolean invoked) {
+ if(invoked) {
+ writeStatus("Check that action is invoked");
+ AssertTextEquals(getParentId() + IS_ACTION_INVOKED, "true", "An action is not invoked");
+ } else {
+ writeStatus("Check that action is not invoked");
+ AssertTextEquals(getParentId() + IS_ACTION_INVOKED, "false", "An action is invoked");
+ }
}
- private void checkButton(String id, boolean testData, boolean immediate, boolean testAction, boolean testFListener,
- boolean testInput) {
- writeStatus("Checking link...");
- StringBuffer buffer = new StringBuffer("checkLink('");
- buffer.append(id);
- buffer.append("',");
- buffer.append(testData);
- buffer.append(",");
- buffer.append(testAction);
- buffer.append(",");
- buffer.append(testFListener);
- buffer.append(",");
- buffer.append(testInput);
- buffer.append(");");
- String result = runScript(buffer.toString());
- if (result != null && result.length() > 0) {
- Assert.fail("<a4j:htmlCommandLink> [immediate=" + immediate + "] test failure caused by " + result);
+ private void assertListenerInvoked(boolean invoked) {
+ if(invoked) {
+ writeStatus("Check that listener is invoked");
+ AssertTextEquals(getParentId() + IS_LISTENER_INVOKED, "true", "A listener is not invoked");
+ } else {
+ writeStatus("Check that listener is not invoked");
+ AssertTextEquals(getParentId() + IS_LISTENER_INVOKED, "false", "A listener is invoked");
}
-
}
@Override
16 years, 4 months
JBoss Rich Faces SVN: r10143 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-08-19 12:05:59 -0400 (Tue, 19 Aug 2008)
New Revision: 10143
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
fix script evaluation
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-08-19 16:01:38 UTC (rev 10142)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-08-19 16:05:59 UTC (rev 10143)
@@ -1514,7 +1514,7 @@
// Simulate same calls as on XmlHttp
var oDomDoc = Sarissa.getDomDocument();
var _span = document.createElement("span");
- document.documentElement.appendChild(_span);
+ document.body.appendChild(_span);
// If script evaluated with used replace method, variable will be set to true
var xmlString = "<html xmlns='http://www.w3.org/1999/xhtml'><sc"+"ript>A4J.AJAX._scriptEvaluated=true;</scr"+"ipt></html>";
oDomDoc = (new DOMParser()).parseFromString(xmlString, "text/xml");
16 years, 4 months
JBoss Rich Faces SVN: r10142 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-08-19 12:01:38 -0400 (Tue, 19 Aug 2008)
New Revision: 10142
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
Fix script evaluation
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-08-19 15:40:42 UTC (rev 10141)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-08-19 16:01:38 UTC (rev 10142)
@@ -363,6 +363,7 @@
// need to check for firstChild due to opera 8 bug with hasChildNodes
Sarissa.clearChildNodes(oldnode);
importednode = window.document.importNode(newnode, true);
+ //importednode.innerHTML = importednode.innerHTML;
LOG.debug("Replace content of node by replaceChild()");
anchor.replaceChild(importednode,oldnode);
}
@@ -840,6 +841,7 @@
A4J.AJAX.headElementsCounter = 0;
A4J.AJAX.processResponse = function(req) {
+ A4J.AJAX.TestScriptEvaluation();
var options = req.options;
var ajaxResponse = req.getResponseHeader('Ajax-Response');
// If view is expired, check user-defined handler.
@@ -1506,9 +1508,9 @@
//Test for re-evaluate Scripts in updated part. Opera & Safari do it.
A4J.AJAX._scriptEvaluated=false;
-if (!document.all || window.opera){
- setTimeout(function(){
- try{
+A4J.AJAX.TestScriptEvaluation = function () {
+if ((!document.all || window.opera) && !A4J.AJAX._scriptTested){
+ try{
// Simulate same calls as on XmlHttp
var oDomDoc = Sarissa.getDomDocument();
var _span = document.createElement("span");
@@ -1526,5 +1528,6 @@
}
} catch(e){ /* Mozilla in XHTML mode not have innerHTML */ };
- },0);
}
+A4J.AJAX._scriptTested = true;
+}
16 years, 4 months
JBoss Rich Faces SVN: r10141 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-08-19 11:40:42 -0400 (Tue, 19 Aug 2008)
New Revision: 10141
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
RF-4193
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-08-19 14:21:46 UTC (rev 10140)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-08-19 15:40:42 UTC (rev 10141)
@@ -996,6 +996,14 @@
return parentForm;
},
+ _getAction: function(f) {
+ return f.getAttributeNode('action').nodeValue;
+ },
+
+ _setAction: function(f, newValue) {
+ f.getAttributeNode('action').nodeValue = newValue;
+ },
+
submitForm: function(entry) {
var parentForm = this.getForm();
@@ -1007,7 +1015,7 @@
var oldTarget = parentForm.target;
var oldEnctype = parentForm.enctype;
var oldEncoding = parentForm.encoding;
- var oldAction = parentForm.action;
+ var oldAction = this._getAction(parentForm);
try {
if (!formUpload) {
@@ -1015,7 +1023,7 @@
parentForm.encoding = "multipart/form-data";
parentForm.enctype = "multipart/form-data";
- parentForm.action = this.actionUrl + (/\?/.test(this.actionUrl) ? '&_richfaces_upload_uid' : '?_richfaces_upload_uid') + '=' + encodeURI(entry.uid) + "&id=" + this.id + "&_richfaces_upload_file_indicator=true"+"&AJAXREQUEST="+this.progressBar.containerId;
+ this._setAction(parentForm, this.actionUrl + (/\?/.test(this.actionUrl) ? '&_richfaces_upload_uid' : '?_richfaces_upload_uid') + '=' + encodeURI(entry.uid) + "&id=" + this.id + "&_richfaces_upload_file_indicator=true"+"&AJAXREQUEST="+this.progressBar.containerId);
parentForm.target = this.id + "_iframe";
var inputs = parentForm.elements;
16 years, 4 months
JBoss Rich Faces SVN: r10140 - in trunk/ui: columns/src/main/config/component and 25 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2008-08-19 10:21:46 -0400 (Tue, 19 Aug 2008)
New Revision: 10140
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/columns/src/main/config/component/columns.xml
trunk/ui/combobox/src/main/config/component/combobox.xml
trunk/ui/componentControl/src/main/config/component/componentControl.xml
trunk/ui/contextMenu/src/main/config/component/contextMenu.xml
trunk/ui/dataTable/src/main/config/component/colgroup.xml
trunk/ui/dataTable/src/main/config/component/column.xml
trunk/ui/dataTable/src/main/config/component/dataGrid.xml
trunk/ui/dataTable/src/main/config/component/dataList.xml
trunk/ui/dataTable/src/main/config/component/dataTable.xml
trunk/ui/dataTable/src/main/config/component/subTable.xml
trunk/ui/datascroller/src/main/config/component/datascroller.xml
trunk/ui/drag-drop/src/main/config/component/dragSupport.xml
trunk/ui/drag-drop/src/main/config/component/dropSupport.xml
trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
trunk/ui/effect/src/main/config/component/effect.xml
trunk/ui/extendedDataTable/src/main/config/component/ExtendedDataTable.xml
trunk/ui/hotKey/src/main/config/component/hotKey.xml
trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
trunk/ui/insert/src/main/config/component/insert.xml
trunk/ui/jQuery/src/main/config/component/jQuery.xml
trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
trunk/ui/menu-components/src/main/config/component/menucomponents.xml
trunk/ui/message/src/main/config/component/message.xml
trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
trunk/ui/orderingList/src/main/config/component/orderinglist.xml
trunk/ui/pickList/src/main/config/component/picklist.xml
trunk/ui/progressBAR/src/main/config/component/progressBar.xml
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
trunk/ui/tree/src/main/config/component/tree.xml
trunk/ui/tree/src/main/config/component/treeNode.xml
trunk/ui/treeModel/src/main/config/component/recursiveTreeNodesAdaptor.xml
trunk/ui/treeModel/src/main/config/component/treeNodesAdaptor.xml
trunk/ui/virtualEarth/src/main/config/component/virtualEarth.xml
Log:
RF-3972 - added or corrected descriptions of these components: calendar, columns, comboBox, componentControl, contextMenu, datascroller, columnGroup, column, dataGrid, dataList, dataTable, subTable, dragSupport, dropSupport, dropDownMenu, effect, extendedDataTable, hotKey, inplaceInput, inplaceSelect, insert, jQuery, listShuttle, menuItem, message, messages, modalPanel, orderingList, pickList, propgressBar, scrollableDataTable, tree, treeNode, recursiveTreeNodesAdaptor, treeNodesAdaptor, virtualEarth.
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -20,8 +20,7 @@
</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ The <rich:calendar> component is a UI control used for creating graphical monthly calendar on a page.
</description>
<renderer generate="true" override="true">
<name>org.richfaces.CalendarRenderer</name>
Modified: trunk/ui/columns/src/main/config/component/columns.xml
===================================================================
--- trunk/ui/columns/src/main/config/component/columns.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/columns/src/main/config/component/columns.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -10,8 +10,7 @@
<family>org.richfaces.Column</family>
<classname>org.richfaces.component.html.HtmlColumn</classname>
<description>
- <![CDATA[
- ]]>
+ The <rich:columns> is a component that allows to create a dynamic set of columns from your model.
</description>
<tag generate="false">
<name>columns</name>
Modified: trunk/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/ui/combobox/src/main/config/component/combobox.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/combobox/src/main/config/component/combobox.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,7 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[ ]]>
+ The <rich:comboBox> is a component, that provides editable combo box element on a page.
</description>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.ComboBoxRenderer</name>
Modified: trunk/ui/componentControl/src/main/config/component/componentControl.xml
===================================================================
--- trunk/ui/componentControl/src/main/config/component/componentControl.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/componentControl/src/main/config/component/componentControl.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -11,8 +11,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ The <rich:componentControl> allows to call JavaScript API functions on components after some defined events.
</description>
<renderer generate="true" override="true">
<name>org.richfaces.ComponentControlRenderer</name>
Modified: trunk/ui/contextMenu/src/main/config/component/contextMenu.xml
===================================================================
--- trunk/ui/contextMenu/src/main/config/component/contextMenu.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/contextMenu/src/main/config/component/contextMenu.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -8,7 +8,7 @@
<superclass>org.richfaces.component.UIContextMenu</superclass>
<test/>
<description>
- <![CDATA[ ]]>
+ The <rich:contextMenu> component is used for creating multileveled context menus that are activated after a user defines an event ( "onmouseover" , "onclick" , etc.) on any element on the page.
</description>
<renderer>
Modified: trunk/ui/dataTable/src/main/config/component/colgroup.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/colgroup.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/dataTable/src/main/config/component/colgroup.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:columnGroup> component combines columns in one row to organize complex subparts of a table.]]>
</description>
<renderer generate="false" override="false">
<name>org.richfaces.ColumnGroupRenderer</name>
Modified: trunk/ui/dataTable/src/main/config/component/column.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/column.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/dataTable/src/main/config/component/column.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -15,8 +15,7 @@
<superclassname>org.richfaces.component.AbstractColumnComponentTest</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:column> component for row rendering for a UIData component.]]>
</description>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.CellRenderer</name>
Modified: trunk/ui/dataTable/src/main/config/component/dataGrid.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/dataGrid.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/dataTable/src/main/config/component/dataGrid.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:dataGrid> component to render data as a grid that allows choosing data from a model and obtains built-in support of Ajax updates.]]>
</description>
<renderer generate="true" override="true">
<name>org.richfaces.DataGridRenderer</name>
Modified: trunk/ui/dataTable/src/main/config/component/dataList.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/dataList.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/dataTable/src/main/config/component/dataList.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:dataList> component for unordered lists rendering that allows choosing data from a model and obtains built-in support of Ajax updates.]]>
</description>
<renderer generate="true" override="true">
<name>org.richfaces.DataListRenderer</name>
@@ -104,8 +103,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:dataOrderedList> component for ordered lists rendering that allows choosing data from a model and obtains built-in support of Ajax updates.]]>
</description>
<renderer generate="true" override="true">
<name>org.richfaces.DataOrderedListRenderer</name>
@@ -129,12 +127,12 @@
&html_universal_attributes;
&spec_table_attributes;
- <property>
- <name>rowKeyConverter</name>
- <classname>javax.faces.convert.Converter</classname>
- <description>Converter for a RowKey object.
- </description>
- </property>
+ <property>
+ <name>rowKeyConverter</name>
+ <classname>javax.faces.convert.Converter</classname>
+ <description>Converter for a RowKey object.
+ </description>
+ </property>
<property>
<name>rowKey</name>
@@ -211,8 +209,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:dataDefinitionList> component for definition lists rendering that allows choosing data from a model and obtains built-in support of Ajax updates.]]>
</description>
<facet>
<name>term</name>
@@ -278,11 +275,11 @@
<name>headerClass</name>
<classname>java.lang.String</classname>
</property>
- <property>
- <name>rowKeyConverter</name>
- <classname>javax.faces.convert.Converter</classname>
- <description>Converter for a RowKey object.
- </description>
+ <property>
+ <name>rowKeyConverter</name>
+ <classname>javax.faces.convert.Converter</classname>
+ <description>Converter for a RowKey object.
+ </description>
</property>
<property>
<name>rowKey</name>
Modified: trunk/ui/dataTable/src/main/config/component/dataTable.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/dataTable.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/dataTable/src/main/config/component/dataTable.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,7 @@
<superclassname>org.richfaces.component.AbstractDataTableComponentTest</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:dataTable> component for tables rendering that allows choosing data from a model and obtains built-in support of Ajax updates.]]>
</description>
<renderer generate="true" override="true">
<name>org.richfaces.DataTableRenderer</name>
Modified: trunk/ui/dataTable/src/main/config/component/subTable.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/subTable.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/dataTable/src/main/config/component/subTable.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,7 @@
<superclassname>org.richfaces.component.AbstractDataTableComponentTest</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:subTable> component is used for inserting subtables into tables with opportunity to choose data from a model and built-in Ajax updates support.]]>
</description>
<renderer generate="false" override="false">
<name>org.richfaces.SubTableRenderer</name>
Modified: trunk/ui/datascroller/src/main/config/component/datascroller.xml
===================================================================
--- trunk/ui/datascroller/src/main/config/component/datascroller.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/datascroller/src/main/config/component/datascroller.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -16,8 +16,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ The <rich:datascroller> component is designed for providing the functionality of tables scrolling using Ajax requests.
</description>
<renderer generate="true" override="true">
Modified: trunk/ui/drag-drop/src/main/config/component/dragSupport.xml
===================================================================
--- trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:dragSupport> component defines a subtree of the component tree as draggable for drag-and-drop operations. Within such a "drag zone", you can click the mouse button on an item and drag it to any component that supports drop operations (a "drop zone"). It encodes all the necessary JavaScript for supporting drag-and-drop operations.]]>
</description>
<renderer generate="false" override="true">
<name>org.richfaces.DragSupportRenderer</name>
Modified: trunk/ui/drag-drop/src/main/config/component/dropSupport.xml
===================================================================
--- trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:dropSupport> component transforms a parent component into a target zone for drag-and-drop operations. When a draggable element is moved and dropped onto the area of the parent component, Ajax request processing for this event is started.]]>
</description>
<renderer generate="false" override="true">
<name>org.richfaces.DropSupportRenderer</name>
Modified: trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
===================================================================
--- trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,7 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[ ]]>
+ The <rich:dropDownMenu> component is used for creating multilevel drop-down menus.
</description>
<renderer generate="true" override="true">
Modified: trunk/ui/effect/src/main/config/component/effect.xml
===================================================================
--- trunk/ui/effect/src/main/config/component/effect.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/effect/src/main/config/component/effect.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -9,9 +9,7 @@
<classname>org.richfaces.component.html.HtmlEffect</classname>
<superclass>org.richfaces.component.UIEffect</superclass>
<description>
- <![CDATA[
- It presents the google map in JSF applications
- ]]>
+ <![CDATA[The <rich:effect> utilizes a set of effects provided by the scriptaculous JavaScript library. It allows to attach effects to JSF components and html tags. ]]>
</description>
<test />
<renderer generate="true" override="true">
Modified: trunk/ui/extendedDataTable/src/main/config/component/ExtendedDataTable.xml
===================================================================
--- trunk/ui/extendedDataTable/src/main/config/component/ExtendedDataTable.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/extendedDataTable/src/main/config/component/ExtendedDataTable.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -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>
<component>
<name>org.richfaces.ExtendedDataTable</name>
@@ -7,8 +7,7 @@
<classname>org.richfaces.component.html.HtmlExtendedDataTable</classname>
<superclass>org.richfaces.component.UIExtendedDataTable</superclass>
<description>
- <![CDATA[
- ]]>
+ The <rich:extendedDataTable> component is used for tables extending standard component <rich:dataTable> .
</description>
<renderer generate="true" override="true">
<name>org.richfaces.ExtendedDataTableRenderer</name>
Modified: trunk/ui/hotKey/src/main/config/component/hotKey.xml
===================================================================
--- trunk/ui/hotKey/src/main/config/component/hotKey.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/hotKey/src/main/config/component/hotKey.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -11,8 +11,7 @@
<test />
<description>
- <![CDATA[
- ]]>
+ The <rich:hotKey> component allows to register hot keys for the page or particular elements and to define client side processing functions for these keys.
</description>
<renderer generate="true" override="true">
<name>org.richfaces.HotKeyRenderer</name>
Modified: trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -15,7 +15,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[ ]]>
+ The <rich:inplaceInput> is an input component used for displaying and editing data inputted.
</description>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.InplaceInputRenderer</name>
Modified: trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
===================================================================
--- trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -15,7 +15,8 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[ ]]>
+ The <rich:inplaceSelect> is used for creation select based inputs: it shows the value as text in one state and enables editing the value,
+ providing a list of options in another state.
</description>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.InplaceSelectRenderer</name>
Modified: trunk/ui/insert/src/main/config/component/insert.xml
===================================================================
--- trunk/ui/insert/src/main/config/component/insert.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/insert/src/main/config/component/insert.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -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>
@@ -10,8 +10,7 @@
<superclass>org.richfaces.ui.component.UIInsert</superclass>
<test/>
<description>
- <![CDATA[
- ]]>
+ The <rich:insert> component is used for highlighting, source code inserting and, optionally, format the file from the application context into the page.
</description>
<renderer generate="true" override="true">
<name>org.richfaces.ui.InsertRenderer</name>
Modified: trunk/ui/jQuery/src/main/config/component/jQuery.xml
===================================================================
--- trunk/ui/jQuery/src/main/config/component/jQuery.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/jQuery/src/main/config/component/jQuery.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -10,9 +10,7 @@
<superclass>org.richfaces.component.UIJQuery</superclass>
<test/>
<description>
- <![CDATA[
- It presents the google map in JSF applications
- ]]>
+ The <rich:jQuery> allows to apply styles and behaviour to DOM objects.
</description>
<test />
<renderer generate="true" override="true">
Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ The <rich:listShuttle> component is used for moving chosen items from one list into another with their optional reordering there.
</description>
<renderer generate="true" override="true">
<name>org.richfaces.ListShuttleRenderer</name>
Modified: trunk/ui/menu-components/src/main/config/component/menucomponents.xml
===================================================================
--- trunk/ui/menu-components/src/main/config/component/menucomponents.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/menu-components/src/main/config/component/menucomponents.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -173,7 +173,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[ ]]>
+ <![CDATA[The <rich:menuItem> component is used for the definition of a single item inside a pop-up list.]]>
</description>
<renderer generate="true" override="true">
Modified: trunk/ui/message/src/main/config/component/message.xml
===================================================================
--- trunk/ui/message/src/main/config/component/message.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/message/src/main/config/component/message.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -17,7 +17,7 @@
</test>
<description>
- <![CDATA[ richfaces Message Component ]]>
+ <![CDATA[ The <rich:message> component is used for rendering a single message for a specific component. ]]>
</description>
<renderer generate="false" override="true">
@@ -274,7 +274,7 @@
</test>
<description>
- <![CDATA[ richfaces Messages Component ]]>
+ <![CDATA[The <rich:messages> component is similar to <rich:message> component but used for rendering all messages for the components.]]>
</description>
<renderer generate="false" override="true">
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,8 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:modalPanel> component implements a modal dialog window.
+ All operations in the main application window are locked out while this window is active. Opening and closing the window is done through client JavaScript code.]]>
</description>
<renderer generate="true" override="true">
<name>org.richfaces.ModalPanelRenderer</name>
@@ -279,11 +279,11 @@
<name>label</name>
<classname>java.lang.String</classname>
<description>A localized user presentable name for this component.</description>
- </property>
- <property exist="false" existintag="false" hidden="true" >
- <name>converter</name>
- <classname>javax.faces.convert.Converter</classname>
</property>
+ <property exist="false" existintag="false" hidden="true" >
+ <name>converter</name>
+ <classname>javax.faces.convert.Converter</classname>
+ </property>
<property>
<name>trimOverlayedElements</name>
Modified: trunk/ui/orderingList/src/main/config/component/orderinglist.xml
===================================================================
--- trunk/ui/orderingList/src/main/config/component/orderinglist.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/orderingList/src/main/config/component/orderinglist.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,6 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
+ <![CDATA[The <rich:orderingList> is a component for ordering items in a list. This component provides possibilities to reorder a list and sort it on the client side.]]>
</description>
<renderer generate="true" override="true">
Modified: trunk/ui/pickList/src/main/config/component/picklist.xml
===================================================================
--- trunk/ui/pickList/src/main/config/component/picklist.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/pickList/src/main/config/component/picklist.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,7 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[ ]]>
+ <![CDATA[The <rich:pickList> component is used for moving selected item(s) from one list into another. ]]>
</description>
<renderer generate="true" override="true">
<name>org.richfaces.PickListRenderer</name>
Modified: trunk/ui/progressBAR/src/main/config/component/progressBar.xml
===================================================================
--- trunk/ui/progressBAR/src/main/config/component/progressBar.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/progressBAR/src/main/config/component/progressBar.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -12,8 +12,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:progressBar> component is designed for displaying a progress bar which shows the current status of the process. ]]>
</description>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.ProgressBarRenderer</name>
Modified: trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
===================================================================
--- trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -17,7 +17,8 @@
</test>
-->
<description>
- <![CDATA[ Scrollable Data Table ]]>
+ <![CDATA[The <rich:scrollableDataTable> component is used for the table-like component creation.
+ The component just adds the set of additional features described below in comparison with the standard table. ]]>
</description>
<test>
<classname>org.richfaces.component.html.HtmlScrollableDataTableComponentTest</classname>
Modified: trunk/ui/tree/src/main/config/component/tree.xml
===================================================================
--- trunk/ui/tree/src/main/config/component/tree.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/tree/src/main/config/component/tree.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -18,8 +18,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:tree> component is designed for hierarchical data presentation and is applied for building a tree structure with a drag-and-drop capability.]]>
</description>
<renderer generate="true" override="true">
<name>org.richfaces.TreeRenderer</name>
Modified: trunk/ui/tree/src/main/config/component/treeNode.xml
===================================================================
--- trunk/ui/tree/src/main/config/component/treeNode.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/tree/src/main/config/component/treeNode.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -18,8 +18,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:treeNode> component is designed for creating sets of tree elements within a <rich:tree> component.]]>
</description>
<renderer generate="true" override="true">
<name>org.richfaces.TreeNodeRenderer</name>
Modified: trunk/ui/treeModel/src/main/config/component/recursiveTreeNodesAdaptor.xml
===================================================================
--- trunk/ui/treeModel/src/main/config/component/recursiveTreeNodesAdaptor.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/treeModel/src/main/config/component/recursiveTreeNodesAdaptor.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:recursiveTreeNodesAdaptor> is an extension of a <rich:treeNodesAdaptor> component that provides the possibility to define data models and process nodes recursively. ]]>
</description>
<tag>
<name>recursiveTreeNodesAdaptor</name>
Modified: trunk/ui/treeModel/src/main/config/component/treeNodesAdaptor.xml
===================================================================
--- trunk/ui/treeModel/src/main/config/component/treeNodesAdaptor.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/treeModel/src/main/config/component/treeNodesAdaptor.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -13,8 +13,7 @@
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
<description>
- <![CDATA[
- ]]>
+ <![CDATA[The <rich:treeNodesAdaptor> provides the possibility to define data models and create representations for them.]]>
</description>
<tag>
<name>treeNodesAdaptor</name>
Modified: trunk/ui/virtualEarth/src/main/config/component/virtualEarth.xml
===================================================================
--- trunk/ui/virtualEarth/src/main/config/component/virtualEarth.xml 2008-08-19 13:30:05 UTC (rev 10139)
+++ trunk/ui/virtualEarth/src/main/config/component/virtualEarth.xml 2008-08-19 14:21:46 UTC (rev 10140)
@@ -9,9 +9,7 @@
<classname>org.richfaces.component.html.HtmlVirtualEarth</classname>
<superclass>org.richfaces.component.UIVirtualEarth</superclass>
<description>
- <![CDATA[
- It presents the google map in JSF applications
- ]]>
+ <![CDATA[The <rich:virtualEarth> component presents the Microsoft Virtual Earth map in the JSF applications.]]>
</description>
<test />
<renderer generate="true" override="true">
16 years, 4 months
JBoss Rich Faces SVN: r10139 - trunk/ui/tree/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-08-19 09:30:05 -0400 (Tue, 19 Aug 2008)
New Revision: 10139
Modified:
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
Log:
RF-3653
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2008-08-19 12:49:37 UTC (rev 10138)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2008-08-19 13:30:05 UTC (rev 10139)
@@ -66,7 +66,7 @@
String id = treeNode.getClientId(context);
StringBuilder script = new StringBuilder();
- script.append("Event.findElement(event, 'TABLE').object.");
+ script.append("$(this).up('TABLE').object.");
boolean expanded = tree.isExpanded();
if (expanded) {
script.append("fireCollapsionEvent();");
16 years, 4 months
JBoss Rich Faces SVN: r10138 - trunk/framework/api/src/main/java/org/richfaces/event.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-08-19 08:49:37 -0400 (Tue, 19 Aug 2008)
New Revision: 10138
Modified:
trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java
Log:
add java docs
Modified: trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java 2008-08-19 11:37:17 UTC (rev 10137)
+++ trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java 2008-08-19 12:49:37 UTC (rev 10138)
@@ -62,13 +62,15 @@
/**
* Return list of UploadItems
* @return the uploadItem
+ * @since 3.2.2
*/
public List<UploadItem> getUploadItems() {
return uploadItems;
}
/** Return true if multiple files were uploaded with form
- * @return
+ * @return boolean
+ * @since 3.2.2
*/
public boolean isMultiUpload() {
return (uploadItems != null && uploadItems.size() > 1);
16 years, 4 months
JBoss Rich Faces SVN: r10137 - in trunk/ui/tabPanel/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-08-19 07:37:17 -0400 (Tue, 19 Aug 2008)
New Revision: 10137
Modified:
trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
trunk/ui/tabPanel/src/main/templates/tab.jspx
Log:
Bug fixing(RF-4191)
Modified: trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
===================================================================
--- trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss 2008-08-19 09:25:21 UTC (rev 10136)
+++ trunk/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss 2008-08-19 11:37:17 UTC (rev 10137)
@@ -144,6 +144,7 @@
.dr-tbpnl-cntnt-pstn {
height:100%;
+ position: relative;
}
</f:verbatim>
Modified: trunk/ui/tabPanel/src/main/templates/tab.jspx
===================================================================
--- trunk/ui/tabPanel/src/main/templates/tab.jspx 2008-08-19 09:25:21 UTC (rev 10136)
+++ trunk/ui/tabPanel/src/main/templates/tab.jspx 2008-08-19 11:37:17 UTC (rev 10137)
@@ -16,7 +16,7 @@
<td id="#{clientId}" style="#{this:getTabDisplay(context, component)}"
height="100%">
- <table border="0" cellpadding="10" cellspacing="0" width="100%" class="dr-tbpnl-cntnt-pstn rich-tabpanel-content-position" style="position : relative;">
+ <table border="0" cellpadding="10" cellspacing="0" width="100%" class="dr-tbpnl-cntnt-pstn rich-tabpanel-content-position" style="">
<tr>
<td class="dr-tbpnl-cntnt rich-tabpanel-content #{component.pane.attributes['contentClass']} #{component.attributes['styleClass']}"
style="#{component.attributes['contentStyle']}; #{component.attributes['style']}"
16 years, 4 months
JBoss Rich Faces SVN: r10136 - trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-08-19 05:25:21 -0400 (Tue, 19 Aug 2008)
New Revision: 10136
Modified:
trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
Log:
refactoring
Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-08-19 09:25:17 UTC (rev 10135)
+++ trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-08-19 09:25:21 UTC (rev 10136)
@@ -123,9 +123,10 @@
boolean formUpload = multipartRequest.isFormUpload();
- if (isFlash && !formUpload) {
+ if (isFlash && !formUpload && fileList.size() > 0) {
try {
- int actualSize = multipartRequest.getFileSize(clientId);
+ UploadItem item = fileList.get(0);
+ int actualSize = item.getFileSize();
int clientSize = Integer.parseInt(requestParameterMap.get("_richfaces_size"));
if (actualSize != clientSize) {
16 years, 4 months
JBoss Rich Faces SVN: r10135 - in trunk/framework/api/src/main/java/org/richfaces: model and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-08-19 05:25:17 -0400 (Tue, 19 Aug 2008)
New Revision: 10135
Modified:
trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java
trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java
Log:
refactoring
Modified: trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java 2008-08-19 09:25:11 UTC (rev 10134)
+++ trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java 2008-08-19 09:25:17 UTC (rev 10135)
@@ -20,6 +20,8 @@
*/
package org.richfaces.event;
+import java.util.List;
+
import javax.faces.component.UIComponent;
import javax.faces.event.FacesEvent;
import javax.faces.event.FacesListener;
@@ -28,13 +30,12 @@
public class UploadEvent extends FacesEvent{
-
private static final long serialVersionUID = -7645197191376210068L;
- private UploadItem uploadItem = null;
+ private List<UploadItem> uploadItems = null;
- public UploadEvent(UIComponent component, UploadItem uploadItem) {
+ public UploadEvent(UIComponent component, List<UploadItem> uploadItems) {
super(component);
- this.uploadItem = uploadItem;
+ this.uploadItems = uploadItems;
}
@@ -47,10 +48,29 @@
}
- /**
+ /**Returns UploadItem instance.
+ * Returns first element of list of UploadItems in case of multiple upload.
* @return the uploadItem
*/
public UploadItem getUploadItem() {
- return uploadItem;
+ if (uploadItems != null && uploadItems.size() > 0) {
+ return uploadItems.get(0);
+ }
+ return null;
}
+
+ /**
+ * Return list of UploadItems
+ * @return the uploadItem
+ */
+ public List<UploadItem> getUploadItems() {
+ return uploadItems;
+ }
+
+ /** Return true if multiple files were uploaded with form
+ * @return
+ */
+ public boolean isMultiUpload() {
+ return (uploadItems != null && uploadItems.size() > 1);
+ }
}
Modified: trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java 2008-08-19 09:25:11 UTC (rev 10134)
+++ trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java 2008-08-19 09:25:17 UTC (rev 10135)
@@ -9,8 +9,6 @@
import java.io.File;
import java.io.Serializable;
-import javax.faces.FacesException;
-
/**
* Class provides object holder for file uploaded.
* Instance of this type will be returned by UploadEvent after appropriate listener called after uploading has been completed.
@@ -36,12 +34,16 @@
/** File byte content */
private byte [] bytes;
+ /** File size */
+ private int fileSize;
+
/**
* Constructor for the UploadItem
*/
- public UploadItem(String fileName, String contentType, Object file) {
+ public UploadItem(String fileName, int fileSize, String contentType, Object file) {
this.fileName = fileName;
this.contentType = contentType;
+ this.fileSize = fileSize;
if (null != file) {
if (file.getClass().isAssignableFrom(File.class)) {
this.file = (File) file;
@@ -93,6 +95,13 @@
public String getContentType() {
return contentType;
}
+
+ /**
+ * @return the fileSize
+ */
+ public int getFileSize() {
+ return fileSize;
+ }
}
16 years, 4 months