JBoss Rich Faces SVN: r21853 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-21 16:25:11 -0500 (Mon, 21 Feb 2011)
New Revision: 21853
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java
Log:
rich:panelMenuGroup - checked expected behavior for server request
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-21 21:24:37 UTC (rev 21852)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-21 21:25:11 UTC (rev 21853)
@@ -81,7 +81,7 @@
if ("phases".equals(listener)) {
phaseInfo.assertPhases(getExpectedPhases());
} else if ("executeChecker".equals(listener)) {
- if (immediate || bypassUpdates) {
+ if (immediate || bypassUpdates || mode == PanelMenuMode.server) {
phaseInfo.assertNoListener("executeChecker");
} else {
phaseInfo.assertListener(UPDATE_MODEL_VALUES, "executeChecker");
13 years, 3 months
JBoss Rich Faces SVN: r21852 - in modules/tests/metamer/trunk/application/src/main/webapp/components: richExtendedDataTable and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-21 16:24:37 -0500 (Mon, 21 Feb 2011)
New Revision: 21852
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
Log:
added event for spinner in data tables
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-02-21 21:24:02 UTC (rev 21851)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-02-21 21:24:37 UTC (rev 21852)
@@ -143,7 +143,7 @@
<h:outputText id="columnHeaderNumberOfKidsType" value="(expression >=)" />
<br/>
<rich:inputNumberSpinner id="spinnerFilter" minValue="0" maxValue="6" cycled="false" value="#{richDataTableBean.filtering['numberOfKids1']}">
- <a4j:ajax render="commonGrid" />
+ <a4j:ajax event="change" render="commonGrid" />
</rich:inputNumberSpinner>
</f:facet>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-02-21 21:24:02 UTC (rev 21851)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-02-21 21:24:37 UTC (rev 21852)
@@ -185,7 +185,7 @@
<h:outputText id="columnHeaderNumberOfKidsType" value="(expression >=)" />
<br/>
<rich:inputNumberSpinner id="spinnerFilter" minValue="0" maxValue="6" cycled="false" value="#{richExtendedDataTableBean.filtering['numberOfKids1']}">
- <a4j:ajax render="commonGrid" />
+ <a4j:ajax event="change" render="commonGrid" />
</rich:inputNumberSpinner>
</f:facet>
13 years, 3 months
JBoss Rich Faces SVN: r21851 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-21 16:24:02 -0500 (Mon, 21 Feb 2011)
New Revision: 21851
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java
Log:
rich:autocomplete - after clearing input, no autocompletion box is shown now
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java 2011-02-21 20:59:53 UTC (rev 21850)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java 2011-02-21 21:24:02 UTC (rev 21851)
@@ -96,7 +96,7 @@
typePrefix("ala");
assertCompletionVisible(true);
deleteAll();
- assertCompletionVisible(true);
+ assertCompletionVisible(false);
typePrefix("ala");
assertCompletionVisible(true);
}
13 years, 3 months
JBoss Rich Faces SVN: r21850 - modules/tests/metamer/tags/metamer-4.0.0.20110220-CR1/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-21 15:59:53 -0500 (Mon, 21 Feb 2011)
New Revision: 21850
Modified:
modules/tests/metamer/tags/metamer-4.0.0.20110220-CR1/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java
Log:
TestPanelMenuItemClientSideHandlers.testClientSideEventsOrderAjax - fixed event order
Modified: modules/tests/metamer/tags/metamer-4.0.0.20110220-CR1/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java
===================================================================
--- modules/tests/metamer/tags/metamer-4.0.0.20110220-CR1/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java 2011-02-21 20:59:25 UTC (rev 21849)
+++ modules/tests/metamer/tags/metamer-4.0.0.20110220-CR1/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java 2011-02-21 20:59:53 UTC (rev 21850)
@@ -47,7 +47,7 @@
@Inject
@Use(empty = true)
String event;
- String[] ajaxEvents = new String[] { "begin", "beforedomupdate", "beforeselect", "select", "complete" };
+ String[] ajaxEvents = new String[] { "beforeselect", "begin", "beforedomupdate", "select", "complete" };
String[] clientEvents = new String[] { "beforeselect", "select" };
String[] serverEvents = new String[] { "select" };
13 years, 3 months
JBoss Rich Faces SVN: r21849 - modules/tests/metamer/tags/metamer-4.0.0.20110220-CR1/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-21 15:59:25 -0500 (Mon, 21 Feb 2011)
New Revision: 21849
Modified:
modules/tests/metamer/tags/metamer-4.0.0.20110220-CR1/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java
Log:
rich:panelMenuGroup - checked expected behavior for server request
Modified: modules/tests/metamer/tags/metamer-4.0.0.20110220-CR1/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java
===================================================================
--- modules/tests/metamer/tags/metamer-4.0.0.20110220-CR1/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-21 19:01:13 UTC (rev 21848)
+++ modules/tests/metamer/tags/metamer-4.0.0.20110220-CR1/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-21 20:59:25 UTC (rev 21849)
@@ -81,7 +81,7 @@
if ("phases".equals(listener)) {
phaseInfo.assertPhases(getExpectedPhases());
} else if ("executeChecker".equals(listener)) {
- if (immediate || bypassUpdates) {
+ if (immediate || bypassUpdates || mode == PanelMenuMode.server) {
phaseInfo.assertNoListener("executeChecker");
} else {
phaseInfo.assertListener(UPDATE_MODEL_VALUES, "executeChecker");
13 years, 3 months
JBoss Rich Faces SVN: r21848 - branches/4.0.X/ui/core/ui/src/main/resources/META-INF/cdk/attributes.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-21 14:01:13 -0500 (Mon, 21 Feb 2011)
New Revision: 21848
Added:
branches/4.0.X/ui/core/ui/src/main/resources/META-INF/cdk/attributes/rowKeyConverter-prop.xml
Log:
https://issues.jboss.org/browse/RF-10580
https://issues.jboss.org/browse/RF-10584
Copied: branches/4.0.X/ui/core/ui/src/main/resources/META-INF/cdk/attributes/rowKeyConverter-prop.xml (from rev 21847, branches/4.0.0.CR1/ui/core/ui/src/main/resources/META-INF/cdk/attributes/rowKeyConverter-prop.xml)
===================================================================
--- branches/4.0.X/ui/core/ui/src/main/resources/META-INF/cdk/attributes/rowKeyConverter-prop.xml (rev 0)
+++ branches/4.0.X/ui/core/ui/src/main/resources/META-INF/cdk/attributes/rowKeyConverter-prop.xml 2011-02-21 19:01:13 UTC (rev 21848)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- JBoss, Home of Professional Open Source Copyright ${year}, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the copyright.txt
+ in the distribution for a full listing of individual contributors. This is
+ free software; you can redistribute it and/or modify it under the terms of
+ the GNU Lesser General Public License as published by the Free Software Foundation;
+ either version 2.1 of the License, or (at your option) any later version.
+ This software is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details. You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the
+ FSF site: http://www.fsf.org. -->
+<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:cdk="http://jboss.org/schema/richfaces/cdk/extensions"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+
+ <property>
+ <property-name>rowKeyConverter</property-name>
+ <property-class>javax.faces.convert.Converter</property-class>
+ </property>
+
+</cdk:properties>
13 years, 3 months
JBoss Rich Faces SVN: r21847 - branches/4.0.0.CR1/ui/core/ui/src/main/resources/META-INF/cdk/attributes.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-21 13:49:15 -0500 (Mon, 21 Feb 2011)
New Revision: 21847
Added:
branches/4.0.0.CR1/ui/core/ui/src/main/resources/META-INF/cdk/attributes/rowKeyConverter-prop.xml
Log:
https://issues.jboss.org/browse/RF-10580
https://issues.jboss.org/browse/RF-10584
Added: branches/4.0.0.CR1/ui/core/ui/src/main/resources/META-INF/cdk/attributes/rowKeyConverter-prop.xml
===================================================================
--- branches/4.0.0.CR1/ui/core/ui/src/main/resources/META-INF/cdk/attributes/rowKeyConverter-prop.xml (rev 0)
+++ branches/4.0.0.CR1/ui/core/ui/src/main/resources/META-INF/cdk/attributes/rowKeyConverter-prop.xml 2011-02-21 18:49:15 UTC (rev 21847)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- JBoss, Home of Professional Open Source Copyright ${year}, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the copyright.txt
+ in the distribution for a full listing of individual contributors. This is
+ free software; you can redistribute it and/or modify it under the terms of
+ the GNU Lesser General Public License as published by the Free Software Foundation;
+ either version 2.1 of the License, or (at your option) any later version.
+ This software is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details. You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the
+ FSF site: http://www.fsf.org. -->
+<cdk:properties xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:cdk="http://jboss.org/schema/richfaces/cdk/extensions"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+
+ <property>
+ <property-name>rowKeyConverter</property-name>
+ <property-class>javax.faces.convert.Converter</property-class>
+ </property>
+
+</cdk:properties>
13 years, 3 months
JBoss Rich Faces SVN: r21846 - in branches/4.0.0.CR1/ui: iteration/ui/src/main/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-21 13:30:41 -0500 (Mon, 21 Feb 2011)
New Revision: 21846
Modified:
branches/4.0.0.CR1/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java
branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java
branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java
branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java
branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java
branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java
branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java
branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java
branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java
Log:
https://issues.jboss.org/browse/RF-10580
https://issues.jboss.org/browse/RF-10584
Modified: branches/4.0.0.CR1/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java
===================================================================
--- branches/4.0.0.CR1/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java 2011-02-21 18:30:05 UTC (rev 21845)
+++ branches/4.0.0.CR1/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java 2011-02-21 18:30:41 UTC (rev 21846)
@@ -30,7 +30,8 @@
* @author Nick Belaevski
*
*/
-@JsfComponent(tag = @Tag(name = "repeat", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"))
+@JsfComponent(tag = @Tag(name = "repeat", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"),
+attributes = "rowKeyConverter-prop.xml")
public class UIRepeat extends UISequence {
public static final String COMPONENT_TYPE = "org.richfaces.Repeat";
Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java
===================================================================
--- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java 2011-02-21 18:30:05 UTC (rev 21845)
+++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java 2011-02-21 18:30:41 UTC (rev 21846)
@@ -46,7 +46,8 @@
family = AbstractCollapsibleSubTable.COMPONENT_FAMILY,
generate = "org.richfaces.component.UICollapsibleSubTable",
renderer = @JsfRenderer(type = "org.richfaces.CollapsibleSubTableRenderer"),
- tag = @Tag(name = "collapsibleSubTable", handler = "org.richfaces.taglib.CollapsibleSubTableHandler", type = TagType.Facelets)
+ tag = @Tag(name = "collapsibleSubTable", handler = "org.richfaces.taglib.CollapsibleSubTableHandler", type = TagType.Facelets),
+ attributes = "rowKeyConverter-prop.xml"
)
public abstract class AbstractCollapsibleSubTable extends UIDataTableBase implements Column, Expandable {
Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java
===================================================================
--- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2011-02-21 18:30:05 UTC (rev 21845)
+++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2011-02-21 18:30:41 UTC (rev 21846)
@@ -58,7 +58,7 @@
generate = "org.richfaces.component.UIDataGrid",
renderer = @JsfRenderer(type = "org.richfaces.DataGridRenderer"),
tag = @Tag(name="dataGrid", handler="org.richfaces.taglib.DataGridHandler", type=TagType.Facelets),
- attributes = {"dataGrid-rows-props.xml"}
+ attributes = {"dataGrid-rows-props.xml", "rowKeyConverter-prop.xml"}
)
public abstract class AbstractDataGrid extends UISequence implements Row, MetaComponentResolver, MetaComponentEncoder {
Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java
===================================================================
--- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java 2011-02-21 18:30:05 UTC (rev 21845)
+++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java 2011-02-21 18:30:41 UTC (rev 21846)
@@ -41,7 +41,8 @@
family = AbstractDataTable.COMPONENT_FAMILY,
generate = "org.richfaces.component.UIDataTable",
renderer = @JsfRenderer(type = "org.richfaces.DataTableRenderer"),
- tag = @Tag(name="dataTable", handler="org.richfaces.taglib.DataTableHandler", type=TagType.Facelets)
+ tag = @Tag(name="dataTable", handler="org.richfaces.taglib.DataTableHandler", type=TagType.Facelets),
+ attributes = "rowKeyConverter-prop.xml"
)
public abstract class AbstractDataTable extends UIDataTableBase {
Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
===================================================================
--- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-02-21 18:30:05 UTC (rev 21845)
+++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-02-21 18:30:41 UTC (rev 21846)
@@ -56,7 +56,8 @@
family = AbstractExtendedDataTable.COMPONENT_FAMILY,
generate = "org.richfaces.component.UIExtendedDataTable",
renderer = @JsfRenderer(type = "org.richfaces.ExtendedDataTableRenderer"),
- tag = @Tag(name = "extendedDataTable")
+ tag = @Tag(name = "extendedDataTable"),
+ attributes = "rowKeyConverter-prop.xml"
)
public abstract class AbstractExtendedDataTable extends UIDataTableBase implements MetaComponentResolver, MetaComponentEncoder {
Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java
===================================================================
--- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java 2011-02-21 18:30:05 UTC (rev 21845)
+++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java 2011-02-21 18:30:41 UTC (rev 21846)
@@ -42,7 +42,9 @@
*
*/
@JsfComponent(type = "org.richfaces.List", family = "org.richfaces.List", facets = @Facet(name = AbstractList.TERM),tag=@Tag(name="list"),
- renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"))
+ renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"),
+ attributes = "rowKeyConverter-prop.xml"
+)
public abstract class AbstractList extends UISequence {
public static final String TERM = "term";
Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java
===================================================================
--- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java 2011-02-21 18:30:05 UTC (rev 21845)
+++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java 2011-02-21 18:30:41 UTC (rev 21846)
@@ -92,7 +92,7 @@
family = AbstractTree.COMPONENT_FAMILY,
tag = @Tag(name = "tree", handler = "org.richfaces.view.facelets.TreeHandler"),
renderer = @JsfRenderer(type = "org.richfaces.TreeRenderer"),
- attributes = {"ajax-props.xml", "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml"}
+ attributes = {"ajax-props.xml", "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml", "rowKeyConverter-prop.xml"}
)
//TODO add rowData caching for wrapper events
public abstract class AbstractTree extends UIDataAdaptor implements MetaComponentResolver, MetaComponentEncoder, TreeSelectionChangeSource, TreeToggleSource {
Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java
===================================================================
--- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java 2011-02-21 18:30:05 UTC (rev 21845)
+++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java 2011-02-21 18:30:41 UTC (rev 21846)
@@ -31,6 +31,7 @@
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
+import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.convert.ConverterUtil;
/**
@@ -45,6 +46,7 @@
private Converter rowKeyConverter;
+ @Attribute
public Converter getRowKeyConverter() {
if (this.rowKeyConverter != null) {
return this.rowKeyConverter;
Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java
===================================================================
--- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java 2011-02-21 18:30:05 UTC (rev 21845)
+++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java 2011-02-21 18:30:41 UTC (rev 21846)
@@ -21,6 +21,7 @@
*/
package org.richfaces.component;
+import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
@@ -46,6 +47,7 @@
return COMPONENT_FAMILY;
}
+ @Attribute
public Object getNodes() {
Object nodes = getStateHelper().eval(PropertyKeys.nodes);
@@ -58,6 +60,7 @@
getStateHelper().put(PropertyKeys.nodes, nodes);
}
+ @Attribute
public boolean isLeaf() {
return (Boolean) getStateHelper().eval(PropertyKeys.leaf, false);
}
Modified: branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java
===================================================================
--- branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java 2011-02-21 18:30:05 UTC (rev 21845)
+++ branches/4.0.0.CR1/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java 2011-02-21 18:30:41 UTC (rev 21846)
@@ -21,6 +21,7 @@
*/
package org.richfaces.component;
+import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
@@ -46,6 +47,7 @@
return COMPONENT_FAMILY;
}
+ @Attribute
public Object getRoots() {
Object roots = getStateHelper().eval(PropertyKeys.roots);
@@ -58,6 +60,7 @@
getStateHelper().put(PropertyKeys.roots, roots);
}
+ @Attribute
public Object getNodes() {
return getStateHelper().eval(PropertyKeys.nodes);
}
@@ -70,6 +73,7 @@
return null;
}
+ @Attribute
public boolean isLeaf() {
return (Boolean) getStateHelper().eval(PropertyKeys.leaf, false);
}
13 years, 3 months
JBoss Rich Faces SVN: r21845 - branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2011-02-21 13:30:05 -0500 (Mon, 21 Feb 2011)
New Revision: 21845
Modified:
branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java
Log:
RF-10577: a4jPoll markup is fixed
Modified: branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java
===================================================================
--- branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2011-02-21 18:29:03 UTC (rev 21844)
+++ branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2011-02-21 18:30:05 UTC (rev 21845)
@@ -21,18 +21,6 @@
package org.richfaces.renderkit.html;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.faces.application.ResourceDependencies;
-import javax.faces.application.ResourceDependency;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.PartialViewContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.event.ActionEvent;
-
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.JSReference;
@@ -44,6 +32,17 @@
import org.richfaces.renderkit.util.HandlersChain;
import org.richfaces.renderkit.util.RendererUtils;
+import javax.faces.application.ResourceDependencies;
+import javax.faces.application.ResourceDependency;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.PartialViewContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.event.ActionEvent;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @author shura
*/
@@ -99,7 +98,6 @@
utils.encodeBeginForm(context, component, writer, clientId);
utils.encodeEndForm(context, writer);
}
- writer.endElement(rootElementName);
// polling script.
writer.startElement(HtmlConstants.SCRIPT_ELEM, component);
@@ -133,6 +131,7 @@
writer.endElement(HtmlConstants.SCRIPT_ELEM);
+ writer.endElement(rootElementName);
}
/*
13 years, 3 months
JBoss Rich Faces SVN: r21844 - in branches/4.0.X/ui: iteration/ui/src/main/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-21 13:29:03 -0500 (Mon, 21 Feb 2011)
New Revision: 21844
Modified:
branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java
Log:
https://issues.jboss.org/browse/RF-10580
https://issues.jboss.org/browse/RF-10584
Modified: branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java
===================================================================
--- branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java 2011-02-21 18:16:12 UTC (rev 21843)
+++ branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java 2011-02-21 18:29:03 UTC (rev 21844)
@@ -30,7 +30,8 @@
* @author Nick Belaevski
*
*/
-@JsfComponent(tag = @Tag(name = "repeat", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"))
+@JsfComponent(tag = @Tag(name = "repeat", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"),
+attributes = "rowKeyConverter-prop.xml")
public class UIRepeat extends UISequence {
public static final String COMPONENT_TYPE = "org.richfaces.Repeat";
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java 2011-02-21 18:16:12 UTC (rev 21843)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java 2011-02-21 18:29:03 UTC (rev 21844)
@@ -46,7 +46,8 @@
family = AbstractCollapsibleSubTable.COMPONENT_FAMILY,
generate = "org.richfaces.component.UICollapsibleSubTable",
renderer = @JsfRenderer(type = "org.richfaces.CollapsibleSubTableRenderer"),
- tag = @Tag(name = "collapsibleSubTable", handler = "org.richfaces.taglib.CollapsibleSubTableHandler", type = TagType.Facelets)
+ tag = @Tag(name = "collapsibleSubTable", handler = "org.richfaces.taglib.CollapsibleSubTableHandler", type = TagType.Facelets),
+ attributes = "rowKeyConverter-prop.xml"
)
public abstract class AbstractCollapsibleSubTable extends UIDataTableBase implements Column, Expandable {
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2011-02-21 18:16:12 UTC (rev 21843)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataGrid.java 2011-02-21 18:29:03 UTC (rev 21844)
@@ -58,7 +58,7 @@
generate = "org.richfaces.component.UIDataGrid",
renderer = @JsfRenderer(type = "org.richfaces.DataGridRenderer"),
tag = @Tag(name="dataGrid", handler="org.richfaces.taglib.DataGridHandler", type=TagType.Facelets),
- attributes = {"dataGrid-rows-props.xml"}
+ attributes = {"dataGrid-rows-props.xml", "rowKeyConverter-prop.xml"}
)
public abstract class AbstractDataGrid extends UISequence implements Row, MetaComponentResolver, MetaComponentEncoder {
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java 2011-02-21 18:16:12 UTC (rev 21843)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataTable.java 2011-02-21 18:29:03 UTC (rev 21844)
@@ -41,7 +41,8 @@
family = AbstractDataTable.COMPONENT_FAMILY,
generate = "org.richfaces.component.UIDataTable",
renderer = @JsfRenderer(type = "org.richfaces.DataTableRenderer"),
- tag = @Tag(name="dataTable", handler="org.richfaces.taglib.DataTableHandler", type=TagType.Facelets)
+ tag = @Tag(name="dataTable", handler="org.richfaces.taglib.DataTableHandler", type=TagType.Facelets),
+ attributes = "rowKeyConverter-prop.xml"
)
public abstract class AbstractDataTable extends UIDataTableBase {
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-02-21 18:16:12 UTC (rev 21843)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-02-21 18:29:03 UTC (rev 21844)
@@ -56,7 +56,8 @@
family = AbstractExtendedDataTable.COMPONENT_FAMILY,
generate = "org.richfaces.component.UIExtendedDataTable",
renderer = @JsfRenderer(type = "org.richfaces.ExtendedDataTableRenderer"),
- tag = @Tag(name = "extendedDataTable")
+ tag = @Tag(name = "extendedDataTable"),
+ attributes = "rowKeyConverter-prop.xml"
)
public abstract class AbstractExtendedDataTable extends UIDataTableBase implements MetaComponentResolver, MetaComponentEncoder {
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java 2011-02-21 18:16:12 UTC (rev 21843)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java 2011-02-21 18:29:03 UTC (rev 21844)
@@ -42,7 +42,9 @@
*
*/
@JsfComponent(type = "org.richfaces.List", family = "org.richfaces.List", facets = @Facet(name = AbstractList.TERM),tag=@Tag(name="list"),
- renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"))
+ renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"),
+ attributes = "rowKeyConverter-prop.xml"
+)
public abstract class AbstractList extends UISequence {
public static final String TERM = "term";
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java 2011-02-21 18:16:12 UTC (rev 21843)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTree.java 2011-02-21 18:29:03 UTC (rev 21844)
@@ -92,7 +92,7 @@
family = AbstractTree.COMPONENT_FAMILY,
tag = @Tag(name = "tree", handler = "org.richfaces.view.facelets.TreeHandler"),
renderer = @JsfRenderer(type = "org.richfaces.TreeRenderer"),
- attributes = {"ajax-props.xml", "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml"}
+ attributes = {"ajax-props.xml", "events-props.xml", "core-props.xml", "i18n-props.xml", "tree-common-props.xml", "rowKeyConverter-prop.xml"}
)
//TODO add rowData caching for wrapper events
public abstract class AbstractTree extends UIDataAdaptor implements MetaComponentResolver, MetaComponentEncoder, TreeSelectionChangeSource, TreeToggleSource {
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java 2011-02-21 18:16:12 UTC (rev 21843)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractTreeModelAdaptor.java 2011-02-21 18:29:03 UTC (rev 21844)
@@ -31,6 +31,7 @@
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
+import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.convert.ConverterUtil;
/**
@@ -45,6 +46,7 @@
private Converter rowKeyConverter;
+ @Attribute
public Converter getRowKeyConverter() {
if (this.rowKeyConverter != null) {
return this.rowKeyConverter;
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java 2011-02-21 18:16:12 UTC (rev 21843)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelAdaptor.java 2011-02-21 18:29:03 UTC (rev 21844)
@@ -21,6 +21,7 @@
*/
package org.richfaces.component;
+import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
@@ -46,6 +47,7 @@
return COMPONENT_FAMILY;
}
+ @Attribute
public Object getNodes() {
Object nodes = getStateHelper().eval(PropertyKeys.nodes);
@@ -58,6 +60,7 @@
getStateHelper().put(PropertyKeys.nodes, nodes);
}
+ @Attribute
public boolean isLeaf() {
return (Boolean) getStateHelper().eval(PropertyKeys.leaf, false);
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java 2011-02-21 18:16:12 UTC (rev 21843)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/UITreeModelRecursiveAdaptor.java 2011-02-21 18:29:03 UTC (rev 21844)
@@ -21,6 +21,7 @@
*/
package org.richfaces.component;
+import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.JsfComponent;
import org.richfaces.cdk.annotations.Tag;
@@ -46,6 +47,7 @@
return COMPONENT_FAMILY;
}
+ @Attribute
public Object getRoots() {
Object roots = getStateHelper().eval(PropertyKeys.roots);
@@ -58,6 +60,7 @@
getStateHelper().put(PropertyKeys.roots, roots);
}
+ @Attribute
public Object getNodes() {
return getStateHelper().eval(PropertyKeys.nodes);
}
@@ -70,6 +73,7 @@
return null;
}
+ @Attribute
public boolean isLeaf() {
return (Boolean) getStateHelper().eval(PropertyKeys.leaf, false);
}
13 years, 3 months