JBoss Rich Faces SVN: r12593 - trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2009-02-06 10:15:46 -0500 (Fri, 06 Feb 2009)
New Revision: 12593
Modified:
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
Log:
https://jira.jboss.org/jira/browse/RF-4808
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2009-02-06 15:06:55 UTC (rev 12592)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2009-02-06 15:15:46 UTC (rev 12593)
@@ -466,26 +466,32 @@
alert(s);
*/
-
- var eText = this.elements.textElement;
- if (!this.selectedTextClassNames)
+ if (e["treeItem"])
{
- this.selectedTextClassNames = Richfaces.getNSAttribute("selectedclass", eText);
- }
- if (this.selectedTextClassNames) {
- var classNames = this.selectedTextClassNames.split(' ')
- for (var i = 0; i < classNames.length; i++) {
- Element.addClassName(eText, classNames[i]);
- }
- if (this.previousTextClassNames && this.previousTextClassNames.indexOf(this.selectedTextClassNames)==-1)
+ var eText = this.elements.textElement;
+ if (!this.selectedTextClassNames)
{
- this.previousTextClassNames += " " + this.selectedTextClassNames;
+ this.selectedTextClassNames = Richfaces.getNSAttribute("selectedclass", eText);
}
- this.tree.input.value = this.id;
- this.tree.selectionManager.activeItem = this;
-
- if (this.tree.options.onSelection) this.tree.options.onSelection(this.id);
- this.tree.showNode(eText.parentNode);
+ if (this.selectedTextClassNames) {
+ var classNames = this.selectedTextClassNames.split(' ')
+ for (var i = 0; i < classNames.length; i++) {
+ Element.addClassName(eText, classNames[i]);
+ }
+ if (this.previousTextClassNames && this.previousTextClassNames.indexOf(this.selectedTextClassNames)==-1)
+ {
+ this.previousTextClassNames += " " + this.selectedTextClassNames;
+ }
+ this.tree.input.value = this.id;
+ this.tree.selectionManager.activeItem = this;
+
+ if (this.tree.options.onSelection) this.tree.options.onSelection(this.id);
+ this.tree.showNode(eText.parentNode);
+ }
+ } else
+ {
+ this.tree.input.value = "";
+ this.tree.selectionManager.activeItem = null;
}
if (e && e["originatingEventType"] == "mousedown" /* can be keydown */) {
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2009-02-06 15:06:55 UTC (rev 12592)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2009-02-06 15:15:46 UTC (rev 12593)
@@ -119,7 +119,7 @@
event["treeItem"] = prevSelection;
if (prevSelection) {
prevSelection.toggleSelection(event);
- }
+ } else treeItem.toggleSelection(event);
return ;
}
@@ -129,7 +129,7 @@
event["treeItem"] = prevSelection;
if (prevSelection) {
prevSelection.toggleSelection(event);
- }
+ } else treeItem.toggleSelection(event);
return ;
}
15 years, 10 months
JBoss Rich Faces SVN: r12592 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: andrei_exadel
Date: 2009-02-06 10:06:55 -0500 (Fri, 06 Feb 2009)
New Revision: 12592
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dropDownMenu/dropDownMenuAutoTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DropDownMenuTest.java
Log:
Drop Down component tests
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dropDownMenu/dropDownMenuAutoTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dropDownMenu/dropDownMenuAutoTest.xhtml 2009-02-06 13:59:50 UTC (rev 12591)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dropDownMenu/dropDownMenuAutoTest.xhtml 2009-02-06 15:06:55 UTC (rev 12592)
@@ -18,6 +18,9 @@
ajaxSingle="#{autoTestBean.ajaxSingle}"
value="New"
process="#{autoTestBean.process}"
+ bypassUpdates="#{autoTestBean.bypassUpdate}"
+ limitToList="#{autoTestBean.limitToList}"
+ reRender="#{autoTestBean.reRender}"
action="#{ddmenuBean.doNew}"
actionListener="#{autoTestBean.actionListener}"
oncomplete="#{autoTestBean.oncomplete}">
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-02-06 13:59:50 UTC (rev 12591)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-02-06 15:06:55 UTC (rev 12592)
@@ -256,18 +256,22 @@
reset();
setupControl(TestSetupEntry.limitToList, Boolean.TRUE);
- setupControl(TestSetupEntry.reRender, STATUS_ID + "," + TIME_ID);
+ setupControl(TestSetupEntry.reRender, TIME_ID);
clickLoad();
String text = base.getTextById(base.getParentId() + AUTOTEST_FORM_ID + TIME_ID);
+ String status = getStatus();
checkComponentReRendered();
base.AssertTextNotEquals(base.getParentId() + AUTOTEST_FORM_ID + TIME_ID, text, ""
+ "LimitToList = true does not work. Component in reRender list was not rerendered");
+ base.AssertTextEquals(base.getParentId() + AUTOTEST_FORM_ID + STATUS_ID, status, "Component inside <a4j:outputPanel ajaxRendered='true'> was rendered but should not in case of limitToList=true.");
+
}
+
public void testRequestParameters(Map<String, String> params) {
reset();
clickLoad();
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DropDownMenuTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DropDownMenuTest.java 2009-02-06 13:59:50 UTC (rev 12591)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DropDownMenuTest.java 2009-02-06 15:06:55 UTC (rev 12592)
@@ -23,10 +23,10 @@
import java.util.HashMap;
import java.util.Map;
-import org.ajax4jsf.autotest.bean.AutoTestBean;
import org.ajax4jsf.template.Template;
import org.richfaces.AutoTester;
import org.richfaces.SeleniumTestBase;
+import org.testng.Assert;
import org.testng.annotations.Test;
public class DropDownMenuTest extends SeleniumTestBase {
@@ -42,7 +42,98 @@
static {
params.put("parameter1", "value1");
}
+
+ @Test
+ public void testOnComplete(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, RESET_METHOD);
+
+ tester.testOncomplete();
+ }
+
+ @Test
+ public void testReRender(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, RESET_METHOD);
+
+ tester.testReRender();
+ }
+
+ @Test
+ public void testLimitToList(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, RESET_METHOD);
+
+ tester.testLimitToList();
+ }
+
+ @Test
+ public void testByPassUpdates(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, RESET_METHOD);
+
+ tester.testBypassUpdate();
+ }
+
+ @Test
+ public void testRendered(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, RESET_METHOD);
+
+ tester.testRendered();
+ }
+
+ @Test
+ public void testDropDownMenuOutput(Template template) {
+ renderPage(template, RESET_METHOD);
+
+ String parentId = getParentId() + "_form:";
+ String file = parentId + "file";
+ String filePath = "//div[@id='" + file + "']/div[1]";
+ String open = parentId + "open:anchor";
+ String saveAs = parentId + "saveAs:anchor";
+ String save = parentId + "save:anchor";
+ String saveAll = parentId + "saveAll:anchor";
+ String close = parentId + "close:anchor";
+ String exit = parentId + "exit:anchor";
+ String menu = file + "_menu";
+ String separator = parentId + "menuSeparator11";
+ selenium.mouseOver(filePath);
+ pause(1000, menu);
+ Number width = selenium.getElementWidth(menu);
+ System.out.println(width);
+ if (width.equals(0)) {
+ Assert.fail("Drop down menu has null width");
+ }
+ if (selenium.getElementPositionTop(menu).intValue() <= 0) {
+ Assert.fail("Drop down menu should have top position more than 0");
+ }
+ AssertVisible(open);
+ AssertTextEquals(open, "Open", "Open menu Item was not rendered");
+ AssertVisible(saveAs);
+ AssertTextEquals(saveAs, "Save As...", "Save As... menu Item was not rendered");
+ AssertVisible(close);
+ AssertTextEquals(close, "Close", "Open menu Item was not rendered");
+ AssertVisible(exit);
+ AssertTextEquals(exit, "Exit", "Exit menu Item was not rendered");
+ AssertVisible(parentId + "open:icon", "Icon for menu item was not rendered");
+
+
+
+ selenium.mouseOver(saveAs);
+ pause(1000, menu);
+ AssertVisible(save);
+ AssertVisible(saveAll);
+ AssertTextEquals(save, "Save", "Save menu Item was not rendered");
+ AssertTextEquals(saveAll, "Save All", "Save All menu Item was not rendered");
+ AssertVisible(parentId + "saveAs:folder", "Save as group was not rendered");
+
+ assertClassNames(separator, new String [] {"dr-menu-separator", "rich-menu-separator"}, "Separator has invalid css class names", true);
+ AssertVisible(separator, "Separator was not output");
+
+ }
+
@Test
public void testDropDownMenuComponent(Template template) {
renderPage(template, RESET_METHOD);
@@ -50,7 +141,7 @@
testDropDownComponent();
}
- @Test
+ @Test
public void testWithExternalvalidationFailure(Template template) {
AutoTester autoTester = getAutoTester(this);
autoTester.renderPage(template, RESET_METHOD);
15 years, 10 months
JBoss Rich Faces SVN: r12591 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: dsvyatobatsko
Date: 2009-02-06 08:59:50 -0500 (Fri, 06 Feb 2009)
New Revision: 12591
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/panelMenuGroup/panelMenuGroupCoreTest.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5896
https://jira.jboss.org/jira/browse/RF-5908
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/panelMenuGroup/panelMenuGroupCoreTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/panelMenuGroup/panelMenuGroupCoreTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-02-06 12:56:38 UTC (rev 12590)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-02-06 13:59:50 UTC (rev 12591)
@@ -640,6 +640,20 @@
}
/**
+ * Asserts DOM node is not present or not visible
+ *
+ * @param id -
+ * DOM element id
+ */
+ public void AssertNotPresentOrNotVisible(String id, String message) {
+ try {
+ AssertNotPresent(id, message);
+ } catch (AssertionError ae) {
+ AssertNotVisible(id, message);
+ }
+ }
+
+ /**
* Asserts DOM node is not present
*
* @param id -
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java 2009-02-06 12:56:38 UTC (rev 12590)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java 2009-02-06 13:59:50 UTC (rev 12591)
@@ -2,11 +2,16 @@
import org.ajax4jsf.template.Template;
import org.richfaces.AutoTester;
+import org.richfaces.AutoTester.TestSetupEntry;
import org.testng.Assert;
import org.testng.annotations.Test;
public class PanelMenuGroupTest extends PanelMenuItemTest {
+ private final static String CORE_TEST_URL = "panelMenuGroupCoreTest.xhtml";
+
+ private static final String RESET_METHOD = "#{panelBean.reset}";
+
@Test
public void testIconsAttributesApply(Template template) {
renderPage(LOOK_AND_FEEL_TEST_URL, template, null);
@@ -47,6 +52,105 @@
assertEvent("oncollapse");
}
+ @Test
+ public void testComponentIsFunctioningCorrectlyForAllSubmissionModes(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(CORE_TEST_URL, template, null);
+ writeStatus("Check component is functioning correctly for all submission modes; server listeners fire");
+
+ String serverGrpId = "icon" + tester.getClientId("serverGrp");
+ String ajaxGrpId = "icon" + tester.getClientId("ajaxGrp");
+ String noneGrpId = "icon" + tester.getClientId("noneGrp");
+
+ writeStatus("Check server mode: listeners are invoked, model is updated");
+ clickCommandAndWait(serverGrpId);
+
+ tester.checkUpdateModel(true);
+ tester.checkActionListener(true);
+
+ writeStatus("Check ajax mode: listeners are invoked, model is updated");
+
+ tester.startTracing();
+ clickAjaxCommandAndWait(ajaxGrpId);
+
+ tester.checkUpdateModel(true);
+ tester.checkActionListener(true);
+
+ writeStatus("Check none mode: listeners are not invoked, model is not updated");
+
+ tester.startTracing();
+ clickById(noneGrpId);
+
+ tester.checkUpdateModel(false);
+ tester.checkActionListener(false);
+ }
+
+ @Test
+ public void testNestedComponentsAreNotProcessedForServerAwareClosedGroups(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(CORE_TEST_URL, template, RESET_METHOD);
+ writeStatus("Check nested components aren't processed for server-aware closed groups");
+
+ String inputsId = tester.getClientId("_inputs");
+
+ writeStatus("Primarily all groups are closed. Check that content of server-aware groups are not processed");
+
+ tester.clickSubmit();
+
+ String inputs = selenium.getText(inputsId);
+ Assert.assertTrue(inputs.contains("grp3"), "Content of closed non-server-aware group (grp3) must be processed");
+ Assert.assertFalse(inputs.contains("grp2"), "Content of closed server-aware group (grp2) must not be processed");
+ Assert.assertFalse(inputs.contains("grp1"), "Content of closed server-aware group (grp1) must not be processed");
+
+ String sRequiredId = tester.getClientId("sRequired");
+ String aRequiredId = tester.getClientId("aRequired");
+ String nRequiredId = tester.getClientId("nRequired");
+
+ String serverGrpId = "icon" + tester.getClientId("serverGrp");
+ String ajaxGrpId = "icon" + tester.getClientId("ajaxGrp");
+ String noneGrpId = "icon" + tester.getClientId("noneGrp");
+
+ tester.setupControl(TestSetupEntry.required, true);
+ tester.clickLoad();
+
+ writeStatus("Now all groups have nested invalid controls");
+ writeStatus("Because client groups are processed anyway clicking any server-aware group has no affect: " +
+ "listeners are not invoked, model is not update, a group is not expanded");
+ clickAjaxCommandAndWait(ajaxGrpId);
+ tester.checkUpdateModel(false);
+ tester.checkActionListener(false);
+ AssertNotPresentOrNotVisible(aRequiredId, "Ajax group must not be expanded");
+
+ clickCommandAndWait(serverGrpId);
+ tester.checkUpdateModel(false);
+ tester.checkActionListener(false);
+ AssertNotPresentOrNotVisible(aRequiredId, "Server group must not be expanded");
+
+ writeStatus("Fix client group invalid content and so on");
+ clickById(noneGrpId);
+ setValueById(nRequiredId, "valid");
+
+ clickAjaxCommandAndWait(ajaxGrpId);
+ tester.checkUpdateModel(true);
+ tester.checkActionListener(true);
+ AssertPresentAndVisible(aRequiredId, "Ajax group would have been expanded");
+
+ tester.startTracing();
+ clickCommandAndWait(serverGrpId);
+ tester.checkUpdateModel(false);
+ tester.checkActionListener(false);
+ AssertNotPresentOrNotVisible(sRequiredId, "Server group wouldn't have been expanded");
+
+ writeStatus("Fix ajax group invalid content");
+ clickAjaxCommandAndWait(ajaxGrpId);
+ setValueById(aRequiredId, "valid");
+
+ clickCommandAndWait(serverGrpId);
+ tester.checkUpdateModel(true);
+ tester.checkActionListener(true);
+ AssertPresentAndVisible(sRequiredId, "Server group would have been expanded");
+ }
+
@Override
public void sendAjax() {
clickAjaxCommandAndWait("icon" + getAutoTester(this).getClientId(AutoTester.COMPONENT_ID));
15 years, 10 months
JBoss Rich Faces SVN: r12590 - in trunk/ui: pickList/src/main/config/component and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: smukhina
Date: 2009-02-06 07:56:38 -0500 (Fri, 06 Feb 2009)
New Revision: 12590
Modified:
trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
trunk/ui/pickList/src/main/config/component/picklist.xml
Log:
https://jira.jboss.org/jira/browse/RF-6056
Improper symbols in attributes description are corrected
Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2009-02-06 12:44:34 UTC (rev 12589)
+++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2009-02-06 12:56:38 UTC (rev 12590)
@@ -509,7 +509,7 @@
<property>
<name>controlsVerticalAlign</name>
<classname>java.lang.String</classname>
- <description>Customizes vertically a position of move/copy and order controls relatively to lists. Default value is "middle"</description>
+ <description>Customizes�vertically�a�position�of�move/copy�and order controls�relatively�to�lists. Default value is "middle"</description>
<defaultvalue><![CDATA["middle"]]></defaultvalue>
</property>
<property>
@@ -551,13 +551,13 @@
<property>
<name>copyAllControlClass</name>
<classname>java.lang.String</classname>
- <description>CSS class for copy all control</description>
+ <description>CSS class�for�copy all�control</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>removeAllControlClass</name>
<classname>java.lang.String</classname>
- <description>CSS class for remove all control</description>
+ <description>CSS�class�for�remove all control</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
Modified: trunk/ui/pickList/src/main/config/component/picklist.xml
===================================================================
--- trunk/ui/pickList/src/main/config/component/picklist.xml 2009-02-06 12:44:34 UTC (rev 12589)
+++ trunk/ui/pickList/src/main/config/component/picklist.xml 2009-02-06 12:56:38 UTC (rev 12590)
@@ -170,14 +170,14 @@
<property>
<name>listClass</name>
<classname>java.lang.String</classname>
- <description>CSS class for a list</description>
+ <description>CSS�class�for�a�list</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
<name>controlClass</name>
<classname>java.lang.String</classname>
- <description>CSS class for a list</description>
+ <description>CSS�class�for�a�list</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
15 years, 10 months
JBoss Rich Faces SVN: r12589 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits@lists.jboss.org
Author: alevkovsky
Date: 2009-02-06 07:44:34 -0500 (Fri, 06 Feb 2009)
New Revision: 12589
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ProgressBarTest.java
Log:
Progress bar selenium tests
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ProgressBarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ProgressBarTest.java 2009-02-06 12:31:37 UTC (rev 12588)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ProgressBarTest.java 2009-02-06 12:44:34 UTC (rev 12589)
@@ -119,8 +119,8 @@
}
@Test
- public void testActionListeners(Template template) {
- //actionListener not work RF-5500
+ public void testActionListeners(Template template) {
+ //FIXME actionListener not work in progressBar RF-5500
AutoTester tester = getAutoTester(this);
tester.renderPage(template, null);
writeStatus("Test action listener attribute");
@@ -161,7 +161,7 @@
@Test
public void testNestedActionListener(Template template) {
- //actionListener not work RF-5500
+ //FIXME actionListener not work in progressBar RF-5500
AutoTester tester = getAutoTester(this);
tester.renderPage(template, null);
writeStatus("Test actionListener defined as nested tag are invoked on the server ");
15 years, 10 months
JBoss Rich Faces SVN: r12588 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/progressBar and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alevkovsky
Date: 2009-02-06 07:31:37 -0500 (Fri, 06 Feb 2009)
New Revision: 12588
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/progressBar/progressBarAutoTest.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ProgressBarTestBean.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ProgressBarTest.java
Log:
Progress bar selenium tests
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ProgressBarTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ProgressBarTestBean.java 2009-02-06 10:38:52 UTC (rev 12587)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ProgressBarTestBean.java 2009-02-06 12:31:37 UTC (rev 12588)
@@ -28,6 +28,8 @@
private boolean enabled = false;
+ private int content = 0;
+
private Long value = -5L;
public String getDate() {
@@ -74,6 +76,25 @@
public void setValue(Long value) {
this.value = value;
}
+
+ /**
+ * @return the content
+ */
+ public String getContent() {
+ content++;
+ return String.valueOf(content);
+ }
+
+ /**
+ * @param content the content to set
+ */
+ public void setContent(String content) {
+ if(content != null && content.length() > 0){
+ this.content = Integer.parseInt(content);
+ }else{
+ this.content = 0;
+ }
+ }
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/progressBar/progressBarAutoTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/progressBar/progressBarAutoTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-02-06 10:38:52 UTC (rev 12587)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-02-06 12:31:37 UTC (rev 12588)
@@ -200,18 +200,28 @@
}
public void testImmediate() {
+ testImmediate(true);
+ }
+
+ public void testImmediate(boolean checkListener) {
reset();
setupControl(TestSetupEntry.immediate, Boolean.TRUE);
clickLoad();
base.sendAjax();
-
- checkActionListener(true);
+
+ if (checkListener) {
+ checkActionListener(true);
+ }
checkUpdateModel(false);
}
public void testImmediateWithExternalValidationFailed() {
+ testImmediateWithExternalValidationFailed(true);
+ }
+
+ public void testImmediateWithExternalValidationFailed(boolean checkListener) {
reset();
setupControl(TestSetupEntry.immediate, Boolean.TRUE);
clickLoad();
@@ -219,7 +229,9 @@
setExtrenalValidationFailed();
base.sendAjax();
- checkActionListener(true);
+ if (checkListener) {
+ checkActionListener(true);
+ }
checkUpdateModel(false);
}
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ProgressBarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ProgressBarTest.java 2009-02-06 10:38:52 UTC (rev 12587)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ProgressBarTest.java 2009-02-06 12:31:37 UTC (rev 12588)
@@ -20,17 +20,29 @@
*/
package org.richfaces.testng;
+import java.util.HashMap;
+import java.util.Map;
+
import org.ajax4jsf.template.Template;
+import org.richfaces.AutoTester;
import org.richfaces.SeleniumTestBase;
import org.testng.Assert;
import org.testng.annotations.Test;
public class ProgressBarTest extends SeleniumTestBase {
+
+ private static Map<String, String> params = new HashMap<String, String>();
+ static {
+ params.put("parameter1", "value1");
+ params.put("parameter2", "value2");
+ params.put("parameter3", "value3");
+ }
+
@Test
public void testProgressBarComponent(Template template) {
- renderPage(template);
+ renderPage(template);
String parentId = getParentId() + "_form:";
@@ -62,7 +74,7 @@
pause(5000, progressBarId);
writeStatus("Check value");
- Assert.assertTrue((getProgressBarValue(progressBarId).intValue() != value),
+ Assert.assertTrue((getProgressBarValue(progressBarId).intValue() > value),
"Progress has been terminated abnormal");
writeStatus("Disable polling");
@@ -105,7 +117,81 @@
waitForAjaxCompletion();
}
+
+ @Test
+ public void testActionListeners(Template template) {
+ //actionListener not work RF-5500
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test action listener attribute");
+ tester.testActionListener();
+ }
+
+ @Test
+ public void testRenderedAttribute(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test component with rendered = false is not present on the page");
+ tester.testRendered();
+ }
+ @Test
+ public void testNestedParams(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test component encodes nested f:param tags and their values are present as request parameters");
+ tester.testRequestParameters(params);
+ }
+
+ @Test
+ public void testImmediate(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test immediate attribute");
+ tester.testImmediate(false);
+ }
+
+ @Test
+ public void testImmediateWithExternalValidationFailed(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test immediate attribute with external validation failed");
+ tester.testImmediateWithExternalValidationFailed(false);
+ }
+
+ @Test
+ public void testNestedActionListener(Template template) {
+ //actionListener not work RF-5500
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test actionListener defined as nested tag are invoked on the server ");
+ tester.testNestedActionListener();
+ }
+
+ @Test
+ public void testListenersAreNotInvokedInCaseOfExternalValidationFailure(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test listeners aren't invoked in case of external validation failure");
+ tester.testExtrenalValidationFailure();
+ }
+
+ @Test
+ public void testAjaxSingle(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test ajaxSingle attribute");
+ tester.testAjaxSingle(false);
+ }
+
+ @Test
+ public void testAjaxSingleWithInternalValidationFailed(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+ writeStatus("Test ajaxSingle attribute in case of invalid children state");
+ tester.testAjaxSingleWithInternalValidationFailed();
+ }
+
private void enableProgressBar(String id, boolean enable) {
invokeFromComponent(id, (enable ? "enable" : "disable"), null);
}
@@ -119,9 +205,25 @@
Integer v = Integer.parseInt(value);
return v;
}
+
+ @Override
+ public void sendAjax() {
+ delay(2000);
+ }
+ @Override
+ public void setInternalValidationFailed() {
+ String childCompId = getAutoTester(this).getClientId("") + "child";
+ setValueById(childCompId, "");
+ }
+
public String getTestUrl() {
return "pages/progressBar/progressBarTest.xhtml";
}
+
+ @Override
+ public String getAutoTestUrl() {
+ return "pages/progressBar/progressBarAutoTest.xhtml";
+ }
}
15 years, 10 months
JBoss Rich Faces SVN: r12587 - in trunk: samples/treeModelDemo/src/main/webapp/pages and 4 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-02-06 05:38:52 -0500 (Fri, 06 Feb 2009)
New Revision: 12587
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp
trunk/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml
trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js
Log:
https://jira.jboss.org/jira/browse/RF-6029
treeNode ondropend and oncomplete never executed using DnD
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2009-02-05 23:20:35 UTC (rev 12586)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2009-02-06 10:38:52 UTC (rev 12587)
@@ -567,28 +567,6 @@
return null;
}
- public static void addProcessToAjaxContext(FacesContext facesContext, UIComponent uiComponent){
- if (!(uiComponent instanceof AjaxComponent)) {
- return;
- }
-
- AjaxComponent ajaxComponent = (AjaxComponent) uiComponent;
- Set<String> toProcess = asSet(ajaxComponent.getProcess());
-
- if (null != toProcess) {
- HashSet<String> componentIdsToProcess = new HashSet<String>();
- for (String componentId : toProcess) {
- UIComponent component = RendererUtils.getInstance().
- findComponentFor(uiComponent, componentId);
-
- componentIdsToProcess.add( null == component ?
- componentId : component.getClientId(facesContext));
- }
- AjaxContext.getCurrentInstance(facesContext)
- .setAjaxAreasToProcess(componentIdsToProcess);
- }
- }
-
/**
* Get status area Id for given component.
*
Modified: trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp 2009-02-05 23:20:35 UTC (rev 12586)
+++ trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp 2009-02-06 10:38:52 UTC (rev 12587)
@@ -1,3 +1,4 @@
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
@@ -3,5 +4,5 @@
<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/treeModel" prefix="model" %>
<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tree" prefix="tree" %>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/drag-drop" prefix="dnd" %>
<html>
@@ -22,29 +23,25 @@
<tree:tree adviseNodeOpened="#{treeModelBean.adviseNodeOpened}" switchType="client">
<model:treeNodesAdaptor id="project" nodes="#{loaderBean.projects}" var="project">
<tree:treeNode>
- <a4j:commandLink action="#{project.click}" ajaxSingle="true" value="Immediate " />
- <br />
+ <a4j:commandLink action="#{project.click}" ajaxSingle="true" value="Immediate " /><br />
<h:commandLink action="#{project.click}" value="Project: #{project.name}" />
</tree:treeNode>
<model:treeNodesAdaptor id="srcDir" var="srcDir" nodes="#{project.srcDirs}">
<tree:treeNode>
- <a4j:commandLink action="#{srcDir.click}" ajaxSingle="true" value="Immediate " />
- <br />
+ <a4j:commandLink action="#{srcDir.click}" ajaxSingle="true" value="Immediate " /><br />
<h:commandLink action="#{srcDir.click}" value="Source directory: #{srcDir.name}" />
</tree:treeNode>
<model:treeNodesAdaptor id="pkg" var="pkg" nodes="#{srcDir.packages}">
<tree:treeNode>
- <a4j:commandLink action="#{pkg.click}" ajaxSingle="true" value="Immediate " />
- <br />
+ <a4j:commandLink action="#{pkg.click}" ajaxSingle="true" value="Immediate " /><br />
<h:commandLink action="#{pkg.click}" value="Package: #{pkg.name}" />
</tree:treeNode>
<model:treeNodesAdaptor id="class" var="class" nodes="#{pkg.classes}">
<tree:treeNode>
- <a4j:commandLink action="#{class.click}" ajaxSingle="true" value="Immediate " />
- <br />
+ <a4j:commandLink action="#{class.click}" ajaxSingle="true" value="Immediate " /><br />
<h:commandLink action="#{class.click}" value="Class: #{class.name}" />
</tree:treeNode>
</model:treeNodesAdaptor>
@@ -52,15 +49,13 @@
<model:treeNodesAdaptor id="pkg1" var="pkg" nodes="#{srcDir.packages}">
<tree:treeNode>
- <a4j:commandLink action="#{pkg.click}" ajaxSingle="true" value="Immediate " />
- <br />
+ <a4j:commandLink action="#{pkg.click}" ajaxSingle="true" value="Immediate " /><br />
<h:commandLink action="#{pkg.click}" value="Package1: #{pkg.name}" />
</tree:treeNode>
<model:treeNodesAdaptor id="class1" var="class" nodes="#{pkg.classes}">
<tree:treeNode>
- <a4j:commandLink action="#{class.click}" ajaxSingle="true" value="Immediate " />
- <br />
+ <a4j:commandLink action="#{class.click}" ajaxSingle="true" value="Immediate " /><br />
<h:commandLink action="#{class.click}" value="Class1: #{class.name}" />
</tree:treeNode>
</model:treeNodesAdaptor>
@@ -70,8 +65,7 @@
<model:recursiveTreeNodesAdaptor id="dir" var="dir"
roots="#{project.dirs}" nodes="#{dir.directories}">
<tree:treeNode>
- <a4j:commandLink action="#{dir.click}" ajaxSingle="true" value="Immediate " />
- <br />
+ <a4j:commandLink action="#{dir.click}" ajaxSingle="true" value="Immediate " /><br />
<h:commandLink action="#{dir.click}" value="Directory: #{dir.name}" />
</tree:treeNode>
@@ -121,7 +115,57 @@
</tree:treeNode>
</model:recursiveTreeNodesAdaptor>
</tree:tree>
+
+ <h3> treeNode ondropend and oncomplete never executed using DnD</h3>
+
+ <a4j:outputPanel id="treeWrapper" layout="block">
+ <tree:tree id="portTreePaneId" style="width:200px"
+ switchType="ajax" ajaxSubmitSelection="true"
+ dragIndicator=":form:indicator" >
+ <model:treeNodesAdaptor nodes="#{loaderBean.projects}" var="profile" >
+ <tree:treeNode acceptedTypes="pidDrag"
+ dropValue="#{profile.name}"
+ typeMapping="{pidDrag:pidDrag}"
+ oncomplete="out('complete');"
+ dragType="pidDrag"
+ dropListener="#{treeModelBean.processDrop}"
+ ondrop="out('ondrop');"
+ ondropover="out('ondropover');"
+ ondropend="out('ondropend');"
+ ondropout="out('ondropout');"
+
+ ondragenter="out('ondragenter')"
+ ondragend="out('ondragend')"
+ ondragexit="out('ondragexit')"
+ ondragstart="out('ondragstart')"
+ >
+ <a4j:outputPanel layout="block">
+ <h:outputText value="#{profile.name}" />
+ </a4j:outputPanel>
+ </tree:treeNode>
+
+ <model:treeNodesAdaptor nodes="#{profile.srcDirs}" var="pid" >
+ <tree:treeNode dragType="pidDrag" dragValue="#{pid.name}">
+ <dnd:dndParam name="label" type="drag" value="dragged pid" />
+ <a4j:outputPanel layout="block">
+ <h:outputText value="#{pid.name}" />
+ </a4j:outputPanel>
+ </tree:treeNode>
+ </model:treeNodesAdaptor>
+ </model:treeNodesAdaptor>
+ </tree:tree>
+
+ </a4j:outputPanel>
+
</h:form>
</f:view>
+
+ <textarea id="debugOut" rows="5" cols="120"></textarea>
+ <script type="text/javascript">
+ function out(str){
+ debugOut = document.getElementById("debugOut")
+ debugOut.value += str + "\n"
+ }
+ </script>
</body>
</html>
Modified: trunk/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml
===================================================================
--- trunk/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml 2009-02-05 23:20:35 UTC (rev 12586)
+++ trunk/test-applications/regressionArea/regressionArea-tests/src/test/resources/testng.xml 2009-02-06 10:38:52 UTC (rev 12587)
@@ -15,11 +15,10 @@
</packages>
</test-->
<test name="FireFoxFunctionalTestsDANe">
- <parameter name="loadStyleStrategy" value="DEFAULT"/>
- <parameter name="loadScriptStrategy" value="ALL"/>
- <parameter name="filterPrefix" value="/faces/NEKO/"/>
+ <parameter name="loadStyleStrategy" value="DEFAULT"/>
+ <parameter name="loadScriptStrategy" value="ALL"/>
+ <parameter name="filterPrefix" value="/faces/NEKO/"/>
<parameter name="browser" value="*firefox"/>
-
<packages>
<package name="org.richfaces.testng" />
<package name="org.richfaces.testng.rf4507" />
@@ -31,6 +30,5 @@
<package name="org.richfaces.testng.rf5933" />
<package name="org.richfaces.testng.rf6035" />
</packages>
-
</test>
</suite>
Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
===================================================================
--- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-02-05 23:20:35 UTC (rev 12586)
+++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-02-06 10:38:52 UTC (rev 12587)
@@ -34,6 +34,7 @@
import javax.faces.event.ActionEvent;
import javax.faces.event.PhaseId;
+import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.event.AjaxEvent;
import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
@@ -87,14 +88,8 @@
if (AjaxRendererUtils.isAjaxRequest(context)) {
- // add component itself to rendered list of components
- AjaxRendererUtils.addRegionByName(context, menuItem, menuItem.getId());
-
- // add regions specified in the "reRender" attribute to
- // rendered list of components
- AjaxRendererUtils.addRegionsFromComponent(menuItem, context);
-
- AjaxRendererUtils.addProcessToAjaxContext(context, menuItem);
+ AjaxContext.getCurrentInstance(context)
+ .addAreasToProcessFromComponent(context, menuItem);
}
}
Modified: trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2009-02-05 23:20:35 UTC (rev 12586)
+++ trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2009-02-06 10:38:52 UTC (rev 12587)
@@ -32,6 +32,7 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.component.AjaxSupport;
+import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSReference;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
@@ -105,7 +106,8 @@
// panel to rendered list of components
AjaxRendererUtils.addRegionsFromComponent(panel, context);
- AjaxRendererUtils.addProcessToAjaxContext(context, panel);
+ AjaxContext.getCurrentInstance(context)
+ .addAreasToProcessFromComponent(context, panel);
}
}
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js 2009-02-05 23:20:35 UTC (rev 12586)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js 2009-02-06 10:38:52 UTC (rev 12587)
@@ -75,6 +75,11 @@
}
this.tree.drop.call(this, event, drag);
+
+ var options = this.getDropzoneOptions();
+ if (options && options.ondropend) {
+ options.ondropend();
+ }
},
getIndicator: function() {
15 years, 10 months
JBoss Rich Faces SVN: r12586 - trunk/ui/dataTable/src/main/config/component.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-02-05 18:20:35 -0500 (Thu, 05 Feb 2009)
New Revision: 12586
Modified:
trunk/ui/dataTable/src/main/config/component/subTable.xml
Log:
https://jira.jboss.org/jira/browse/RF-4962
Modified: trunk/ui/dataTable/src/main/config/component/subTable.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/subTable.xml 2009-02-05 23:14:39 UTC (rev 12585)
+++ trunk/ui/dataTable/src/main/config/component/subTable.xml 2009-02-05 23:20:35 UTC (rev 12586)
@@ -55,6 +55,28 @@
<defaultvalue>true</defaultvalue>
</property>
+ <property hidden="true">
+ <name>filterMethod</name>
+ </property>
+ <property hidden="true">
+ <name>filterValue</name>
+ </property>
+ <property hidden="true">
+ <name>selfSorted</name>
+ </property>
+ <property hidden="true">
+ <name>sortExpression</name>
+ </property>
+ <property hidden="true">
+ <name>sortMode</name>
+ </property>
+ <property hidden="true">
+ <name>sortOrder</name>
+ </property>
+ <property hidden="true">
+ <name>sortPriority</name>
+ </property>
+
<property>
<name>componentState</name>
<classname>org.ajax4jsf.model.DataComponentState</classname>
15 years, 10 months
JBoss Rich Faces SVN: r12585 - trunk/cdk/generator/src/main/resources/META-INF/schema/entities.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-02-05 18:14:39 -0500 (Thu, 05 Feb 2009)
New Revision: 12585
Modified:
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent
Log:
https://jira.jboss.org/jira/browse/RF-4962
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent 2009-02-05 23:14:32 UTC (rev 12584)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ui_input_attributes.ent 2009-02-05 23:14:39 UTC (rev 12585)
@@ -33,6 +33,32 @@
<methodargs>javax.faces.event.ValueChangeEvent</methodargs>
<description>Listener for value changes</description>
</property>
-
-
+ <property>
+ <name>requiredMessage</name>
+ <classname>java.lang.String</classname>
+ <description>
+ A ValueExpression enabled attribute that, if present,
+ will be used as the text of the validation message for
+ the "required" facility, if the "required" facility is
+ used
+ </description>
+ </property>
+ <property>
+ <name>validatorMessage</name>
+ <classname>java.lang.String</classname>
+ <description>
+ A ValueExpression enabled attribute that, if present,
+ will be used as the text of the validator message,
+ replacing any message that comes from the validator
+ </description>
+ </property>
+ <property>
+ <name>converterMessage</name>
+ <classname>java.lang.String</classname>
+ <description>
+ A ValueExpression enabled attribute that, if present,
+ will be used as the text of the converter message,
+ replacing any message that comes from the converter
+ </description>
+ </property>
</properties>
15 years, 10 months
JBoss Rich Faces SVN: r12584 - in trunk/ui: fileUpload/src/main/config/component and 11 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-02-05 18:14:32 -0500 (Thu, 05 Feb 2009)
New Revision: 12584
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml
trunk/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml
trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
trunk/ui/panelbar/src/main/config/component/panelbar.xml
trunk/ui/panelmenu/src/main/config/component/panelMenu.xml
trunk/ui/pickList/src/main/config/component/picklist.xml
trunk/ui/tabPanel/src/main/config/component/tabPanel.xml
trunk/ui/togglePanel/src/main/config/component/togglePanel.xml
Log:
https://jira.jboss.org/jira/browse/RF-4962
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -302,34 +302,6 @@
</property>
<property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present,
- will be used as the text of the validation message for
- the "required" facility, if the "required" facility is
- used
- </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present,
- will be used as the text of the validator message,
- replacing any message that comes from the validator
- </description>
- </property>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present,
- will be used as the text of the converter message,
- replacing any message that comes from the converter
- </description>
- </property>
- <property>
<name>oninputmouseover</name>
<classname>java.lang.String</classname>
<description>HTML: a script expression; a pointer is moved onto</description>
Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -332,34 +332,6 @@
<description>Used for locale definition</description>
</property>
- <property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present,
- will be used as the text of the validation message for
- the "required" facility, if the "required" facility is
- used
- </description>
- </property>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present,
- will be used as the text of the converter message,
- replacing any message that comes from the converter
- </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present,
- will be used as the text of the validator message,
- replacing any message that comes from the validator
- </description>
- </property>
<property>
<name>ajaxSingle</name>
Modified: trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -246,27 +246,6 @@
<classname>java.lang.String</classname>
<description>HTML: script expression; a pointer button is released</description>
</property>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the converter message, replacing any message that comes from the converter
- </description>
- </property>
- <property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validation message for the "required" facility, if the "required" facility is used
- </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator
- </description>
- </property>
<property>
<name>label</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
===================================================================
--- trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -335,30 +335,8 @@
<description>CSS style class for hovered
control</description>
</property>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if
- present, will be used as the text of the converter
- message, replacing any message that comes from the
- converter </description>
- </property>
- <property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if
- present, will be used as the text of the
- validation message for the "required" facility, if
- the "required" facility is used </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if
- present, will be used as the text of the validator
- message, replacing any message that comes from the
- validator </description>
- </property> &html_events; &ui_component_attributes;
+ &html_events;
+ &ui_component_attributes;
&ui_input_attributes; <property hidden="true" existintag="false"
exist="false">
<name>localValueSet</name>
Modified: trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml
===================================================================
--- trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -267,27 +267,6 @@
<description>A name of CSS class for a selected control decrease arrow element</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the converter message, replacing any message that comes from the converter
- </description>
- </property>
- <property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validation message for the "required" facility, if the "required" facility is used
- </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator
- </description>
- </property>
<property>
<name>inputPosition</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml
===================================================================
--- trunk/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -35,27 +35,6 @@
</test>
</tag>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the converter message, replacing any message that comes from the converter
- </description>
- </property>
- <property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validation message for the "required" facility, if the "required" facility is used
- </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator
- </description>
- </property>
<property>
<name>minValue</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -72,6 +72,9 @@
<property hidden="true">
<name>required</name>
</property>
+ <property hidden="true">
+ <name>requiredMessage</name>
+ </property>
<property elonly="true">
<name>sourceSelection</name>
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -191,9 +191,6 @@
<property hidden="true" >
<name>requiredMessage</name>
<classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if present, will be used as the
- text of the validation message for the "required" facility, if the "required"
- facility is used </description>
</property>
<property hidden="true" >
<name>required</name>
Modified: trunk/ui/panelbar/src/main/config/component/panelbar.xml
===================================================================
--- trunk/ui/panelbar/src/main/config/component/panelbar.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/panelbar/src/main/config/component/panelbar.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -28,27 +28,6 @@
</superclass>
<test/>
</tag>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the converter message, replacing any message that comes from the converter.
- </description>
- </property>
- <property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validation message for the "required" facility, if the "required" facility is used.
- </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator.
- </description>
- </property>
<property>
<name>width</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/panelmenu/src/main/config/component/panelMenu.xml
===================================================================
--- trunk/ui/panelmenu/src/main/config/component/panelMenu.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/panelmenu/src/main/config/component/panelMenu.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -360,28 +360,6 @@
<defaultvalue>false</defaultvalue>
</property>
- <property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if present, will be used as the
- text of the validation message for the "required" facility, if the "required"
- facility is used </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if present, will be used as the
- text of the validator message, replacing any message that comes from the validator
- </description>
- </property>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if present, will be used as the
- text of the converter message, replacing any message that comes from the converter
- </description>
- </property>
-
<property hidden="true">
<name>localValueSet</name>
<description>localValueSet</description>
@@ -557,29 +535,7 @@
<description>Displayed node's text</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
-
- <property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if present, will be used as the
- text of the validation message for the "required" facility, if the "required"
- facility is used </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if present, will be used as the
- text of the validator message, replacing any message that comes from the validator
- </description>
- </property>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if present, will be used as the
- text of the converter message, replacing any message that comes from the converter
- </description>
- </property>
-
+
<property hidden="true">
<name>localValueSet</name>
<description>localValueSet</description>
Modified: trunk/ui/pickList/src/main/config/component/picklist.xml
===================================================================
--- trunk/ui/pickList/src/main/config/component/picklist.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/pickList/src/main/config/component/picklist.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -131,14 +131,6 @@
</property>
<property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description>A ValueExpression enabled attribute that, if present, will be used as the text of the converter message, replacing any message that comes from the converter</description>
- </property>
-
-
-
- <property>
<name>disabledStyle</name>
<classname>java.lang.String</classname>
<description>CSS style rules to be applied to disabled controls</description>
@@ -170,24 +162,12 @@
</property>
<property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description>A ValueExpression enabled attribute that, if present, will be used as the text of the validation message for the "required" facility, if the "required" facility is used</description>
- </property>
-
- <property>
<name>size</name>
<classname>int</classname>
<description>This attribute tells the user agent the initial width of the control. The width is given in pixels except when type attribute has the value "text" or "password". In that case, its value refers to the (integer) number of characters</description>
</property>
<property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description>A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator</description>
- </property>
-
- <property>
<name>listClass</name>
<classname>java.lang.String</classname>
<description>CSS class for a list</description>
Modified: trunk/ui/tabPanel/src/main/config/component/tabPanel.xml
===================================================================
--- trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -30,27 +30,6 @@
<classname>org.richfaces.taglib.TabPanelTagHandler</classname>
<superclass>org.richfaces.taglib.TabPanelTagHandlerBase</superclass>
</taghandler>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the converter message, replacing any message that comes from the converter
- </description>
- </property>
- <property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validation message for the "required" facility, if the "required" facility is used
- </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator
- </description>
- </property>
<property>
<name>width</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/togglePanel/src/main/config/component/togglePanel.xml
===================================================================
--- trunk/ui/togglePanel/src/main/config/component/togglePanel.xml 2009-02-05 22:43:46 UTC (rev 12583)
+++ trunk/ui/togglePanel/src/main/config/component/togglePanel.xml 2009-02-05 23:14:32 UTC (rev 12584)
@@ -69,27 +69,6 @@
attribute
</description>
</property>
- <property>
- <name>converterMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the converter message, replacing any message that comes from the converter
- </description>
- </property>
- <property>
- <name>requiredMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validation message for the "required" facility, if the "required" facility is used
- </description>
- </property>
- <property>
- <name>validatorMessage</name>
- <classname>java.lang.String</classname>
- <description>
- A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator
- </description>
- </property>
<property hidden="true">
<name>localValueSet</name>
<classname>boolean</classname>
15 years, 10 months