JBoss Rich Faces SVN: r20557 - in trunk/ui/output/ui/src/main: resources/META-INF and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: amarkhel
Date: 2010-12-14 10:16:23 -0500 (Tue, 14 Dec 2010)
New Revision: 20557
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolbar.java
trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss
Log:
https://issues.jboss.org/browse/RF-9970 Toolbar: attribute width doesn't work .
Also empty handler-class tags in pn.taglib.xml deleted (for myfaces compabilities)
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolbar.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolbar.java 2010-12-14 14:12:16 UTC (rev 20556)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolbar.java 2010-12-14 15:16:23 UTC (rev 20557)
@@ -43,7 +43,7 @@
@Attribute
public abstract String getHeight();
- @Attribute
+ @Attribute(defaultValue = "100%")
public abstract String getWidth();
@Attribute
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-14 14:12:16 UTC (rev 20556)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-14 15:16:23 UTC (rev 20557)
@@ -186,7 +186,6 @@
<component>
<component-type>org.richfaces.AccordionItem</component-type>
<renderer-type>org.richfaces.AccordionItem</renderer-type>
- <handler-class/>
</component>
<attribute>
<name>disabled</name>
@@ -463,7 +462,6 @@
<component>
<component-type>org.richfaces.PanelMenuItem</component-type>
<renderer-type>org.richfaces.PanelMenuItem</renderer-type>
- <handler-class/>
</component>
<attribute>
<description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description>
@@ -619,7 +617,6 @@
<component>
<component-type>org.richfaces.PanelMenuGroup</component-type>
<renderer-type>org.richfaces.PanelMenuGroup</renderer-type>
- <handler-class/>
</component>
<attribute>
<description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description>
@@ -1014,7 +1011,6 @@
<component>
<component-type>org.richfaces.Tooltip</component-type>
<renderer-type>org.richfaces.Tooltip</renderer-type>
- <handler-class/>
</component>
<attribute>
<name>for_</name>
@@ -1505,7 +1501,6 @@
<component>
<component-type>org.richfaces.TogglePanelItem</component-type>
<renderer-type>org.richfaces.TogglePanelItem</renderer-type>
- <handler-class/>
</component>
<attribute>
<name>name</name>
@@ -1743,7 +1738,6 @@
<component>
<component-type>org.richfaces.AccordionItem</component-type>
<renderer-type>org.richfaces.AccordionItem</renderer-type>
- <handler-class/>
</component>
<attribute>
<name>disabled</name>
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss 2010-12-14 14:12:16 UTC (rev 20556)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/toolbar.ecss 2010-12-14 15:16:23 UTC (rev 20557)
@@ -11,7 +11,6 @@
background-repeat:repeat-x;
/*check gradient from headerGradientColor to headerBackgroundColor*/
background-image:url("#{resource['org.richfaces.renderkit.html.GradientA']}");
- width:100%;
}
.rf-tb-itm {
14 years, 1 month
JBoss Rich Faces SVN: r20556 - trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-12-14 09:12:16 -0500 (Tue, 14 Dec 2010)
New Revision: 20556
Modified:
trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
Log:
RF-9965
Modified: trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-12-14 14:09:22 UTC (rev 20555)
+++ trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-12-14 14:12:16 UTC (rev 20556)
@@ -35,6 +35,7 @@
import java.util.HashSet;
import java.util.Set;
+import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
import javax.faces.FacesException;
import javax.faces.component.behavior.ClientBehaviorHint;
@@ -44,6 +45,7 @@
import javax.faces.event.BehaviorEvent;
import org.ajax4jsf.component.AjaxClientBehavior;
+import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.JsfBehavior;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;
@@ -79,6 +81,9 @@
@Override
public void setLiteralAttribute(String name, Object value) {
+
+ ExpressionFactory expFactory = getFacesContext().getApplication().getExpressionFactory();
+
if (compare(PropertyKeys.data, name)) {
setData(value);
} else if (compare(PropertyKeys.execute, name)) {
@@ -100,12 +105,16 @@
} else if (compare(PropertyKeys.status, name)) {
setStatus((String) value);
} else if (compare(PropertyKeys.disabled, name)) {
- setDisabled((Boolean) value);
+ value = expFactory.coerceToType(value, Boolean.class);
+ setDisabled((Boolean)value);
} else if (compare(PropertyKeys.limitRender, name)) {
+ value = expFactory.coerceToType(value, Boolean.class);
setLimitRender((Boolean) value);
} else if (compare(PropertyKeys.immediate, name)) {
+ value = expFactory.coerceToType(value, Boolean.class);
setImmediate((Boolean) value);
} else if (compare(PropertyKeys.bypassUpdates, name)) {
+ value = expFactory.coerceToType(value, Boolean.class);
setBypassUpdates((Boolean) value);
}
}
@@ -160,7 +169,8 @@
return null;
}
-
+
+ @Attribute
public Object getData() {
return getStateHelper().eval(PropertyKeys.data);
}
@@ -169,6 +179,7 @@
getStateHelper().put(PropertyKeys.data, data);
}
+ @Attribute
public Collection<String> getExecute() {
return getCollectionValue(PropertyKeys.execute, execute);
}
@@ -178,6 +189,7 @@
clearInitialState();
}
+ @Attribute
public String getOnbeforedomupdate() {
return (String) getStateHelper().eval(PropertyKeys.onbeforedomupdate);
}
@@ -186,6 +198,7 @@
getStateHelper().put(PropertyKeys.onbeforedomupdate, onbeforedomupdate);
}
+ @Attribute
public String getOnbegin() {
return (String) getStateHelper().eval(PropertyKeys.onbegin);
}
@@ -194,6 +207,7 @@
getStateHelper().put(PropertyKeys.onbegin, onbegin);
}
+ @Attribute
public String getOncomplete() {
return (String) getStateHelper().eval(PropertyKeys.oncomplete);
}
@@ -202,6 +216,7 @@
getStateHelper().put(PropertyKeys.oncomplete, oncomplete);
}
+ @Attribute
public String getOnerror() {
return (String) getStateHelper().eval(PropertyKeys.onerror);
}
@@ -210,6 +225,7 @@
getStateHelper().put(PropertyKeys.onerror, onerror);
}
+ @Attribute
public String getOnevent() {
return (String) getStateHelper().eval(PropertyKeys.onevent);
}
@@ -218,6 +234,7 @@
getStateHelper().put(PropertyKeys.onevent, onevent);
}
+ @Attribute
public String getQueueId() {
return (String) getStateHelper().eval(PropertyKeys.queueId);
}
@@ -226,6 +243,7 @@
getStateHelper().put(PropertyKeys.queueId, queueId);
}
+ @Attribute
public Collection<String> getRender() {
return getCollectionValue(PropertyKeys.render, render);
}
@@ -235,6 +253,7 @@
clearInitialState();
}
+ @Attribute
public String getStatus() {
return (String) getStateHelper().eval(PropertyKeys.status);
}
@@ -243,6 +262,7 @@
getStateHelper().put(PropertyKeys.status, status);
}
+ @Attribute
public boolean isDisabled() {
return (Boolean) getStateHelper().eval(PropertyKeys.disabled, false);
}
@@ -251,6 +271,7 @@
getStateHelper().put(PropertyKeys.disabled, disabled);
}
+ @Attribute
public boolean isLimitRender() {
return (Boolean) getStateHelper().eval(PropertyKeys.limitRender, false);
}
@@ -259,6 +280,7 @@
getStateHelper().put(PropertyKeys.limitRender, limitRender);
}
+ @Attribute
public boolean isImmediate() {
return (Boolean) getStateHelper().eval(PropertyKeys.immediate, false);
}
@@ -267,6 +289,7 @@
getStateHelper().put(PropertyKeys.limitRender, immediate);
}
+ @Attribute
public boolean isBypassUpdates() {
return (Boolean) getStateHelper().eval(PropertyKeys.bypassUpdates, false);
}
14 years, 1 month
JBoss Rich Faces SVN: r20555 - in modules/tests/metamer/trunk/application/src/main: java/org/richfaces/tests/metamer/model/treeAdaptor and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-12-14 09:09:22 -0500 (Tue, 14 Dec 2010)
New Revision: 20555
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Node.java
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/RecursiveNode.java
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml
Log:
rich:tree - adaptors - support for Map in model and recursive model(RF-9698)
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java 2010-12-14 13:31:25 UTC (rev 20554)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeModelRecursiveAdaptorBean.java 2010-12-14 14:09:22 UTC (rev 20555)
@@ -25,6 +25,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
@@ -50,7 +51,8 @@
private static final long serialVersionUID = 4008175400649809L;
private static Logger logger;
private Attributes attributes;
- private boolean leafChildrenNullable = true;
+ private AtomicReference<Boolean> leafChildrenNullable = new AtomicReference<Boolean>(true);
+ private boolean useMapModel;
private transient List<RecursiveNode> rootNodes;
/*
@@ -103,10 +105,18 @@
}
public boolean isLeafChildrenNullable() {
- return leafChildrenNullable;
+ return leafChildrenNullable.get();
}
public void setLeafChildrenNullable(boolean leafChildrenNullable) {
- this.leafChildrenNullable = leafChildrenNullable;
+ this.leafChildrenNullable.set(leafChildrenNullable);
}
+
+ public boolean isUseMapModel() {
+ return useMapModel;
+ }
+
+ public void setUseMapModel(boolean useMapModel) {
+ this.useMapModel = useMapModel;
+ }
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java 2010-12-14 13:31:25 UTC (rev 20554)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java 2010-12-14 14:09:22 UTC (rev 20555)
@@ -21,8 +21,11 @@
*******************************************************************************/
package org.richfaces.tests.metamer.model.treeAdaptor;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
/**
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
@@ -31,18 +34,22 @@
public class ModelNode extends Node {
private static final int BS = 3;
+ private static final int KS = 4;
List<B> bs;
+ Map<K, V> map;
List<RecursiveNode> rs;
public ModelNode() {
- super(null, true, null);
+ super(null, null, null);
}
-
- protected ModelNode(Node parent, boolean nullable, Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
+
+ protected ModelNode(Node parent, AtomicReference<Boolean> nullable,
+ Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
super(parent, nullable, lazyLoadingListenerReference);
}
- public static ModelNode getInstance(Node parent, boolean nullable, Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
+ public static ModelNode getInstance(Node parent, AtomicReference<Boolean> nullable,
+ Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
return lazyLoadingChecker(new ModelNode(parent, nullable, lazyLoadingListenerReference));
}
@@ -64,6 +71,16 @@
return bs;
}
+ public Map<K, V> getMap() {
+ if (map == null) {
+ map = new LinkedHashMap<K, V>();
+ for (int i = 0; i < KS; i++) {
+ map.put(new K(i), new V(i));
+ }
+ }
+ return map;
+ }
+
public List<RecursiveNode> getRecursive() {
if (rs == null) {
rs = RecursiveNode.createChildren(this, nullable, null);
@@ -88,19 +105,33 @@
return ModelNode.this.getLabel() + "-B-" + number;
}
}
-
- @Override
- public String toString() {
- return getLabel();
+
+ public class K {
+ int number;
+
+ public K(int number) {
+ this.number = number;
+ }
+
+ public String getLabel() {
+ return ModelNode.this.getLabel() + "-K-" + number;
+ }
}
- private RecursiveNode getParentRecursive() {
- for (Node predecessor : getPredecessorsFromRoot()) {
- if (predecessor instanceof RecursiveNode) {
- return (RecursiveNode) predecessor;
- }
+ public class V {
+ int number;
+
+ public V(int number) {
+ this.number = number;
}
- return null;
+
+ public String getLabel() {
+ return ModelNode.this.getLabel() + "-V-" + number;
+ }
}
+ @Override
+ public String toString() {
+ return getLabel();
+ }
}
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Node.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Node.java 2010-12-14 13:31:25 UTC (rev 20554)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/Node.java 2010-12-14 14:09:22 UTC (rev 20555)
@@ -23,6 +23,7 @@
import java.util.Deque;
import java.util.LinkedList;
+import java.util.concurrent.atomic.AtomicReference;
/**
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
@@ -30,11 +31,12 @@
*/
public abstract class Node {
Node parent;
- boolean nullable;
+ AtomicReference<Boolean> nullable;
Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference = new NodeReference();
- protected Node(Node parent, boolean nullable, Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
+ protected Node(Node parent, AtomicReference<Boolean> nullable,
+ Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
this.parent = parent;
this.nullable = nullable;
if (lazyLoadingListenerReference != null) {
@@ -74,11 +76,11 @@
}
public abstract String getLabel();
-
+
public Reference<LazyLoadingListener<Node>> getLazyLoadingListenerReference() {
return lazyLoadingListenerReference;
}
-
+
public void setLazyLoadingListener(Reference<LazyLoadingListener<Node>> lazyLoadingListener) {
this.lazyLoadingListenerReference = lazyLoadingListener;
}
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/RecursiveNode.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/RecursiveNode.java 2010-12-14 13:31:25 UTC (rev 20554)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/RecursiveNode.java 2010-12-14 14:09:22 UTC (rev 20555)
@@ -21,8 +21,14 @@
*******************************************************************************/
package org.richfaces.tests.metamer.model.treeAdaptor;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
/**
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
@@ -32,21 +38,25 @@
private static final int CHILDREN = 4;
private static final int LEVELS = 2;
private static final List<RecursiveNode> EMPTY_LIST = new LinkedList<RecursiveNode>();
+ private static final Map<Integer, RecursiveNode> EMPTY_MAP = new HashMap<Integer, RecursiveNode>();
int number;
List<RecursiveNode> children = null;
+ NodeMap nodeMap = new NodeMap();
ModelNode model;
public RecursiveNode() {
- super(null, true, null);
+ super(null, null, null);
}
-
- protected RecursiveNode(Node parent, boolean nullable, int number, Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
+
+ protected RecursiveNode(Node parent, AtomicReference<Boolean> nullable, int number,
+ Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
super(parent, nullable, lazyLoadingListenerReference);
this.number = number;
}
- public static RecursiveNode getInstance(Node parent, boolean nullable, int number, Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
+ public static RecursiveNode getInstance(Node parent, AtomicReference<Boolean> nullable, int number,
+ Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
return lazyLoadingChecker(new RecursiveNode(parent, nullable, number, lazyLoadingListenerReference));
}
@@ -58,9 +68,9 @@
return getRecursionLevel() >= LEVELS + (isOddBranch() ? 0 : 1);
}
- public List<RecursiveNode> getRecursive() {
+ public List<RecursiveNode> getRecursiveList() {
if (isLeaf()) {
- return getEmpty();
+ return getEmptyList();
}
if (children == null) {
children = createChildren(this, nullable, null);
@@ -68,10 +78,21 @@
return children;
}
- private List<RecursiveNode> getEmpty() {
- return nullable ? null : EMPTY_LIST;
+ public Map<Integer, RecursiveNode> getRecursiveMap() {
+ if (isLeaf()) {
+ return getEmptyMap();
+ }
+ return nodeMap;
}
+ private List<RecursiveNode> getEmptyList() {
+ return nullable.get() ? null : EMPTY_LIST;
+ }
+
+ private Map<Integer, RecursiveNode> getEmptyMap() {
+ return nullable.get() ? null : EMPTY_MAP;
+ }
+
public String getLabel() {
String parentLabel = (isRoot() ? "" : parent.getLabel() + "-") + "R-";
String recursionLabel = (isRecursionRoot() ? parentLabel : parent.getLabel() + ".") + number;
@@ -100,7 +121,8 @@
}
}
- public static List<RecursiveNode> createChildren(Node parent, boolean nullable, Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
+ public static List<RecursiveNode> createChildren(Node parent, AtomicReference<Boolean> nullable,
+ Reference<LazyLoadingListener<Node>> lazyLoadingListenerReference) {
List<RecursiveNode> children = new LinkedList<RecursiveNode>();
for (int i = 0; i < CHILDREN; i++) {
RecursiveNode node = RecursiveNode.getInstance(parent, nullable, i, lazyLoadingListenerReference);
@@ -131,4 +153,107 @@
public String toString() {
return getLabel();
}
+
+ public class NodeMap implements Map<Integer, RecursiveNode> {
+
+ @Override
+ public int size() {
+ return getRecursiveList().size();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return getRecursiveList().isEmpty();
+ }
+
+ @Override
+ public boolean containsKey(Object key) {
+ throw new UnsupportedOperationException("not implemented");
+ }
+
+ @Override
+ public boolean containsValue(Object value) {
+ throw new UnsupportedOperationException("not implemented");
+ }
+
+ @Override
+ public RecursiveNode get(Object key) {
+ if (key instanceof Integer) {
+ return getRecursiveList().get((Integer) key);
+ }
+ throw new IllegalStateException("there is no value for the key '" + key + "' (type "
+ + key.getClass().getName() + ")");
+ }
+
+ @Override
+ public RecursiveNode put(Integer key, RecursiveNode value) {
+ throw new UnsupportedOperationException("not supported");
+ }
+
+ @Override
+ public RecursiveNode remove(Object key) {
+ throw new UnsupportedOperationException("not supported");
+ }
+
+ @Override
+ public void putAll(Map<? extends Integer, ? extends RecursiveNode> m) {
+ throw new UnsupportedOperationException("not supported");
+ }
+
+ @Override
+ public void clear() {
+ throw new UnsupportedOperationException("not supported");
+ }
+
+ @Override
+ public Set<Integer> keySet() {
+ HashSet<Integer> set = new HashSet<Integer>();
+ for (int i = 0; i < getRecursiveList().size(); i++) {
+ set.add(i);
+ }
+ return set;
+ }
+
+ @Override
+ public Collection<RecursiveNode> values() {
+ return getRecursiveList();
+ }
+
+ @Override
+ public Set<java.util.Map.Entry<Integer, RecursiveNode>> entrySet() {
+ HashSet<Map.Entry<Integer, RecursiveNode>> set = new HashSet<Map.Entry<Integer, RecursiveNode>>();
+ int i = 0;
+ for (RecursiveNode node : getRecursiveList()) {
+ set.add(new MapEntry(i++, node));
+ }
+ return set;
+ }
+
+ }
+
+ public class MapEntry implements Map.Entry<Integer, RecursiveNode> {
+
+ int key;
+ RecursiveNode node;
+
+ public MapEntry(int key, RecursiveNode node) {
+ this.key = key;
+ this.node = node;
+ }
+
+ @Override
+ public Integer getKey() {
+ return key;
+ }
+
+ @Override
+ public RecursiveNode getValue() {
+ return node;
+ }
+
+ @Override
+ public RecursiveNode setValue(RecursiveNode value) {
+ throw new UnsupportedOperationException("not supported");
+ }
+ }
}
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2010-12-14 13:31:25 UTC (rev 20554)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2010-12-14 14:09:22 UTC (rev 20555)
@@ -77,7 +77,7 @@
<rich:treeModelRecursiveAdaptor
roots="#{richTreeModelRecursiveAdaptorBean.rootNodes}"
- nodes="#{node.recursive}"
+ nodes="#{richTreeModelRecursiveAdaptorBean.useMapModel ? node.recursiveMap : node.recursiveList}"
recursionOrder="#{richTreeModelRecursiveAdaptorBean.attributes['recursionOrder'].value}"
>
@@ -93,7 +93,17 @@
</rich:treeNode>
</rich:treeModelAdaptor>
- <rich:treeModelRecursiveAdaptor roots="#{node.model.recursive}" nodes="#{node.recursive}" rendered="#{richTreeModelRecursiveAdaptorBean.attributes['rendered'].value}">
+ <rich:treeModelAdaptor nodes="#{node.model.map}" rendered="#{richTreeModelAdaptorBean.attributes['rendered'].value}">
+ <rich:treeNode>
+ #{node.label}
+ </rich:treeNode>
+ </rich:treeModelAdaptor>
+
+ <rich:treeModelRecursiveAdaptor
+ roots="#{node.model.recursive}"
+ nodes="#{richTreeModelRecursiveAdaptorBean.useMapModel ? node.recursiveMap : node.recursiveList}"
+ rendered="#{richTreeModelRecursiveAdaptorBean.attributes['rendered'].value}">
+
<rich:treeNode rendered="#{richTreeNodeBean.attributes['rendered'].value || node.number != 1}">
#{node.label}
</rich:treeNode>
@@ -106,11 +116,24 @@
<ui:define name="outOfTemplateAfter">
<h:panelGrid id="selectionOutput" columns="2">
- <h:outputLabel value="Selection: " />
+ <h:outputLabel value="Selection:" />
<h:outputText value="#{richTreeBean.selection}" />
<h:outputLabel value="Lazy Initialized:" />
<h:outputText value="#{richTreeModelRecursiveAdaptorBean.lazyInitializedNodes}" />
+
+ <h:outputLabel value="Recursive Leaf Children Nullable:" />
+ <h:selectBooleanCheckbox value="#{richTreeModelRecursiveAdaptorBean.leafChildrenNullable}">
+ <a4j:ajax render="commonGrid" />
+ </h:selectBooleanCheckbox>
+
+ <h:outputLabel value="Recursive Model Representation:" />
+ <h:selectOneRadio value="#{richTreeModelRecursiveAdaptorBean.useMapModel}">
+ <f:selectItem itemLabel="List<RecursiveNode>" itemValue="false" />
+ <f:selectItem itemLabel="Map<Integer, RecursiveNode>" itemValue="true" />
+
+ <a4j:ajax render="commonGrid" />
+ </h:selectOneRadio>
</h:panelGrid>
<a4j:outputPanel>
14 years, 1 month
JBoss Rich Faces SVN: r20554 - trunk/ui/output/ui/src/main/resources/META-INF.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-12-14 08:31:25 -0500 (Tue, 14 Dec 2010)
New Revision: 20554
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
Log:
RF-9957: Taglib: tab and tabPanel have no attributes
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-14 13:28:19 UTC (rev 20553)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-14 13:31:25 UTC (rev 20554)
@@ -1562,10 +1562,342 @@
<component>
<component-type>org.richfaces.TabPanel</component-type>
<component-class>org.richfaces.component.html.HtmlTabPanel</component-class>
+ <property>
+ <property-name>cycledSwitching</property-name>
+ <property-class>boolean</property-class>
+ </property>
+ <property>
+ <property-name>switchproperty-class</property-name>
+ <property-class>org.richfaces.component.SwitchType</property-class>
+ </property>
+ <property>
+ <property-name>activeItem</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>bypassUpdates</property-name>
+ <property-class>boolean</property-class>
+ </property>
+ <property>
+ <property-name>disableImplicitRender</property-name>
+ <property-class>boolean</property-class>
+ </property>
+ <property>
+ <property-name>data</property-name>
+ <property-class>java.lang.Object</property-class>
+ </property>
+ <property>
+ <property-name>status</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>execute</property-name>
+ <property-class>java.lang.Object</property-class>
+ </property>
+ <property>
+ <property-name>render</property-name>
+ <property-class>java.lang.Object</property-class>
+ </property>
+ <property>
+ <property-name>immediate</property-name>
+ <property-class>boolean</property-class>
+ </property>
+ <property>
+ <property-name>itemChangeListener</property-name>
+ <property-class>javax.el.MethodExpression</property-class>
+ </property>
+ <property>
+ <description>Long long text</description>
+ <property-name>id</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description>binding description</description>
+ <property-name>binding</property-name>
+ <property-class>javax.faces.component.UIComponent</property-class>
+ </property>
+ <property>
+ <description>I don't know maybe some thing strange</description>
+ <property-name>rendered</property-name>
+ <property-class>boolean</property-class>
+ </property>
+ <property>
+ <property-name>width</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>height</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>tabClassActive</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>tabClassDisabled</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>tabClassInactive</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>tabContentClass</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>tabClass</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>onitemchange</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>onbeforeitemchange</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>lang</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>title</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>style</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>styleClass</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>dir</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>onclick</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>ondblclick</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>onmousedown</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>onmousemove</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>onmouseout</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>onmouseover</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>onmouseup</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>headerPosition</property-name>
+ <property-class>org.richfaces.HeaderPosition</property-class>
+ </property>
+ <property>
+ <property-name>headerAlignment</property-name>
+ <property-class>org.richfaces.HeaderAlignment</property-class>
+ </property>
+ <property>
+ <property-name>headerLayout</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>headerClass</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>headerSpacingClass</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>onbeforetabchange</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <property-name>ontabchange</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
</component>
<component>
<component-type>org.richfaces.TabPanelItem</component-type>
<component-class>org.richfaces.component.html.HtmlTab</component-class>
+ <property>
+ <description></description>
+ <property-name>disabled</property-name>
+ <property-class>boolean</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>label</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>name</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>switchType</property-name>
+ <property-class>org.richfaces.component.SwitchType</property-class>
+ </property>
+ <property>
+ <description>Long long text</description>
+ <property-name>id</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description>binding description</description>
+ <property-name>binding</property-name>
+ <property-class>javax.faces.component.UIComponent</property-class>
+ </property>
+ <property>
+ <description>I don't know maybe some thing strange</description>
+ <property-name>rendered</property-name>
+ <property-class>boolean</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>headerClassActive</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>headerClassDisabled</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>headerClassInactive</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>headerClass</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>headerStyle</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>contentClass</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onheaderclick</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onheaderdblclick</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onheadermousedown</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onheadermousemove</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onheadermouseup</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onenter</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onleave</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>lang</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>title</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>style</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>styleClass</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>dir</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onclick</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>ondblclick</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onmousedown</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onmousemove</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onmouseout</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onmouseover</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+ <property>
+ <description></description>
+ <property-name>onmouseup</property-name>
+ <property-class>java.lang.String</property-class>
+ </property>
+
</component>
<component>
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-14 13:28:19 UTC (rev 20553)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-14 13:31:25 UTC (rev 20554)
@@ -2,20 +2,461 @@
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd">
<namespace>http://richfaces.org/pn</namespace>
+ <tag>
+ <tag-name>tabPanel</tag-name>
+ <component>
+ <component-type>org.richfaces.TabPanel</component-type>
+ <renderer-type>org.richfaces.TabPanel</renderer-type>
+ <handler-class>org.richfaces.view.facelets.html.TogglePanelTagHandler</handler-class>
+ </component>
+ <attribute>
+ <name>cycledSwitching</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>switchType</name>
+ <type>org.richfaces.component.SwitchType</type>
+ </attribute>
+ <attribute>
+ <name>activeItem</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>bypassUpdates</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>disableImplicitRender</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>data</name>
+ <type>java.lang.Object</type>
+ </attribute>
+ <attribute>
+ <name>status</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>execute</name>
+ <type>java.lang.Object</type>
+ </attribute>
+ <attribute>
+ <name>render</name>
+ <type>java.lang.Object</type>
+ </attribute>
+ <attribute>
+ <name>immediate</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>itemChangeListener</name>
+ <type>javax.el.MethodExpression</type>
+ </attribute>
+ <attribute>
+ <description>Long long text</description>
+ <name>id</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description>binding description</description>
+ <name>binding</name>
+ <type>javax.faces.component.UIComponent</type>
+ </attribute>
+ <attribute>
+ <description>I don't know maybe some thing strange</description>
+ <name>rendered</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>width</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>height</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>tabClassActive</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>tabClassDisabled</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>tabClassInactive</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>tabContentClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>tabClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onitemchange</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onbeforeitemchange</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>lang</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>title</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>style</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>styleClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>dir</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>ondblclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmousedown</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmousemove</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmouseout</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmouseover</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmouseup</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerPosition</name>
+ <type>org.richfaces.HeaderPosition</type>
+ </attribute>
+ <attribute>
+ <name>headerAlignment</name>
+ <type>org.richfaces.HeaderAlignment</type>
+ </attribute>
+ <attribute>
+ <name>headerLayout</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerSpacingClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onbeforetabchange</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>ontabchange</name>
+ <type>java.lang.String</type>
+ </attribute>
+ </tag>
<tag>
- <tag-name>tabPanel</tag-name>
+ <tag-name>accordionItem</tag-name>
<component>
- <component-type>org.richfaces.TabPanel</component-type>
- <renderer-type>org.richfaces.TabPanel</renderer-type>
- <handler-class>org.richfaces.view.facelets.html.TogglePanelTagHandler</handler-class>
+ <component-type>org.richfaces.AccordionItem</component-type>
+ <renderer-type>org.richfaces.AccordionItem</renderer-type>
+ <handler-class/>
</component>
+ <attribute>
+ <name>disabled</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>header</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>name</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>switchType</name>
+ <type>org.richfaces.component.SwitchType</type>
+ </attribute>
+ <attribute>
+ <description>Long long text</description>
+ <name>id</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description>binding description</description>
+ <name>binding</name>
+ <type>javax.faces.component.UIComponent</type>
+ </attribute>
+ <attribute>
+ <description>I don't know maybe some thing strange</description>
+ <name>rendered</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>headerClassActive</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerClassDisabled</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerClassInactive</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerStyle</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>contentClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onheaderclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onheaderdblclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onheadermousedown</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onheadermousemove</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onheadermouseup</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onenter</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onleave</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>lang</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>title</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>style</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>styleClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>dir</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>ondblclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmousedown</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmousemove</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmouseout</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmouseover</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmouseup</name>
+ <type>java.lang.String</type>
+ </attribute>
</tag>
<tag>
- <tag-name>tab</tag-name>
- <component>
- <component-type>org.richfaces.TabPanelItem</component-type>
- <renderer-type>org.richfaces.Tab</renderer-type>
- </component>
+ <tag-name>tab</tag-name>
+ <component>
+ <component-type>org.richfaces.TabPanelItem</component-type>
+ <renderer-type>org.richfaces.Tab</renderer-type>
+ </component>
+ <attribute>
+ <name>disabled</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>header</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>name</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>switchType</name>
+ <type>org.richfaces.component.SwitchType</type>
+ </attribute>
+ <attribute>
+ <description>Long long text</description>
+ <name>id</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description>binding description</description>
+ <name>binding</name>
+ <type>javax.faces.component.UIComponent</type>
+ </attribute>
+ <attribute>
+ <description>I don't know maybe some thing strange</description>
+ <name>rendered</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <name>headerClassActive</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerClassDisabled</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerClassInactive</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>headerStyle</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>contentClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onheaderclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onheaderdblclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onheadermousedown</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onheadermousemove</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onheadermouseup</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onenter</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onleave</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>lang</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>title</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>style</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>styleClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>dir</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>ondblclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmousedown</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmousemove</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmouseout</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmouseover</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <name>onmouseup</name>
+ <type>java.lang.String</type>
+ </attribute>
</tag>
<tag>
<tag-name>panelMenuItem</tag-name>
14 years, 1 month
JBoss Rich Faces SVN: r20553 - in trunk: ui/dist/richfaces-components-api and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-12-14 08:28:19 -0500 (Tue, 14 Dec 2010)
New Revision: 20553
Modified:
trunk/bom/pom.xml
trunk/ui/dist/richfaces-components-api/pom.xml
trunk/ui/dist/richfaces-components-ui/pom.xml
Log:
RF-9771
Modified: trunk/bom/pom.xml
===================================================================
--- trunk/bom/pom.xml 2010-12-14 13:22:23 UTC (rev 20552)
+++ trunk/bom/pom.xml 2010-12-14 13:28:19 UTC (rev 20553)
@@ -117,6 +117,16 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.richfaces.ui.dnd</groupId>
+ <artifactId>richfaces-ui-dnd-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui.dnd</groupId>
+ <artifactId>richfaces-ui-dnd-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-components-api</artifactId>
<version>${project.version}</version>
Modified: trunk/ui/dist/richfaces-components-api/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-api/pom.xml 2010-12-14 13:22:23 UTC (rev 20552)
+++ trunk/ui/dist/richfaces-components-api/pom.xml 2010-12-14 13:28:19 UTC (rev 20553)
@@ -60,6 +60,10 @@
<groupId>org.richfaces.ui.input</groupId>
<artifactId>richfaces-ui-input-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.ui.dnd</groupId>
+ <artifactId>richfaces-ui-dnd-api</artifactId>
+ </dependency>
<!-- for javadoc generation -->
<dependency>
Modified: trunk/ui/dist/richfaces-components-ui/pom.xml
===================================================================
--- trunk/ui/dist/richfaces-components-ui/pom.xml 2010-12-14 13:22:23 UTC (rev 20552)
+++ trunk/ui/dist/richfaces-components-ui/pom.xml 2010-12-14 13:28:19 UTC (rev 20553)
@@ -65,7 +65,10 @@
<groupId>org.richfaces.ui.input</groupId>
<artifactId>richfaces-ui-input-ui</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.richfaces.ui.dnd</groupId>
+ <artifactId>richfaces-ui-dnd-ui</artifactId>
+ </dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-components-api</artifactId>
14 years, 1 month
JBoss Rich Faces SVN: r20552 - in modules/tests/metamer/trunk/application/src/main/webapp/components: a4jPoll and 13 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-12-14 08:22:23 -0500 (Tue, 14 Dec 2010)
New Revision: 20552
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml
Log:
* attributes cleaned up
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/image.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -54,7 +54,6 @@
converter="#{a4jMediaOutputBean.attributes['converter'].value}"
coords="#{a4jMediaOutputBean.attributes['coords'].value}"
createContent="#{a4jMediaOutputBean.paint}"
- createContentExpression="#{a4jMediaOutputBean.attributes['createContentExpression'].value}"
declare="#{a4jMediaOutputBean.attributes['declare'].value}"
dir="#{a4jMediaOutputBean.attributes['dir'].value}"
element="img"
@@ -63,8 +62,7 @@
hspace="#{a4jMediaOutputBean.attributes['hspace'].value}"
ismap="#{a4jMediaOutputBean.attributes['ismap'].value}"
lang="#{a4jMediaOutputBean.attributes['lang'].value}"
- lastmodified="#{a4jMediaOutputBean.attributes['lastmodified'].value}"
- localValue="#{a4jMediaOutputBean.attributes['localValue'].value}"
+ lastModified="#{a4jMediaOutputBean.attributes['lastModified'].value}"
mimeType="image/jpeg"
onblur="#{a4jMediaOutputBean.attributes['onblur'].value}"
onclick="#{a4jMediaOutputBean.attributes['onclick'].value}"
@@ -80,9 +78,7 @@
onmouseup="#{a4jMediaOutputBean.attributes['onmouseup'].value}"
rel="#{a4jMediaOutputBean.attributes['rel'].value}"
rendered="#{a4jMediaOutputBean.attributes['rendered'].value}"
- resource="#{a4jMediaOutputBean.attributes['resource'].value}"
rev="#{a4jMediaOutputBean.attributes['rev'].value}"
- session="#{a4jMediaOutputBean.attributes['session'].value}"
shape="#{a4jMediaOutputBean.attributes['shape'].value}"
standby="#{a4jMediaOutputBean.attributes['standby'].value}"
style="#{a4jMediaOutputBean.attributes['style'].value}"
@@ -91,8 +87,8 @@
target="#{a4jMediaOutputBean.attributes['target'].value}"
title="#{a4jMediaOutputBean.attributes['title'].value}"
type="#{a4jMediaOutputBean.attributes['type'].value}"
- urlAttribute="#{a4jMediaOutputBean.attributes['urlAttribute'].value}"
- usermap="#{a4jMediaOutputBean.attributes['usermap'].value}"
+ uriAttribute="#{a4jMediaOutputBean.attributes['uriAttribute'].value}"
+ usemap="#{a4jMediaOutputBean.attributes['usemap'].value}"
value="#{mediaData}"
vspace="#{a4jMediaOutputBean.attributes['vspace'].value}"
/>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPoll/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -48,14 +48,19 @@
action="#{a4jPollBean.attributes.action}"
actionListener="#{a4jPollBean.attributes.actionListener}"
bypassUpdates="#{a4jPollBean.attributes['bypassUpdates'].value}"
+ data="#{a4jPollBean.attributes['data'].value}"
enabled="#{a4jPollBean.attributes['enabled'].value}"
+ execute="#{a4jPollBean.attributes['execute'].value}"
immediate="#{a4jPollBean.attributes['immediate'].value}"
interval="#{a4jPollBean.attributes['interval'].value}"
+ limitRender="#{a4jPollBean.attributes['limitRender'].value}"
onbeforedomupdate="#{a4jPollBean.attributes['onbeforedomupdate'].value}"
onbegin="#{rich:element('timeWatcher:grid')}.begin(); #{a4jPollBean.attributes['onbegin'].value}"
oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{a4jPollBean.attributes['oncomplete'].value}"
ontimer="#{rich:element('timeWatcher:grid')}.event(); #{rich:element('timeWatcher:grid')}.difference(); #{a4jPollBean.attributes['ontimer'].value}"
+ render="#{a4jPollBean.attributes['render'].value}"
rendered="#{a4jPollBean.attributes['rendered'].value}"
+ status="#{a4jPollBean.attributes['status'].value}"
value="#{a4jPollBean.attributes['value'].value}"
>
<a4j:ajax event="timer" render="output" />
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jStatus/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -59,7 +59,6 @@
<legend>status (inside form)</legend>
<a4j:status id="status"
converter="#{a4jStatusBean.attributes['converter'].value}"
- localValue="#{a4jStatusBean.attributes['localValue'].value}"
onerror="#{a4jStatusBean.attributes['onerror'].value}"
onstart="#{a4jStatusBean.attributes['onstart'].value}"
onstop="#{a4jStatusBean.attributes['onstop'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -46,6 +46,7 @@
cycledSwitching="#{richAccordionBean.attributes['cycledSwitching'].value}"
data="#{richAccordionBean.attributes['data'].value}"
dir="#{richAccordionBean.attributes['dir'].value}"
+ disableImplicitRender="#{richAccordionBean.attributes['disableImplicitRender'].value}"
execute="#{richAccordionBean.attributes['execute'].value}"
height="#{richAccordionBean.attributes['height'].value}"
immediate="#{richAccordionBean.attributes['immediate'].value}"
@@ -56,7 +57,6 @@
itemHeaderClassDisabled="#{richAccordionBean.attributes['itemHeaderClassDisabled'].value}"
itemHeaderClassInactive="#{richAccordionBean.attributes['itemHeaderClassInactive'].value}"
lang="#{richAccordionBean.attributes['lang'].value}"
- limitToList="#{richAccordionBean.attributes['limitToList'].value}"
onbeforeitemchange="#{richAccordionBean.attributes['onbeforeitemchange'].value}"
onclick="#{richAccordionBean.attributes['onclick'].value}"
ondblclick="#{richAccordionBean.attributes['ondblclick'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -43,7 +43,7 @@
<rich:autocomplete id="autocomplete"
autofill="#{richAutocompleteBean.attributes['autofill'].value}"
autocompleteMethod="#{richAutocompleteBean.autocomplete}"
- clientFilter="#{richAutocompleteBean.attributes['clientFilter'].value}"
+ clientFilterFunction="#{richAutocompleteBean.attributes['clientFilterFunction'].value}"
converterMessage="#{richAutocompleteBean.attributes['converterMessage'].value}"
disabled="#{richAutocompleteBean.attributes['disabled'].value}"
filterFunction="#{richAutocompleteBean.attributes['filterFunction'].value}"
@@ -88,6 +88,7 @@
tokens="#{richAutocompleteBean.attributes['tokens'].value}"
validatorMessage="#{richAutocompleteBean.attributes['validatorMessage'].value}"
value="#{richAutocompleteBean.attributes['value'].value}"
+ valueChangeListener="#{richBean.valueChangeListener}"
var="#{richAutocompleteBean.attributes['var'].value}"
>
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -46,6 +46,7 @@
bypassUpdates="#{richCollapsiblePanelBean.attributes['bypassUpdates'].value}"
data="#{richCollapsiblePanelBean.attributes['data'].value}"
dir="#{richCollapsiblePanelBean.attributes['dir'].value}"
+ disableImplicitRender="#{richCollapsiblePanelBean.attributes['disableImplicitRender'].value}"
execute="#{richCollapsiblePanelBean.attributes['execute'].value}"
expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}"
header="#{richCollapsiblePanelBean.attributes['header'].value}"
@@ -53,7 +54,6 @@
headerControlClass="#{richCollapsiblePanelBean.attributes['headerControlClass'].value}"
immediate="#{richCollapsiblePanelBean.attributes['immediate'].value}"
lang="#{richCollapsiblePanelBean.attributes['lang'].value}"
- limitToList="#{richCollapsiblePanelBean.attributes['limitToList'].value}"
onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}"
onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}"
onclick="#{richCollapsiblePanelBean.attributes['onclick'].value}"
@@ -65,7 +65,6 @@
onmouseover="#{richCollapsiblePanelBean.attributes['onmouseover'].value}"
onmouseup="#{richCollapsiblePanelBean.attributes['onmouseup'].value}"
onswitch="#{richCollapsiblePanelBean.attributes['onswitch'].value}"
- panelToggleListener="#{richCollapsiblePanelBean.panelToggleListener}"
render="#{richCollapsiblePanelBean.attributes['render'].value}"
rendered="#{richCollapsiblePanelBean.attributes['rendered'].value}"
status="#{richCollapsiblePanelBean.attributes['status'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceInput/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -45,6 +45,7 @@
converter="#{richInplaceInputBean.attributes['converter'].value}"
converterMessage="#{richInplaceInputBean.attributes['converterMessage'].value}"
defaultLabel="#{richInplaceInputBean.attributes['defaultLabel'].value}"
+ disabled="#{richInplaceInputBean.attributes['disabled'].value}"
disabledStateClass="#{richInplaceInputBean.attributes['disableStateClass'].value}"
editClass="#{richInplaceInputBean.attributes['editClass'].value}"
editEvent="#{richInplaceInputBean.attributes['editEvent'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInputNumberSlider/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -66,12 +66,12 @@
showArrows="#{richInputNumberSliderBean.attributes['showArrows'].value}"
showBoundaryValues="#{richInputNumberSliderBean.attributes['showBoundaryValues'].value}"
showInput="#{richInputNumberSliderBean.attributes['showInput'].value}"
- showToolTip="#{richInputNumberSliderBean.attributes['showToolTip'].value}"
+ showTooltip="#{richInputNumberSliderBean.attributes['showTooltip'].value}"
step="#{richInputNumberSliderBean.attributes['step'].value}"
style="#{richInputNumberSliderBean.attributes['style'].value}"
styleClass="#{richInputNumberSliderBean.attributes['styleClass'].value}"
tabindex="#{richInputNumberSliderBean.attributes['tabindex'].value}"
- toolTipClass="#{richInputNumberSliderBean.attributes['toolTipClass'].value}"
+ tooltipClass="#{richInputNumberSliderBean.attributes['tooltipClass'].value}"
trackClass="#{richInputNumberSliderBean.attributes['trackClass'].value}"
validatorMessage="#{richInputNumberSliderBean.attributes['validatorMessage'].value}"
value="#{richInputNumberSliderBean.attributes['value'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richList/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -59,6 +59,16 @@
onmouseout="#{richListBean.attributes['onmouseout'].value}"
onmouseover="#{richListBean.attributes['onmouseover'].value}"
onmouseup="#{richListBean.attributes['onmouseup'].value}"
+ onrowclick="#{richListBean.attributes['onrowclick'].value}"
+ onrowdblclick="#{richListBean.attributes['onrowdblclick'].value}"
+ onrowkeydown="#{richListBean.attributes['onrowkeydown'].value}"
+ onrowkeypress="#{richListBean.attributes['onrowkeypress'].value}"
+ onrowkeyup="#{richListBean.attributes['onrowkeyup'].value}"
+ onrowmousedown="#{richListBean.attributes['onrowmousedown'].value}"
+ onrowmousemove="#{richListBean.attributes['onrowmousemove'].value}"
+ onrowmouseout="#{richListBean.attributes['onrowmouseout'].value}"
+ onrowmouseover="#{richListBean.attributes['onrowmouseover'].value}"
+ onrowmouseup="#{richListBean.attributes['onrowmouseup'].value}"
relativeRowIndex="#{richListBean.attributes['relativeRowIndex'].value}"
rendered="#{richListBean.attributes['rendered'].value}"
rowAvailable="#{richListBean.attributes['rowAvailable'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richMenuGroup/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich"
- xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html">
+ xmlns:h="http://java.sun.com/jsf/html">
<!--
JBoss, Home of Professional Open Source
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -49,6 +49,7 @@
collapseEvent="#{richPanelMenuBean.attributes['collapseEvent'].value}"
data="#{richPanelMenuBean.attributes['data'].value}"
disabled="#{richPanelMenuBean.attributes['disabled'].value}"
+ disableImplicitRender="#{richPanelMenuBean.attributes['disableImplicitRender'].value}"
execute="#{richPanelMenuBean.attributes['execute'].value}"
expandEvent="#{richPanelMenuBean.attributes['expandEvent'].value}"
expandSingle="#{richPanelMenuBean.attributes['expandSingle'].value}"
@@ -70,7 +71,6 @@
itemIconLeft="#{richPanelMenuBean.attributes['topItemDisableIconLeft'].value}"
itemIconRight="#{richPanelMenuBean.attributes['topItemDisableIconRight'].value}"
itemMode="#{richPanelMenuBean.attributes['itemMode'].value}"
- limitToList="#{richPanelMenuBean.attributes['limitToList'].value}"
onclick="#{richPanelMenuBean.attributes['onclick'].value}"
ondblclick="#{richPanelMenuBean.attributes['ondblclick'].value}"
onmousedown="#{richPanelMenuBean.attributes['onmousedown'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/ajaxMode.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -44,7 +44,6 @@
data="#{richProgressBarBean.attributes['data'].value}"
enabled="#{richProgressBarBean.attributes['enabled'].value}"
finishClass="#{richProgressBarBean.attributes['finishClass'].value}"
- focus="#{richProgressBarBean.attributes['focus'].value}"
initialClass="#{richProgressBarBean.attributes['initialClass'].value}"
interval="#{richProgressBarBean.attributes['interval'].value}"
label="#{richProgressBarBean.attributes['label'].value}"
@@ -52,6 +51,7 @@
minValue="#{richProgressBarBean.attributes['minValue'].value}"
mode="ajax"
onbeforedomupdate="#{richProgressBarBean.attributes['onbeforedomupdate'].value}"
+ onbegin="#{richProgressBarBean.attributes['onbegin'].value}"
onclick="#{richProgressBarBean.attributes['onclick'].value}"
oncomplete="#{richProgressBarBean.attributes['oncomplete'].value}"
ondblclick="#{richProgressBarBean.attributes['ondblclick'].value}"
@@ -61,8 +61,6 @@
onmouseout="#{richProgressBarBean.attributes['onmouseout'].value}"
onmouseover="#{richProgressBarBean.attributes['onmouseover'].value}"
onmouseup="#{richProgressBarBean.attributes['onmouseup'].value}"
- onsubmit="#{richProgressBarBean.attributes['onsubmit'].value}"
- parameters="#{richProgressBarBean.attributes['parameters'].value}"
progressClass="#{richProgressBarBean.attributes['progressClass'].value}"
remainingClass="#{richProgressBarBean.attributes['remainingClass'].value}"
rendered="#{richProgressBarBean.attributes['rendered'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/clientMode.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -76,7 +76,6 @@
data="#{richProgressBarBean.attributes['data'].value}"
enabled="#{richProgressBarBean.attributes['enabled'].value}"
finishClass="#{richProgressBarBean.attributes['finishClass'].value}"
- focus="#{richProgressBarBean.attributes['focus'].value}"
initialClass="#{richProgressBarBean.attributes['initialClass'].value}"
interval="#{richProgressBarBean.attributes['interval'].value}"
label="#{richProgressBarBean.attributes['label'].value}"
@@ -84,6 +83,7 @@
minValue="#{richProgressBarBean.attributes['minValue'].value}"
mode="client"
onbeforedomupdate="#{richProgressBarBean.attributes['onbeforedomupdate'].value}"
+ onbegin="#{richProgressBarBean.attributes['onbegin'].value}"
onclick="#{richProgressBarBean.attributes['onclick'].value}"
onfinish="#{richProgressBarBean.attributes['onfinish'].value}"
oncomplete="#{richProgressBarBean.attributes['oncomplete'].value}"
@@ -93,8 +93,6 @@
onmouseout="#{richProgressBarBean.attributes['onmouseout'].value}"
onmouseover="#{richProgressBarBean.attributes['onmouseover'].value}"
onmouseup="#{richProgressBarBean.attributes['onmouseup'].value}"
- onsubmit="#{richProgressBarBean.attributes['onsubmit'].value}"
- parameters="#{richProgressBarBean.attributes['parameters'].value}"
progressClass="#{richProgressBarBean.attributes['progressClass'].value}"
remainingClass="#{richProgressBarBean.attributes['remainingClass'].value}"
rendered="#{richProgressBarBean.attributes['rendered'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richProgressBar/static.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -50,7 +50,6 @@
data="#{richProgressBarBean.attributes['data'].value}"
enabled="#{richProgressBarBean.attributes['enabled'].value}"
finishClass="#{richProgressBarBean.attributes['finishClass'].value}"
- focus="#{richProgressBarBean.attributes['focus'].value}"
initialClass="#{richProgressBarBean.attributes['initialClass'].value}"
interval="#{richProgressBarBean.attributes['interval'].value}"
label="#{richProgressBarBean.attributes['label'].value}"
@@ -58,6 +57,7 @@
minValue="#{richProgressBarBean.attributes['minValue'].value}"
mode="client"
onbeforedomupdate="#{richProgressBarBean.attributes['onbeforedomupdate'].value}"
+ onbegin="#{richProgressBarBean.attributes['onbegin'].value}"
onclick="#{richProgressBarBean.attributes['onclick'].value}"
oncomplete="#{richProgressBarBean.attributes['oncomplete'].value}"
ondblclick="#{richProgressBarBean.attributes['ondblclick'].value}"
@@ -67,8 +67,6 @@
onmouseout="#{richProgressBarBean.attributes['onmouseout'].value}"
onmouseover="#{richProgressBarBean.attributes['onmouseover'].value}"
onmouseup="#{richProgressBarBean.attributes['onmouseup'].value}"
- onsubmit="#{richProgressBarBean.attributes['onsubmit'].value}"
- parameters="#{richProgressBarBean.attributes['parameters'].value}"
progressClass="#{richProgressBarBean.attributes['progressClass'].value}"
remainingClass="#{richProgressBarBean.attributes['remainingClass'].value}"
rendered="#{richProgressBarBean.attributes['rendered'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSelect/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -41,8 +41,11 @@
<ui:define name="component">
<rich:select id="select"
+ changedStateClass="#{richSelectBean.attributes['changedStateClass'].value}"
converterMessage="#{richSelectBean.attributes['converterMessage'].value}"
defaultLabel="#{richSelectBean.attributes['defaultLabel'].value}"
+ disabledStateClass="#{richSelectBean.attributes['disabledStateClass'].value}"
+ editStateClass="#{richSelectBean.attributes['editStateClass'].value}"
enableManualInput="#{richSelectBean.attributes['enableManualInput'].value}"
immediate="#{richSelectBean.attributes['immediate'].value}"
itemClass="#{richSelectBean.attributes['itemClass'].value}"
@@ -72,7 +75,8 @@
onmouseout="#{richSelectBean.attributes['onmouseout'].value}"
onmouseover="#{richSelectBean.attributes['onmouseover'].value}"
onmouseup="#{richSelectBean.attributes['onmouseup'].value}"
- onselect="#{richSelectBean.attributes['onselect'].value}"
+ onselectitem="#{richSelectBean.attributes['onselectitem'].value}"
+ readyStateClass="#{richSelectBean.attributes['readyStateClass'].value}"
rendered="#{richSelectBean.attributes['rendered'].value}"
required="#{richSelectBean.attributes['required'].value}"
requiredMessage="#{richSelectBean.attributes['requiredMessage'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -46,6 +46,7 @@
cycledSwitching="#{richTabPanelBean.attributes['cycledSwitching'].value}"
data="#{richTabPanelBean.attributes['data'].value}"
dir="#{richTabPanelBean.attributes['dir'].value}"
+ disableImplicitRender="#{richTabPanelBean.attributes['disableImplicitRender'].value}"
execute="#{richTabPanelBean.attributes['execute'].value}"
firstItem="#{richTabPanelBean.attributes['firstItem'].value}"
headerAlignment="#{richTabPanelBean.attributes['headerAlignment'].value}"
@@ -55,7 +56,6 @@
itemChangeListener="#{richBean.itemChangeListener}"
lang="#{richTabPanelBean.attributes['lang'].value}"
lastItem="#{richTabPanelBean.attributes['lastItem'].value}"
- limitToList="#{richTabPanelBean.attributes['limitToList'].value}"
nextItem="#{richTabPanelBean.attributes['nextItem'].value}"
onbeforeitemchange="#{richTabPanelBean.attributes['onbeforeitemchange'].value}"
onclick="#{richTabPanelBean.attributes['onclick'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2010-12-14 12:57:42 UTC (rev 20551)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2010-12-14 13:22:23 UTC (rev 20552)
@@ -84,11 +84,11 @@
cycledSwitching="#{richTogglePanelBean.attributes['cycledSwitching'].value}"
data="#{richTogglePanelBean.attributes['data'].value}"
dir="#{richTogglePanelBean.attributes['dir'].value}"
+ disableImplicitRender="#{richTogglePanelBean.attributes['disableImplicitRender'].value}"
execute="#{richTogglePanelBean.attributes['execute'].value}"
immediate="#{richTogglePanelBean.attributes['immediate'].value}"
itemChangeListener="#{richBean.itemChangeListener}"
lang="#{richTogglePanelBean.attributes['lang'].value}"
- limitToList="#{richTogglePanelBean.attributes['limitToList'].value}"
onbeforeitemchange="#{richTogglePanelBean.attributes['onbeforeitemchange'].value}"
onclick="#{richTogglePanelBean.attributes['onclick'].value}"
ondblclick="#{richTogglePanelBean.attributes['ondblclick'].value}"
14 years, 1 month
JBoss Rich Faces SVN: r20551 - trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits@lists.jboss.org
Author: amarkhel
Date: 2010-12-14 07:57:42 -0500 (Tue, 14 Dec 2010)
New Revision: 20551
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRendererBase.java
Log:
https://issues.jboss.org/browse/RF-9999 Toolbar/toolbar group: page is broken in Chrome when using non-standard item separator.
Double class="rf-tb-sep" encoding is fixed.
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRendererBase.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRendererBase.java 2010-12-14 12:49:35 UTC (rev 20550)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRendererBase.java 2010-12-14 12:57:42 UTC (rev 20551)
@@ -229,8 +229,6 @@
writer.write(" ");
writer.endElement(HtmlConstants.DIV_ELEM);
} else {
- separatorClass = concatClasses(separatorClass, (String) component.getAttributes().get("separatorClass"));
- writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, separatorClass, null);
String uri = RenderKitUtils.getResourceURL(itemSeparator, context);
writer.startElement(HtmlConstants.IMG_ELEMENT, component);
14 years, 1 month
JBoss Rich Faces SVN: r20550 - trunk/ui/output/ui/src/main/templates.
by richfaces-svn-commits@lists.jboss.org
Author: amarkhel
Date: 2010-12-14 07:49:35 -0500 (Tue, 14 Dec 2010)
New Revision: 20550
Modified:
trunk/ui/output/ui/src/main/templates/toolbar.template.xml
Log:
RF-9969 Toolbar: attributes for event handlers ignored
Modified: trunk/ui/output/ui/src/main/templates/toolbar.template.xml
===================================================================
--- trunk/ui/output/ui/src/main/templates/toolbar.template.xml 2010-12-14 10:33:57 UTC (rev 20549)
+++ trunk/ui/output/ui/src/main/templates/toolbar.template.xml 2010-12-14 12:49:35 UTC (rev 20550)
@@ -18,6 +18,7 @@
height="#{component.attributes['height']}" class="rf-tb #{component.attributes['styleClass']}"
style="#{component.attributes['style']}"
cdk:passThroughWithExclusions="">
+ <cdk:call expression="encodeEventsAttributes(facesContext, component)" />
<tr class="rf-tb-cntr">
<cdk:body />
</tr>
14 years, 1 month
JBoss Rich Faces SVN: r20549 - trunk/ui/output/ui/src/main/resources/META-INF.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-12-14 05:33:57 -0500 (Tue, 14 Dec 2010)
New Revision: 20549
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
Log:
RF-9951: Taglib: panel menu missing attribute immediate
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-14 09:56:43 UTC (rev 20548)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-14 10:33:57 UTC (rev 20549)
@@ -1778,6 +1778,10 @@
<property-name>render</property-name>
<property-class>java.lang.Object</property-class>
</property>
+ <property>
+ <property-name>immediate</property-name>
+ <property-class>boolean</property-class>
+ </property>
</component>
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-14 09:56:43 UTC (rev 20548)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-14 10:33:57 UTC (rev 20549)
@@ -562,6 +562,11 @@
<name>onmouseup</name>
<type>java.lang.String</type>
</attribute>
+ <attribute>
+ <name>immediate</name>
+ <type>boolean</type>
+ </attribute>
+
</tag>
<tag>
<tag-name>tooltip</tag-name>
14 years, 1 month
JBoss Rich Faces SVN: r20548 - trunk/ui/output/ui/src/main/resources/META-INF.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-12-14 04:56:43 -0500 (Tue, 14 Dec 2010)
New Revision: 20548
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
Log:
RF-9926 Tab panel: attribute itemChangeListener ignored
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-14 09:31:06 UTC (rev 20547)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-14 09:56:43 UTC (rev 20548)
@@ -1576,10 +1576,6 @@
<property-class>javax.faces.el.MethodBinding</property-class>
</property>
<property>
- <property-name>actionExpression</property-name>
- <property-class>javax.el.MethodExpression</property-class>
- </property>
- <property>
<property-name>actionListener</property-name>
<property-class>javax.faces.el.MethodBinding</property-class>
</property>
@@ -1648,10 +1644,6 @@
<property-class>javax.faces.el.MethodBinding</property-class>
</property>
<property>
- <property-name>actionExpression</property-name>
- <property-class>javax.el.MethodExpression</property-class>
- </property>
- <property>
<property-name>actionListener</property-name>
<property-class>javax.faces.el.MethodBinding</property-class>
</property>
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-14 09:31:06 UTC (rev 20547)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-14 09:56:43 UTC (rev 20548)
@@ -31,12 +31,6 @@
<type>javax.faces.el.MethodBinding</type>
</attribute>
<attribute>
- <description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description>
- <display-name>Application Action</display-name>
- <name>actionExpression</name>
- <type>javax.el.MethodExpression</type>
- </attribute>
- <attribute>
<description><p> MethodExpression representing an action listener method that will be notified when this component is activated by the user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of void, <span class="changed_added_2_0">or to a public method that takes no arguments with a return type of void. In the latter case, the method has no way of easily knowing where the event came from, but this can be useful in cases where a notification is needed that "some action happened".</span> </p></description>
<display-name>Action Listener</display-name>
<name>actionListener</name>
@@ -193,12 +187,6 @@
<type>javax.faces.el.MethodBinding</type>
</attribute>
<attribute>
- <description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description>
- <display-name>Application Action</display-name>
- <name>actionExpression</name>
- <type>javax.el.MethodExpression</type>
- </attribute>
- <attribute>
<description><p> MethodExpression representing an action listener method that will be notified when this component is activated by the user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of void, <span class="changed_added_2_0">or to a public method that takes no arguments with a return type of void. In the latter case, the method has no way of easily knowing where the event came from, but this can be useful in cases where a notification is needed that "some action happened".</span> </p></description>
<display-name>Action Listener</display-name>
<name>actionListener</name>
14 years, 1 month