December 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r11663 - trunk/test-applications/facelets/src/main/webapp/HotKey.

by richfaces-svn-commits＠lists.jboss.org

Author: adubovsky Date: 2008-12-09 09:27:43 -0500 (Tue, 09 Dec 2008) New Revision: 11663 Modified: trunk/test-applications/facelets/src/main/webapp/HotKey/HotKey.xhtml Log: changes in hotKey Modified: trunk/test-applications/facelets/src/main/webapp/HotKey/HotKey.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/HotKey/HotKey.xhtml 2008-12-09 14:27:23 UTC (rev 11662) +++ trunk/test-applications/facelets/src/main/webapp/HotKey/HotKey.xhtml 2008-12-09 14:27:43 UTC (rev 11663) @@ -1,19 +1,26 @@ -<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="hotKeySubviewID"> +<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" id="hotKeySubviewID"> + + <rich:calendar id="hotKeyCalendarID" popup="false" /> - <rich:calendar id="hotKeyCalendarID" popup="false" /> - <h:commandButton id="commandButtonID" onclick="return false;" value="test select"></h:commandButton> + <h:commandButton id="commandButtonID" onclick="return false;" + value="test select"></h:commandButton> + <rich:hotKey id="hotKeyID" binding="#{hotKey.binding}" disableInInput="#{hotKey.disableInInput}" handler="#{hotKey.handler}" key="#{hotKey.key}" rendered="#{hotKey.rendered}" - selector="#{hotKey.selector}" timing="#{hotKey.timing}" type="#{hotKey.type}" /> + selector="#{hotKey.selector}" timing="#{hotKey.timing}" + type="#{hotKey.type}" /> <h:panelGrid columns="2"> <h:outputText value="type"></h:outputText> - <h:selectOneMenu value="#{hotKey.type}"> + <h:selectOneMenu value="#{hotKey.type}" onchange="submit();"> <f:selectItem itemLabel="onkeydown" itemValue="onkeydown" /> <f:selectItem itemLabel="onkeypress" itemValue="onkeypress" /> <f:selectItem itemLabel="onkeyup" itemValue="onkeyup" /> - <a4j:support reRender="hotKeyID" event="onchange"></a4j:support> </h:selectOneMenu> <h:outputText value="key"></h:outputText> @@ -27,10 +34,9 @@ </h:selectOneMenu> <h:outputText value="selector"></h:outputText> - <h:selectOneMenu value="#{hotKey.selector}"> + <h:selectOneMenu value="#{hotKey.selector}" onchange="submit();"> <f:selectItem itemLabel="" itemValue="" /> <f:selectItem itemLabel="Button" itemValue="#commandButtonID" /> - <a4j:support reRender="hotKeyID" event="onchange"></a4j:support> </h:selectOneMenu> <h:outputText value="handler"></h:outputText> @@ -42,40 +48,53 @@ </h:selectOneMenu> <h:outputText value="disableInInput"></h:outputText> - <h:selectBooleanCheckbox value="#{hotKey.disableInInput}"> - <a4j:support reRender="hotKeyID" event="onchange"></a4j:support> - </h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{hotKey.disableInInput}" onchange="submit();" /> <h:outputText value="rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{hotKey.rendered}"> - <a4j:support reRender="hotKeyID" event="onchange"></a4j:support> - </h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{hotKey.rendered}" onchange="submit();"/> <h:outputText value="test binding: "></h:outputText> <h:outputText value="#{hotKey.bindingInfo}"></h:outputText> - <h:commandButton onclick="$('formID:hotKeySubviewID:hotKeyID').component.enable(); return false;" value="enable"></h:commandButton> - <h:commandButton onclick="$('formID:hotKeySubviewID:hotKeyID').component.disable(); return false;" value="disable"></h:commandButton> + <h:commandButton + onclick="$('formID:hotKeySubviewID:hotKeyID').component.enable(); return false;" + value="enable"></h:commandButton> + <h:commandButton + onclick="$('formID:hotKeySubviewID:hotKeyID').component.disable(); return false;" + value="disable"></h:commandButton> </h:panelGrid> - <f:verbatim><hr /></f:verbatim> + <f:verbatim> + <hr /> + </f:verbatim> + <rich:hotKey id="jsID" timing="onregistercall" /> <h:panelGrid columns="2"> - <h:commandButton id="jsAddCCID" value="add hotkey: alt+z" onclick="return false;"></h:commandButton> - <h:commandButton id="jsRemoveCCID" value="remove hotkey: alt+z" onclick="return false;"></h:commandButton> + <h:commandButton id="jsAddCCID" value="add hotkey: shift+d" + onclick="return false;"></h:commandButton> + <h:commandButton id="jsRemoveCCID" value="remove hotkey: shift+d" + onclick="return false;"></h:commandButton> - <rich:componentControl disableDefault="true" attachTo="jsAddCCID" for="jsID" event="onclick" operation="add"> - <f:param name="key" value="alt+z" /> - <f:param name="handler" value="alert('alt+z')" /> + <rich:componentControl disableDefault="true" attachTo="jsAddCCID" + for="jsID" event="onclick" operation="add"> + <f:param name="key" value="shift+d" /> + <f:param name="handler" value="alert('shift+d')" /> </rich:componentControl> - <rich:componentControl disableDefault="true" attachTo="jsRemoveCCID" for="jsID" event="onclick" operation="remove"> - <f:param name="key" value="alt+z" /> + <rich:componentControl disableDefault="true" attachTo="jsRemoveCCID" + for="jsID" event="onclick" operation="remove"> + <f:param name="key" value="shift+d" /> </rich:componentControl> </h:panelGrid> - <f:verbatim><hr /></f:verbatim> + + <f:verbatim> + <hr /> + </f:verbatim> + <h:commandButton action="#{hotKey.add}" value="add test" /> + +  + <h:outputText value="#{rich:findComponent('hotKeyID').rendererType}" /> </rich:column> </h:panelGrid> + --> </f:subview> \ No newline at end of file

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r11662 - in trunk/test-applications/jsp/src/main/webapp: pages/RichMenu and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: adubovsky Date: 2008-12-09 09:27:23 -0500 (Tue, 09 Dec 2008) New Revision: 11662 Modified: trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp Log: changes in hotKey Modified: trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp 2008-12-09 12:30:27 UTC (rev 11661) +++ trunk/test-applications/jsp/src/main/webapp/HotKey/HotKey.jsp 2008-12-09 14:27:23 UTC (rev 11662) @@ -5,21 +5,23 @@ <f:subview id="hotKeySubviewID"> <rich:calendar id="hotKeyCalendarID" popup="false" /> - - - <h:commandButton id="commandButtonID" onclick="return false;" value="test select"></h:commandButton> + + <h:commandButton id="commandButtonID" onclick="return false;" + value="test select"></h:commandButton> + <rich:hotKey id="hotKeyID" binding="#{hotKey.htmlHotKey}" disableInInput="#{hotKey.disableInInput}" handler="#{hotKey.handler}" key="#{hotKey.key}" rendered="#{hotKey.rendered}" - selector="#{hotKey.selector}" timing="#{hotKey.timing}" type="#{hotKey.type}" disableInInputTypes="#{hotKey.disableInInputTypes}"/> + selector="#{hotKey.selector}" timing="#{hotKey.timing}" + type="#{hotKey.type}" + disableInInputTypes="#{hotKey.disableInInputTypes}" /> <h:panelGrid columns="2"> <h:outputText value="type"></h:outputText> - <h:selectOneMenu value="#{hotKey.type}"> + <h:selectOneMenu value="#{hotKey.type}" onchange="submit();"> <f:selectItem itemLabel="onkeydown" itemValue="onkeydown" /> <f:selectItem itemLabel="onkeypress" itemValue="onkeypress" /> <f:selectItem itemLabel="onkeyup" itemValue="onkeyup" /> - <a4j:support reRender="hotKeyID" event="onchange"></a4j:support> </h:selectOneMenu> <h:outputText value="key"></h:outputText> @@ -33,10 +35,9 @@ </h:selectOneMenu> <h:outputText value="selector"></h:outputText> - <h:selectOneMenu value="#{hotKey.selector}"> + <h:selectOneMenu value="#{hotKey.selector}" onchange="submit();"> <f:selectItem itemLabel="" itemValue="" /> <f:selectItem itemLabel="Button" itemValue="#commandButtonID" /> - <a4j:support reRender="hotKeyID" event="onchange"></a4j:support> </h:selectOneMenu> <h:outputText value="handler"></h:outputText> @@ -48,16 +49,13 @@ </h:selectOneMenu> <h:outputText value="disableInInput"></h:outputText> - <h:selectBooleanCheckbox value="#{hotKey.disableInInput}"> - <a4j:support reRender="hotKeyID" event="onchange"></a4j:support> - </h:selectBooleanCheckbox> - + <h:selectBooleanCheckbox value="#{hotKey.disableInInput}" onchange="submit();" /> + <h:outputText value="disableInInput"></h:outputText> - <h:selectOneRadio value="#{hotKey.disableInInputTypes}" > - <f:selectItem itemValue="all" itemLabel="all"/> - <f:selectItem itemValue="buttons" itemLabel="buttons"/> - <f:selectItem itemValue="texts" itemLabel="texts"/> - <a4j:support reRender="hotKeyID" event="onchange"></a4j:support> + <h:selectOneRadio value="#{hotKey.disableInInputTypes}" onchange="submit();"> + <f:selectItem itemValue="all" itemLabel="all" /> + <f:selectItem itemValue="buttons" itemLabel="buttons" /> + <f:selectItem itemValue="texts" itemLabel="texts" /> </h:selectOneRadio> <%--<h:outputText value="checkParent"></h:outputText> @@ -66,35 +64,50 @@ </h:selectBooleanCheckbox>--%> <h:outputText value="rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{hotKey.rendered}"> - <a4j:support reRender="hotKeyID" event="onchange"></a4j:support> - </h:selectBooleanCheckbox> + <h:selectBooleanCheckbox value="#{hotKey.rendered}" onchange="submit();" /> <h:outputText value="test binding:"></h:outputText> <h:outputText value="#{hotKey.bindingInfo}"></h:outputText> - <h:commandButton onclick="#{rich:component('hotKeyID')}.enable(); return false;" value="enable"></h:commandButton> - <h:commandButton onclick="#{rich:component('hotKeyID')}.disable(); return false;" value="disable"></h:commandButton> + <h:commandButton + onclick="$('formID:hotKeySubviewID:hotKeyID').component.enable(); return false;" + value="enable"></h:commandButton> + <h:commandButton + onclick="$('formID:hotKeySubviewID:hotKeyID').component.disable(); return false;" + value="disable"></h:commandButton> </h:panelGrid> - <f:verbatim><hr /></f:verbatim> + <f:verbatim> + <hr /> + </f:verbatim> + <rich:hotKey id="jsID" timing="onregistercall" /> <h:panelGrid columns="2"> - <h:commandButton id="jsAddCCID" value="add hotkey: alt+z" onclick="return false;"></h:commandButton> - <h:commandButton id="jsRemoveCCID" value="remove hotkey: alt+z" onclick="return false;"></h:commandButton> + <h:commandButton id="jsAddCCID" value="add hotkey: shift+d" + onclick="return false;"></h:commandButton> + <h:commandButton id="jsRemoveCCID" value="remove hotkey: shift+d" + onclick="return false;"></h:commandButton> - <rich:componentControl disableDefault="true" attachTo="jsAddCCID" for="jsID" event="onclick" operation="add"> - <f:param name="key" value="alt+z" /> - <f:param name="handler" value="alert('alt+z')" /> + <rich:componentControl disableDefault="true" attachTo="jsAddCCID" + for="jsID" event="onclick" operation="add"> + <f:param name="key" value="shift+d" /> + <f:param name="handler" value="alert('shift+d')" /> </rich:componentControl> - <rich:componentControl disableDefault="true" attachTo="jsRemoveCCID" for="jsID" event="onclick" operation="remove"> - <f:param name="key" value="alt+z" /> + <rich:componentControl disableDefault="true" attachTo="jsRemoveCCID" + for="jsID" event="onclick" operation="remove"> + <f:param name="key" value="shift+d" /> </rich:componentControl> </h:panelGrid> - <f:verbatim><hr /></f:verbatim> + + <f:verbatim> + <hr /> + </f:verbatim> + <h:commandButton action="#{hotKey.add}" value="add test" /> + + <%-- <div style="FONT-WEIGHT: bold;">rich:findComponent</div> <h:panelGrid columns="2"> <rich:column> @@ -104,4 +117,5 @@ <h:outputText value="#{rich:findComponent('hotKeyID').rendererType}" /> </rich:column> </h:panelGrid> + --%> </f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-12-09 12:30:27 UTC (rev 11661) +++ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-12-09 14:27:23 UTC (rev 11662) @@ -18,6 +18,7 @@ <h:selectBooleanCheckbox id="a4jLodID" value="#{option.log}" onchange="submit();"></h:selectBooleanCheckbox> <a4j:status id="a4jStatusID" startText="WORK!" startStyle="color: red;" stopText="a4j:status"></a4j:status> + <h:panelGroup></h:panelGroup> </h:panelGrid> <h:panelGrid columns="1"> <h:panelGrid columns="4">

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r11661 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/examples.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2008-12-09 07:30:27 -0500 (Tue, 09 Dec 2008) New Revision: 11661 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/examples/simplePanel.xhtml Log: minor fix according to customers mistakes caused by this zindex and comboBox samples. Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/examples/simplePanel.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/examples/simplePanel.xhtml 2008-12-09 11:48:08 UTC (rev 11660) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/examples/simplePanel.xhtml 2008-12-09 12:30:27 UTC (rev 11661) @@ -14,7 +14,7 @@ } </script> <rich:modalPanel id="mp" minHeight="200" minWidth="450" - height="200" width="500" zindex="2000"> + height="200" width="500"> <f:facet name="header"> <h:outputText value="Modal Panel Title" /> </f:facet>

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r11660 - trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: dmorozov Date: 2008-12-09 06:48:08 -0500 (Tue, 09 Dec 2008) New Revision: 11660 Modified: trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java Log: https://jira.jboss.org/jira/browse/RF-4343 Modified: trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java =================================================================== --- trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-12-09 11:10:01 UTC (rev 11659) +++ trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-12-09 11:48:08 UTC (rev 11660) @@ -96,7 +96,7 @@ List<SelectItem> selectItems = SelectUtils.getSelectItems(context, inplaceSelect); for (SelectItem selectItem : selectItems) { String value = getConvertedStringValue(context, inplaceSelect, selectItem.getValue()); - String label = selectItem.getLabel(); + String label = selectItem.getLabel().trim(); labels.add(label); encodeSuggestion(context, inplaceSelect, label, RICH_INPLACE_SELECT_CLASSES); Object[] child = new Object[2];

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r11659 - trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree.

by richfaces-svn-commits＠lists.jboss.org

Author: dsvyatobatsko Date: 2008-12-09 06:10:01 -0500 (Tue, 09 Dec 2008) New Revision: 11659 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java Log: removed redundant code 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-12-09 09:27:35 UTC (rev 11658) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2008-12-09 11:10:01 UTC (rev 11659) @@ -371,10 +371,4 @@ setAdvisor(null); } - private static long id = 1; - - public long nextId() { - return id++; - } - }

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r11658 - in trunk/test-applications/seleniumTest/richfaces/src/main: java/org/ajax4jsf/bean/tree/rich and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: dsvyatobatsko Date: 2008-12-09 04:27:35 -0500 (Tue, 09 Dec 2008) New Revision: 11658 Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeBuilder.java 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/rich/Album.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Performer.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Song.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tree/treeAutoTest.xhtml Log: changed tree entity id generation method + lost commit Added: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeBuilder.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeBuilder.java (rev 0) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeBuilder.java 2008-12-09 09:27:35 UTC (rev 11658) @@ -0,0 +1,35 @@ +package org.ajax4jsf.bean.tree; + +import java.io.IOException; +import java.net.URL; + +import org.ajax4jsf.bean.tree.rich.AudioLibrary; +import org.apache.commons.digester.Digester; +import org.apache.commons.digester.xmlrules.DigesterLoader; +import org.xml.sax.SAXException; + +public class TreeBuilder { + + private static long id = 1; + + public static long nextId() { + return id++; + } + + public static void main(String[] args) { + URL rulesUrl = TreeBuilder.class.getResource("/digester-rules.xml"); + Digester digester = DigesterLoader.createDigester(rulesUrl); + AudioLibrary library = new AudioLibrary(); + digester.push(library); + + try { + digester.parse(TreeBuilder.class.getResourceAsStream("/audio-library.xml")); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (SAXException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } +} Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeBuilder.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native 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-12-09 01:00:53 UTC (rev 11657) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2008-12-09 09:27:35 UTC (rev 11658) @@ -111,7 +111,7 @@ private TreeNode<Object> richRootNode = null; - public TreeNode<Object> getRichTreeNode() { + public synchronized TreeNode<Object> getRichTreeNode() { if (null == richRootNode) { Digester digester = DigesterLoader.createDigester(getClass().getResource("/rich-digester-rules.xml")); AudioLibrary library = new AudioLibrary(); @@ -133,7 +133,7 @@ private javax.swing.tree.TreeNode swingRootNode = null; - public javax.swing.tree.TreeNode getSwingTreeNode() { + public synchronized javax.swing.tree.TreeNode getSwingTreeNode() { if (null == swingRootNode) { Digester digester = DigesterLoader.createDigester(getClass().getResource("/swing-digester-rules.xml")); org.ajax4jsf.bean.tree.swing.AudioLibrary library = new org.ajax4jsf.bean.tree.swing.AudioLibrary(); @@ -371,4 +371,10 @@ setAdvisor(null); } + private static long id = 1; + + public long nextId() { + return id++; + } + } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Album.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Album.java 2008-12-09 01:00:53 UTC (rev 11657) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Album.java 2008-12-09 09:27:35 UTC (rev 11658) @@ -1,5 +1,7 @@ package org.ajax4jsf.bean.tree.rich; +import static org.ajax4jsf.bean.tree.TreeBuilder.nextId; + import org.richfaces.model.TreeNodeImpl; public class Album extends TreeNodeImpl<Object> { @@ -14,7 +16,7 @@ private Integer year; public Album() { - setId(System.currentTimeMillis()); + setId(nextId()); } // Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Performer.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Performer.java 2008-12-09 01:00:53 UTC (rev 11657) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Performer.java 2008-12-09 09:27:35 UTC (rev 11658) @@ -1,5 +1,7 @@ package org.ajax4jsf.bean.tree.rich; +import static org.ajax4jsf.bean.tree.TreeBuilder.nextId; + import org.richfaces.model.TreeNodeImpl; public class Performer extends TreeNodeImpl<Object> { @@ -13,7 +15,7 @@ private String name; public Performer() { - setId(System.currentTimeMillis()); + setId(nextId()); } // Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Song.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Song.java 2008-12-09 01:00:53 UTC (rev 11657) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/rich/Song.java 2008-12-09 09:27:35 UTC (rev 11658) @@ -1,5 +1,7 @@ package org.ajax4jsf.bean.tree.rich; +import static org.ajax4jsf.bean.tree.TreeBuilder.nextId; + import org.richfaces.model.TreeNode; import org.richfaces.model.TreeNodeImpl; @@ -14,7 +16,7 @@ private String title; public Song() { - setId(System.currentTimeMillis()); + setId(nextId()); } // Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tree/treeAutoTest.xhtml =================================================================== (Binary files differ)

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r11657 - in trunk/ui/core/src: test/java/org/ajax4jsf/component and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-12-08 20:00:53 -0500 (Mon, 08 Dec 2008) New Revision: 11657 Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java Log: https://jira.jboss.org/jira/browse/RF-5244 Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java 2008-12-08 19:03:13 UTC (rev 11656) +++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java 2008-12-09 01:00:53 UTC (rev 11657) @@ -81,6 +81,9 @@ public abstract String getOnrequestdequeue(); public abstract void setOnrequestdequeue(String onrequestdequeue); + public abstract String getStatus(); + public abstract void setStatus(String status); + @Override public String getFamily() { return COMPONENT_FAMILY; Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-12-08 19:03:13 UTC (rev 11656) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-12-09 01:00:53 UTC (rev 11657) @@ -156,6 +156,8 @@ queue1.setSize(10); queue1.setOnsizeexceeded("sizeexceeded_handler()"); queue1.setSizeExceededBehavior("dropNext"); + queue1.setOnrequestqueue("request_queue_handler()"); + queue1.setOnrequestdequeue("request_de_queue_handler()"); form.getChildren().add(queue1); UIQueue queue2 = (UIQueue) application.createComponent(UIQueue.COMPONENT_TYPE); @@ -173,7 +175,7 @@ assertEquals(3, scripts.length); assertEquals(dry(createQueueInitString("theform", - "{'size':10,'sizeExceededBehavior':'dropNext','onsizeexceeded':function(query,options,event){sizeexceeded_handler()}}", + "{'size':10,'sizeExceededBehavior':'dropNext','onsizeexceeded':function(query,options,event){sizeexceeded_handler()},'onrequestqueue':function(query,options,event){request_queue_handler()},'onrequestdequeue':function(query,options,event){request_de_queue_handler()}}", null)), scripts[0]); @@ -199,6 +201,7 @@ queue2.setIgnoreDupResponses(true); queue2.setOnbeforedomupdate("beforedomupdate_handler()"); queue2.setOncomplete("complete_handler()"); + queue2.setStatus("mystatus"); form.getChildren().add(queue2); HtmlPage page = renderView(); @@ -209,7 +212,7 @@ assertEquals(dry(createQueueInitString("theform:queue1", null, "{'timeout':50021,'queueonsubmit':function(request){submit_queue_handler()},'queueonerror':function(request,status,message){error_queue_handler()}}")), scripts[0]); assertEquals(dry(createQueueInitString("theform:queue2", null, - "{'ignoreDupResponses':true,'requestDelay':600,'queueonbeforedomupdate':function(request,event,data){beforedomupdate_handler()},'queueoncomplete':function(request,event,data){complete_handler()}}")), + "{'ignoreDupResponses':true,'requestDelay':600,'status':'mystatus','queueonbeforedomupdate':function(request,event,data){beforedomupdate_handler()},'queueoncomplete':function(request,event,data){complete_handler()}}")), scripts[1]); }

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r11656 - in trunk/ui/inplaceSelect/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-12-08 14:03:13 -0500 (Mon, 08 Dec 2008) New Revision: 11656 Modified: trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx Log: https://jira.jboss.org/jira/browse/RF-5275 Modified: trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java =================================================================== --- trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-12-08 18:27:05 UTC (rev 11655) +++ trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-12-08 19:03:13 UTC (rev 11656) @@ -126,36 +126,34 @@ return UIInplaceSelect.class; } - public String getSelectedItemLabel(FacesContext context, UIInplaceSelect component) { - String selectedItemLabel = (String)component.getSubmittedValue(); - if(selectedItemLabel == null) { - Object value = component.getAttributes().get("value"); - if (value == null || "".equals(value)) { - selectedItemLabel = createDefaultLabel(component); - } else { - selectedItemLabel = getItemLabel(context, component, value); - } - } - return selectedItemLabel; - } +// public String getSelectedItemLabel(FacesContext context, UIInplaceSelect component) { +// String selectedItemLabel = (String)component.getSubmittedValue(); +// if(selectedItemLabel == null || !component.isValid()) { +// Object value = component.getAttributes().get("value"); +// if (value == null || "".equals(value)) { +// selectedItemLabel = createDefaultLabel(component); +// } else { +// selectedItemLabel = getItemLabel(context, component, value); +// } +// } +// return selectedItemLabel; +// } protected String getItemLabel(FacesContext context, UIInplaceSelect component, Object value) { String itemLabel = null; // TODO: SelectUtils.getSelectItems is called minimum twice during encode - List<SelectItem> selectItems = SelectUtils.getSelectItems(context, component); - if (!selectItems.isEmpty()) { - for (SelectItem item : selectItems) { - if (value.equals(item.getValue())) { - itemLabel = component.isShowValueInView() ? getConvertedStringValue(context, component, item.getValue()) : item.getLabel(); - break; + if(value != null) { + List<SelectItem> selectItems = SelectUtils.getSelectItems(context, component); + if (!selectItems.isEmpty()) { + for (SelectItem item : selectItems) { + if (value.equals(item.getValue())) { + itemLabel = component.isShowValueInView() ? getConvertedStringValue(context, component, item.getValue()) : item.getLabel(); + break; + } + } } - } } - - if (itemLabel == null) { - itemLabel = createDefaultLabel(component); - } - + return itemLabel; } Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js =================================================================== --- trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-12-08 18:27:05 UTC (rev 11655) +++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-12-08 19:03:13 UTC (rev 11656) @@ -199,9 +199,9 @@ getParameters : function (args) { var result = {}; - var label = args[1]['label']; + var label = args[1]['itemLabel']; if(label) { - var value = args[1]['value']; + var value = args[1]['itemValue']; result.itemLabel = label; result.itemValue = value; } else { Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx =================================================================== --- trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-12-08 18:27:05 UTC (rev 11655) +++ trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-12-08 19:03:13 UTC (rev 11656) @@ -32,19 +32,22 @@ <jsp:scriptlet> <![CDATA[ - Object value = component.getSubmittedValue(); - if(value == null) { - value = component.getAttributes().get("value"); - value = getConvertedStringValue(context, component,value); - } - - String fieldValue = (String)value; - String fieldLabel = getSelectedItemLabel(context, component); + Object value = component.getAttributes().get("value"); + value = getConvertedStringValue(context, component,value); + + String selectedItemLabel = getItemLabel(context, component, value); - if (value == null || value.equals("")) { - fieldValue = ""; - } - + String fieldValue = null; + String fieldLabel = null; + + if (selectedItemLabel == null) { + fieldValue = null; + fieldLabel = createDefaultLabel(component); + } else { + fieldValue = (String)value; + fieldLabel = selectedItemLabel; + } + String encodedFieldValue = encodeValue(fieldValue); variables.setVariable("fieldLabel", fieldLabel);

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r11655 - trunk/ui/calendar/src/main/config/component.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-12-08 13:27:05 -0500 (Mon, 08 Dec 2008) New Revision: 11655 Modified: trunk/ui/calendar/src/main/config/component/calendar.xml Log: https://jira.jboss.org/jira/browse/RF-5209 Modified: trunk/ui/calendar/src/main/config/component/calendar.xml =================================================================== --- trunk/ui/calendar/src/main/config/component/calendar.xml 2008-12-08 18:24:39 UTC (rev 11654) +++ trunk/ui/calendar/src/main/config/component/calendar.xml 2008-12-08 18:27:05 UTC (rev 11655) @@ -42,11 +42,10 @@ </superclassname> </test> </tag> -  + <taghandler generate="true"> + <classname>org.richfaces.taglib.CalendarTagHandler</classname> + <superclass>com.sun.facelets.tag.jsf.ComponentHandler</superclass> + </taghandler> &ui_component_attributes; &ajax_component_attributes; &ui_input_attributes; @@ -617,7 +616,6 @@ minimal days required must be a full week, this method returns 7. Default value is "getDefaultMinDaysInFirstWeek()". </description> </property> - </component> &listeners; </components>

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r11654 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2008-12-08 13:24:39 -0500 (Mon, 08 Dec 2008) New Revision: 11654 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java Log: small fix 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 2008-12-08 18:18:38 UTC (rev 11653) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-12-08 18:24:39 UTC (rev 11654) @@ -144,7 +144,7 @@ if ("*firefox".equals(browser)) { String firefox = findFirefox(); if (firefox != null) { - browser = findFirefox(); + browser = firefox; } } synchronized (MUTEX) {

16 years, 1 month

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits December 2008