JBoss Rich Faces SVN: r11320 - in trunk/test-applications/jsp/src/main: java/editor and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: adubovsky
Date: 2008-11-24 08:48:46 -0500 (Mon, 24 Nov 2008)
New Revision: 11320
Added:
trunk/test-applications/jsp/src/main/java/editor/
trunk/test-applications/jsp/src/main/java/editor/Editor.java
trunk/test-applications/jsp/src/main/webapp/Editor/
trunk/test-applications/jsp/src/main/webapp/Editor/Editor.jsp
trunk/test-applications/jsp/src/main/webapp/Editor/EditorProperty.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Editor.xml
Modified:
trunk/test-applications/jsp/src/main/java/rich/RichBean.java
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
Log:
+ Editor pages
Added: trunk/test-applications/jsp/src/main/java/editor/Editor.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/editor/Editor.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/editor/Editor.java 2008-11-24 13:48:46 UTC (rev 11320)
@@ -0,0 +1,5 @@
+package editor;
+
+public class Editor {
+
+}
Modified: trunk/test-applications/jsp/src/main/java/rich/RichBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-11-24 12:29:18 UTC (rev 11319)
+++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-11-24 13:48:46 UTC (rev 11320)
@@ -73,6 +73,7 @@
map.add("Validator", add("/Validator/Validator", new boolean [] {true, true, true}));
map.add("DataGrid", add("/DataGrid/DataGrid", new boolean [] {false, true, false}));
map.add("ExtendedDataTable", add("/ExtendedDataTable/ExtendedDataTable", new boolean [] {false, true, false}));
+ map.add("Editor", add("/Editor/Editor", new boolean [] {true, true, false}));
Iterator<String> iterator = map.getSet().iterator();
while(iterator.hasNext()){
list.add(new SelectItem(iterator.next()));
Added: trunk/test-applications/jsp/src/main/webapp/Editor/Editor.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Editor/Editor.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/Editor/Editor.jsp 2008-11-24 13:48:46 UTC (rev 11320)
@@ -0,0 +1,13 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<f:subview id="editorSubviewID">
+ <div>The <b>editor</b> component will provide possibility to use
+ tinyMCE editor widget as JSF component.</div>
+ <rich:editor id="editorID" value=""></rich:editor>
+ <textarea id="textareaID" disabled="disabled" style="width: 400; height: 100"></textarea>
+ <br />
+ <a4j:commandButton value="a4j Submit" reRender="editorID, textareaID"></a4j:commandButton>
+</f:subview>
\ No newline at end of file
Added: trunk/test-applications/jsp/src/main/webapp/Editor/EditorProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Editor/EditorProperty.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/Editor/EditorProperty.jsp 2008-11-24 13:48:46 UTC (rev 11320)
@@ -0,0 +1,8 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<f:subview id="editorPropertySubviewID">
+
+</f:subview>
\ No newline at end of file
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Editor.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Editor.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Editor.xml 2008-11-24 13:48:46 UTC (rev 11320)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>editor</managed-bean-name>
+ <managed-bean-class>editor.Editor</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-11-24 12:29:18 UTC (rev 11319)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-11-24 13:48:46 UTC (rev 11320)
@@ -197,7 +197,7 @@
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
<param-value>
- /WEB-INF/faces-config-ExtendedDataTable.xml,/WEB-INF/faces-config-DataGrid.xml,/WEB-INF/faces-config-Validator.xml,/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/!
faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces-conf!
ig-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-confi
g-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml,/WEB-INF/faces-config-Custom.xml
+ /WEB-INF/faces-config-Editor.xml,/WEB-INF/faces-config-ExtendedDataTable.xml,/WEB-INF/faces-config-DataGrid.xml,/WEB-INF/faces-config-Validator.xml,/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/f!
aces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAnd!
Filtering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-Fi
leUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml,/WEB-INF/faces-config-Custom.xml
</param-value>
</context-param>
17 years, 1 month
JBoss Rich Faces SVN: r11319 - trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-11-24 07:29:18 -0500 (Mon, 24 Nov 2008)
New Revision: 11319
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java
Log:
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2008-11-24 12:28:37 UTC (rev 11318)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2008-11-24 12:29:18 UTC (rev 11319)
@@ -149,6 +149,32 @@
return swingRootNode;
}
+ private boolean isRichModel = true;
+
+ /**
+ * Gets value of isRichModel field.
+ * @return value of isRichModel field
+ */
+ public boolean isRichModel() {
+ return isRichModel;
+ }
+
+ /**
+ * Set a new value for isRichModel field.
+ * @param isRichModel a new value for isRichModel field
+ */
+ public void setRichModel(boolean isRichModel) {
+ this.isRichModel = isRichModel;
+ }
+
+ public Object getRootNode() {
+ if(isRichModel) {
+ return getRichTreeNode();
+ } else {
+ return getSwingTreeNode();
+ }
+ }
+
public String getNodeTitle() {
return nodeTitle;
}
@@ -215,29 +241,41 @@
setToggleOnClick(true);
setSwitchType("server");
setAjaxSubmitSelection(false);
+ setRichModel(true);
}
public void initToggleOnClickTestAjaxMode() {
setToggleOnClick(true);
setSwitchType("ajax");
setAjaxSubmitSelection(false);
+ setRichModel(true);
}
public void initToggleOnClickTestClientMode() {
setToggleOnClick(true);
setSwitchType("client");
setAjaxSubmitSelection(false);
+ setRichModel(true);
}
+ public void initAjaxSubmitSelectionTest() {
+ setSwitchType("client");
+ setAjaxSubmitSelection(true);
+ setToggleOnClick(false);
+ setRichModel(true);
+ }
public void initAjaxCoreTest() {
setSwitchType("ajax");
setToggleOnClick(false);
setAjaxSubmitSelection(false);
+ setRichModel(true);
}
- public void initAjaxSubmitSelectionTest() {
- setSwitchType("client");
- setAjaxSubmitSelection(true);
+ public void initAjaxCoreTestWithSwingModel() {
+ setSwitchType("ajax");
setToggleOnClick(false);
+ setAjaxSubmitSelection(false);
+ setRichModel(false);
}
+
}
17 years, 1 month
JBoss Rich Faces SVN: r11318 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/images and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-11-24 07:28:37 -0500 (Mon, 24 Nov 2008)
New Revision: 11318
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/tree/
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/tree/disc.gif
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/tree/singer.gif
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/tree/song.gif
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tree/treeAutoTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tree/treeTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeTest.java
Log:
tree tests
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/tree/disc.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/tree/disc.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/tree/singer.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/tree/singer.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/tree/song.gif
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/images/tree/song.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tree/treeAutoTest.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tree/treeTest.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeTest.java 2008-11-24 12:05:53 UTC (rev 11317)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TreeTest.java 2008-11-24 12:28:37 UTC (rev 11318)
@@ -17,6 +17,7 @@
private final static String INIT_TOGGLE_ON_CLICK_AJAX_MODE = "#{treeBean.initToggleOnClickTestAjaxMode}";
private final static String INIT_TOGGLE_ON_CLICK_CLIENT_MODE = "#{treeBean.initToggleOnClickTestClientMode}";
private final static String INIT_AJAX_CORE_TEST = "#{treeBean.initAjaxCoreTest}";
+ private final static String INIT_AJAX_CORE_TEST_WITH_SWING_MODEL = "#{treeBean.initAjaxCoreTestWithSwingModel}";
private final static String INIT_AJAX_SUBMIT_SELECTION = "#{treeBean.initAjaxSubmitSelectionTest}";
static {
@@ -123,6 +124,92 @@
tester.checkNodeExpandedListener(true);
}
+//
+// Swing model
+//
+
+ //@Test
+ public void testAjaxSingleWithSwingModel(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, INIT_AJAX_CORE_TEST_WITH_SWING_MODEL);
+ tester.reset();
+ tester.setupControl(TestSetupEntry.ajaxSingle, Boolean.TRUE);
+ tester.clickLoad();
+ writeStatus("Navigate to the first child");
+ String compId = getAutoTester(this).getClientId(AutoTester.COMPONENT_ID);
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/table[1]/tbody/tr/td/div/a");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ type("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[3]/input", "New");
+ tester.setExtrenalValidationFailed();
+ tester.startTracing();
+ writeStatus("Test ajaxSingle attribute");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(true);
+ }
+
+ //@Test
+ public void testAjaxSingleWithInternalValidationFailedWithSwingModel(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, INIT_AJAX_CORE_TEST_WITH_SWING_MODEL);
+ tester.reset();
+ tester.setupControl(TestSetupEntry.ajaxSingle, Boolean.TRUE);
+ tester.clickLoad();
+ writeStatus("Navigate to the first child");
+ String compId = getAutoTester(this).getClientId(AutoTester.COMPONENT_ID);
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/table[1]/tbody/tr/td/div/a");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ writeStatus("Set a new invalid value for the child");
+ type("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[3]/input", "");
+ tester.startTracing();
+ writeStatus("Test ajaxSingle attribute in case of invalid component state");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(false);
+ }
+
+ //@Test
+ public void testImmediateWithSwingModel(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, INIT_AJAX_CORE_TEST_WITH_SWING_MODEL);
+ tester.reset();
+ tester.setupControl(TestSetupEntry.immediate, Boolean.TRUE);
+ tester.clickLoad();
+ writeStatus("Navigate to the first child");
+ String compId = getAutoTester(this).getClientId(AutoTester.COMPONENT_ID);
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/table[1]/tbody/tr/td/div/a");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ writeStatus("Set a new value for the child");
+ type("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[3]/input", "New");
+ tester.startTracing();
+ writeStatus("Test immediate attribute");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ tester.checkUpdateModel(true);
+ tester.checkNodeExpandedListener(true);
+ }
+
+ //@Test
+ public void testImmediateWithExternalValidationFailedWithSwingModel(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, INIT_AJAX_CORE_TEST_WITH_SWING_MODEL);
+ tester.reset();
+ tester.setupControl(TestSetupEntry.immediate, Boolean.TRUE);
+ tester.clickLoad();
+ writeStatus("Navigate to the first child");
+ String compId = getAutoTester(this).getClientId(AutoTester.COMPONENT_ID);
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/table[1]/tbody/tr/td/div/a");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ writeStatus("set a new value for the child");
+ type("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[3]/input", "New");
+ writeStatus("Set external validation to fail");
+ tester.setExtrenalValidationFailed();
+ tester.startTracing();
+ writeStatus("Test immediate attribute with external validation failed");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ tester.checkUpdateModel(false);
+ tester.checkNodeExpandedListener(true);
+ }
+
@Test
public void testToggleOnClickTrueWithServerMode(Template template) {
AutoTester tester = getAutoTester(this);
@@ -227,6 +314,34 @@
tester.checkNodeExpandedListener(false);
}
+ @Test
+ public void testIconsAttributesAreApplied(Template template) {
+ renderPage(template, null);
+
+ writeStatus("Check icons attributes applied: are output to client and images are accessible");
+
+ String compId = getParentId() + "_form:tree";
+
+ testIcon("//*[@id='"+ compId + ":childs']/table[1]/tbody/tr/td[2]/img", "singer");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/table[1]/tbody/tr/td/div/a");
+ testIcon("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td[2]/img", "disc");
+ clickAjaxCommandAndWait("//*[@id='"+ compId + ":childs']/div/table[1]/tbody/tr/td/div/a");
+ testIcon("//*[@id='"+ compId + ":childs']/div/div/table[1]/tbody/tr/td[2]/img", "song");
+ }
+
+ /**
+ * Test an icon.
+ *
+ * @param location location of image representing icon to be tested
+ * @param iconName substring that icon uri has to contain
+ */
+ private void testIcon(String location, String iconSubstring) {
+ String iconSrc = selenium.getAttribute(location + "/@src");
+ if (null == iconSrc || !iconSrc.matches(".*" + iconSubstring + ".*")) {
+ Assert.fail("It looks as if the icon is not proper. Uri of icon is being tested must contain [" + iconSubstring + "] icon is expected");
+ }
+ }
+
@Override
public void sendAjax() {
AutoTester tester = getAutoTester(this);
17 years, 1 month
JBoss Rich Faces SVN: r11317 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2008-11-24 07:05:53 -0500 (Mon, 24 Nov 2008)
New Revision: 11317
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
trunk/docs/userguide/en/src/main/docbook/included/pickList.xml
Log:
RF-4502 - tables were added for the following components: datascroller, dataTable, pickList.
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2008-11-24 10:36:41 UTC (rev 11316)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2008-11-24 12:05:53 UTC (rev 11317)
@@ -160,11 +160,41 @@
</mediaobject>
</figure>
<para>Information about sorting and filtering you can find <link linkend="sortAndFilter">here</link>.</para>
- <para>
- You can find information how to remove header's gradient <ulink url="http://wiki.jboss.org/wiki/RichFacesDataTableBackgroundOut">here</ulink>.
+ <para>
+ You can find information how to remove header's gradient <ulink url="http://wiki.jboss.org/wiki/RichFacesDataTableBackgroundOut">here</ulink>.
</para>
</section>
+
<section>
+ <title>Facets</title>
+ <table>
+ <title>Facets</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Facet</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>header</entry>
+ <entry>Redefines the header content</entry>
+ </row>
+ <row>
+ <entry>footer</entry>
+ <entry>Redefines the footer content</entry>
+ </row>
+ <row>
+ <entry>caption</entry>
+ <entry>Defines the caption content</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+
+ <section>
<title>Look-and-Feel Customization</title>
<para>For skinnability implementation, the components use a <emphasis>
Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2008-11-24 10:36:41 UTC (rev 11316)
+++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2008-11-24 12:05:53 UTC (rev 11317)
@@ -364,6 +364,34 @@
<entry>last_disabled</entry>
<entry>Redefines the disabled "last" button with the content set</entry>
</row>
+ <row>
+ <entry>fastrewind</entry>
+ <entry>Redefines the "fastrewind" button with the content set</entry>
+ </row>
+ <row>
+ <entry>fastrewind_disabled</entry>
+ <entry>Redefines the disabled "fastrewind" button with the content set</entry>
+ </row>
+ <row>
+ <entry>previous</entry>
+ <entry>Redefines the "previous" button with the content set</entry>
+ </row>
+ <row>
+ <entry>previous_disabled</entry>
+ <entry>Redefines the disabled "previous" button with the content set</entry>
+ </row>
+ <row>
+ <entry>next</entry>
+ <entry>Redefines the "next" button with the content set</entry>
+ </row>
+ <row>
+ <entry>next_disabled</entry>
+ <entry>Redefines the disabled "next" button with the content set</entry>
+ </row>
+ <row>
+ <entry>pages</entry>
+ <entry>Redefines the pages buttons with the content set</entry>
+ </row>
</tbody>
</tgroup>
</table>
Modified: trunk/docs/userguide/en/src/main/docbook/included/pickList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/pickList.xml 2008-11-24 10:36:41 UTC (rev 11316)
+++ trunk/docs/userguide/en/src/main/docbook/included/pickList.xml 2008-11-24 12:05:53 UTC (rev 11317)
@@ -294,7 +294,60 @@
</tbody>
</tgroup>
</table>
- </section-->
+ </section-->
+
+ <section>
+ <title>Facets</title>
+ <table>
+ <title>Facets</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Facet</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>copyAllControl</entry>
+ <entry>Redefines the "copyAll" label with the control set. Related attribute is "copyAllControlLabel"</entry>
+ </row>
+ <row>
+ <entry>removeAllControl</entry>
+ <entry>Redefines the "removeAll" label with the control set. Related attribute is "removeAllControlLabel"</entry>
+ </row>
+ <row>
+ <entry>copyControl</entry>
+ <entry>Redefines the "copy" label with the control set. Related attribute is "copyControlLabel"</entry>
+ </row>
+ <row>
+ <entry>removeControl</entry>
+ <entry>Redefines the "remove" label with the control set. Related attribute is "removeControlLabel"</entry>
+ </row>
+ <row>
+ <entry>copyAllControlDisabled</entry>
+ <entry>Redefines the disabled "copyAll" label with the control set.</entry>
+ </row>
+ <row>
+ <entry>removeAllControlDisabled</entry>
+ <entry>Redefines the disabled "removeAll" label with the control set.</entry>
+ </row>
+ <row>
+ <entry>copyControlDisabled</entry>
+ <entry>Redefines the disabled "copy" label with the control set.</entry>
+ </row>
+ <row>
+ <entry>removeControlDisabled</entry>
+ <entry>Redefines the disabled "remove" label with the control set.</entry>
+ </row>
+ <row>
+ <entry>caption</entry>
+ <entry>Defines the "caption" label with the control set.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
<section>
<title>Look-and-Feel Customization</title>
17 years, 1 month
JBoss Rich Faces SVN: r11316 - trunk/ui/editor/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-11-24 05:36:41 -0500 (Mon, 24 Nov 2008)
New Revision: 11316
Modified:
trunk/ui/editor/src/main/java/org/richfaces/component/UIEditor.java
Log:
Editor: Remove not used imports
Modified: trunk/ui/editor/src/main/java/org/richfaces/component/UIEditor.java
===================================================================
--- trunk/ui/editor/src/main/java/org/richfaces/component/UIEditor.java 2008-11-24 10:27:26 UTC (rev 11315)
+++ trunk/ui/editor/src/main/java/org/richfaces/component/UIEditor.java 2008-11-24 10:36:41 UTC (rev 11316)
@@ -30,8 +30,6 @@
import javax.faces.component.UIInput;
import javax.faces.convert.Converter;
-import org.richfaces.convert.seamtext.DefaultSeamTextConverter;
-import org.richfaces.convert.seamtext.SeamTextConverter;
import org.richfaces.convert.seamtext.SeamTextConverterFactory;
/**
17 years, 1 month
JBoss Rich Faces SVN: r11315 - in trunk/ui/editor/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-11-24 05:27:26 -0500 (Mon, 24 Nov 2008)
New Revision: 11315
Modified:
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js
trunk/ui/editor/src/main/templates/editor.jspx
Log:
Editor: Fix js error in IE
Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-11-23 21:57:03 UTC (rev 11314)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2008-11-24 10:27:26 UTC (rev 11315)
@@ -75,7 +75,7 @@
});
Richfaces.Editor.SeamTextConfiguration = {
- plugins : "safari,spellchecker,style,table,save,advhr,advimage,advlink,iespell,inlinepopups,insertdatetime,preview,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template",
+ plugins : "safari,spellchecker,style,table,save,advhr,advimage,advlink,iespell,inlinepopups,insertdatetime,preview,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template"
// Theme options
//theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,|,cut,copy,paste,pastetext,pasteword",
Modified: trunk/ui/editor/src/main/templates/editor.jspx
===================================================================
--- trunk/ui/editor/src/main/templates/editor.jspx 2008-11-23 21:57:03 UTC (rev 11314)
+++ trunk/ui/editor/src/main/templates/editor.jspx 2008-11-24 10:27:26 UTC (rev 11315)
@@ -32,9 +32,7 @@
<f:call name="writeEditorConfigurationAttributes" />
<f:call name="writeEditorParameters" />
- var richParams = {extScriptSuffix : '#{this:getSriptMappingSuffix(context)}',
- extCssSuffix : '#{this:getCssMappingSuffix(context)}',
- useSeamText : #{component.attributes['useSeamText']}}
+ var richParams = {extScriptSuffix : '#{this:getSriptMappingSuffix(context)}', extCssSuffix : '#{this:getCssMappingSuffix(context)}', useSeamText : #{component.attributes['useSeamText']}};
new RichEditor('#{clientId}', richParams, tinyMceParams);
</script>
17 years, 1 month
JBoss Rich Faces SVN: r11314 - in trunk: docs/xslt/en and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-23 16:57:03 -0500 (Sun, 23 Nov 2008)
New Revision: 11314
Modified:
trunk/cdk/generator/pom.xml
trunk/docs/xslt/en/
trunk/framework/jsf-test/
trunk/test-applications/regressionArea/regressionArea-web/
Log:
JSF version in CDK/generator updated to 1.2_10
service files svn:ignored
Modified: trunk/cdk/generator/pom.xml
===================================================================
--- trunk/cdk/generator/pom.xml 2008-11-23 21:48:48 UTC (rev 11313)
+++ trunk/cdk/generator/pom.xml 2008-11-23 21:57:03 UTC (rev 11314)
@@ -52,7 +52,7 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_03</version>
+ <version>1.2_10</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
Property changes on: trunk/docs/xslt/en
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
Property changes on: trunk/framework/jsf-test
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: trunk/test-applications/regressionArea/regressionArea-web
___________________________________________________________________
Name: svn:ignore
- target
test-output
.settings
.project
+ target
test-output
.settings
.project
bin
.classpath
17 years, 1 month
JBoss Rich Faces SVN: r11313 - trunk/sandbox/samples.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-23 16:48:48 -0500 (Sun, 23 Nov 2008)
New Revision: 11313
Removed:
trunk/sandbox/samples/editor-sample/
trunk/sandbox/samples/editorSeam-sample/
Modified:
trunk/sandbox/samples/pom.xml
Log:
Editor moved to main build area
Modified: trunk/sandbox/samples/pom.xml
===================================================================
--- trunk/sandbox/samples/pom.xml 2008-11-23 21:47:12 UTC (rev 11312)
+++ trunk/sandbox/samples/pom.xml 2008-11-23 21:48:48 UTC (rev 11313)
@@ -17,6 +17,5 @@
<module>simpleTogglePanel2-sample</module>
<!--module>contextMenuDemo</module-->
<module>fileUploadPOC</module>
- <module>editor-sample</module>
</modules>
</project>
\ No newline at end of file
17 years, 1 month
JBoss Rich Faces SVN: r11312 - in trunk/samples: editor-sample and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-23 16:47:12 -0500 (Sun, 23 Nov 2008)
New Revision: 11312
Added:
trunk/samples/editor-sample/
trunk/samples/editorSeam-sample/
Modified:
trunk/samples/editor-sample/pom.xml
trunk/samples/editor-sample/src/main/webapp/pages/editor.jsp
trunk/samples/editor-sample/src/main/webapp/pages/editor.xhtml
trunk/samples/editor-sample/src/main/webapp/pages/miracle-editor.jsp
trunk/samples/editorSeam-sample/pom.xml
trunk/samples/editorSeam-sample/src/main/webapp/pages/editor.jsp
trunk/samples/editorSeam-sample/src/main/webapp/pages/editor.xhtml
trunk/samples/pom.xml
Log:
Editor moved to main build area
Copied: trunk/samples/editor-sample (from rev 11304, trunk/sandbox/samples/editor-sample)
Property changes on: trunk/samples/editor-sample
___________________________________________________________________
Name: svn:ignore
+ target
.classpath
.project
copy-web-pages.bat
.settings
.classpath
.project
Name: svn:mergeinfo
+
Modified: trunk/samples/editor-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/editor-sample/pom.xml 2008-11-22 14:49:50 UTC (rev 11304)
+++ trunk/samples/editor-sample/pom.xml 2008-11-23 21:47:12 UTC (rev 11312)
@@ -1,19 +1,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.samples</groupId>
<artifactId>editor-sample</artifactId>
<packaging>war</packaging>
<name>editor-sample Maven Webapp</name>
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>editor</artifactId>
<version>${project.version}</version>
</dependency>
Modified: trunk/samples/editor-sample/src/main/webapp/pages/editor.jsp
===================================================================
--- trunk/sandbox/samples/editor-sample/src/main/webapp/pages/editor.jsp 2008-11-22 14:49:50 UTC (rev 11304)
+++ trunk/samples/editor-sample/src/main/webapp/pages/editor.jsp 2008-11-23 21:47:12 UTC (rev 11312)
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/editor" prefix="ed" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/editor" prefix="ed" %>
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
<html>
<head>
Modified: trunk/samples/editor-sample/src/main/webapp/pages/editor.xhtml
===================================================================
(Binary files differ)
Modified: trunk/samples/editor-sample/src/main/webapp/pages/miracle-editor.jsp
===================================================================
--- trunk/sandbox/samples/editor-sample/src/main/webapp/pages/miracle-editor.jsp 2008-11-22 14:49:50 UTC (rev 11304)
+++ trunk/samples/editor-sample/src/main/webapp/pages/miracle-editor.jsp 2008-11-23 21:47:12 UTC (rev 11312)
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/editor" prefix="ed" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/editor" prefix="ed" %>
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
<html>
<head>
Copied: trunk/samples/editorSeam-sample (from rev 11304, trunk/sandbox/samples/editorSeam-sample)
Property changes on: trunk/samples/editorSeam-sample
___________________________________________________________________
Name: svn:ignore
+ target
.classpath
.project
copy-web-pages.bat
.settings
Name: svn:mergeinfo
+
Modified: trunk/samples/editorSeam-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/editorSeam-sample/pom.xml 2008-11-22 14:49:50 UTC (rev 11304)
+++ trunk/samples/editorSeam-sample/pom.xml 2008-11-23 21:47:12 UTC (rev 11312)
@@ -4,18 +4,18 @@
<parent>
<artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.samples</groupId>
<artifactId>editorSeam-sample</artifactId>
<packaging>war</packaging>
<name>Editor with Seam sample Maven Webapp</name>
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>editor</artifactId>
<version>${project.version}</version>
</dependency>
Modified: trunk/samples/editorSeam-sample/src/main/webapp/pages/editor.jsp
===================================================================
--- trunk/sandbox/samples/editorSeam-sample/src/main/webapp/pages/editor.jsp 2008-11-22 14:49:50 UTC (rev 11304)
+++ trunk/samples/editorSeam-sample/src/main/webapp/pages/editor.jsp 2008-11-23 21:47:12 UTC (rev 11312)
@@ -1,7 +1,7 @@
<%@ 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"%>
-<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/editor" prefix="ed"%>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/editor" prefix="ed"%>
<html>
<head>
<title>Richfaces Editor Sample</title>
Modified: trunk/samples/editorSeam-sample/src/main/webapp/pages/editor.xhtml
===================================================================
(Binary files differ)
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2008-11-23 21:42:01 UTC (rev 11311)
+++ trunk/samples/pom.xml 2008-11-23 21:47:12 UTC (rev 11312)
@@ -484,6 +484,8 @@
<module>state-sample</module>
<module>extendedDataTable-sample</module>
<module>queue-sample</module>
+ <module>editor-sample</module>
+ <module>editorSeam-sample</module>
</modules>
</profile>
</profiles>
17 years, 1 month
JBoss Rich Faces SVN: r11311 - trunk/sandbox/ui.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-11-23 16:42:01 -0500 (Sun, 23 Nov 2008)
New Revision: 11311
Modified:
trunk/sandbox/ui/pom.xml
Log:
Editor moved to main build area
Modified: trunk/sandbox/ui/pom.xml
===================================================================
--- trunk/sandbox/ui/pom.xml 2008-11-23 21:41:04 UTC (rev 11310)
+++ trunk/sandbox/ui/pom.xml 2008-11-23 21:42:01 UTC (rev 11311)
@@ -18,6 +18,5 @@
<module>rex-messageBox</module>
<!--module>rex-button</module-->
<module>sortableHeader</module>
- <module>editor</module>
</modules>
</project>
\ No newline at end of file
17 years, 1 month