Author: nbelaevski Date: 2008-11-21 17:17:26 -0500 (Fri, 21 Nov 2008) New Revision: 11300 Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java Log: https://jira.jboss.org/jira/browse/RF-4960 Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent 2008-11-21 19:55:04 UTC (rev 11299) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent 2008-11-21 22:17:26 UTC (rev 11300) @@ -101,6 +101,10 @@ <classname>int</classname> <description>Response waiting time on a particular request. If a response is not received during this time, the request is aborted</description> </property> + <property> + <name>similarityGroupingId</name> + <classname>java.lang.String</classname> + </property> <!-- <property > <name></name> Modified: trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java 2008-11-21 19:55:04 UTC (rev 11299) +++ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java 2008-11-21 22:17:26 UTC (rev 11300) @@ -216,4 +216,14 @@ */ public abstract String getFocus(); + /** + * + */ + public abstract void setSimilarityGroupingId(String similarityGroupingId); + + /** + * + */ + public abstract String getSimilarityGroupingId(); + } \ No newline at end of file Modified: trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java =================================================================== --- trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2008-11-21 19:55:04 UTC (rev 11299) +++ trunk/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2008-11-21 22:17:26 UTC (rev 11300) @@ -167,6 +167,10 @@ public abstract void setRequestDelay(int requestDelay); + public abstract String getSimilarityGroupingId(); + + public abstract void setSimilarityGroupingId(String similarityGroupingId); + public abstract String getTableStyleClass(); public abstract void setTableStyleClass(String tableStyleClass); Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java =================================================================== --- trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java 2008-11-21 19:55:04 UTC (rev 11299) +++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java 2008-11-21 22:17:26 UTC (rev 11300) @@ -248,6 +248,13 @@ public void setRequestDelay(int newvalue) { } + public String getSimilarityGroupingId() { + return null; + } + + public void setSimilarityGroupingId(String similarityGroupingId) { + } + public int getTimeout() { return 0; } Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2008-11-21 19:55:04 UTC (rev 11299) +++ trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2008-11-21 22:17:26 UTC (rev 11300) @@ -802,6 +802,10 @@ public abstract void setAdviseNodeSelected(MethodBinding adviseNodeSelected); + public abstract String getSimilarityGroupingId(); + + public abstract void setSimilarityGroupingId(String similarityGroupingId); + public void addChangeExpandListener(NodeExpandedListener listener) { addFacesListener(listener); } Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2008-11-21 19:55:04 UTC (rev 11299) +++ trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2008-11-21 22:17:26 UTC (rev 11300) @@ -61,6 +61,7 @@ private Object reRender = null; private String status = null; private String eventsQueue = null; + private String similarityGroupingId = null; private int requestDelay = Integer.MIN_VALUE; private String oncomplete = null; private String focus = null; @@ -346,7 +347,7 @@ } public Object saveState(FacesContext context) { - Object[] state = new Object[16]; + Object[] state = new Object[17]; state[0] = super.saveState(context); state[1] = this.dragType; state[2] = this.acceptedTypes; @@ -363,6 +364,7 @@ state[13] = this.data; state[14] = new Boolean(this.ignoreDupResponses); state[15] = new Integer(this.timeout); + state[16] = this.similarityGroupingId; return state; } @@ -385,6 +387,7 @@ this.data = _state[13]; this.ignoreDupResponses = ((Boolean)_state[14]).booleanValue(); this.timeout = ((Integer)_state[15]).intValue(); + this.similarityGroupingId = (String) _state[16]; } public void setDragIndicator(String dragIndicator) { @@ -710,6 +713,32 @@ } /** + * @param similarityGroupingId - new value + */ + public void setSimilarityGroupingId(String __similarityGroupingId) { + this.similarityGroupingId = __similarityGroupingId; + } + + /** + * @return similarityGroupingId value from local variable or value bindings + */ + public String getSimilarityGroupingId() { + if (null != this.similarityGroupingId) { + return this.similarityGroupingId; + } + ValueBinding vb = getValueBinding("similarityGroupingId"); + if (null != vb) { + return (String) vb.getValue(getFacesContext()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.getSimilarityGroupingId(); + } + return null; + } + } + + /** * Attribute defines the time (in ms.) that the request will be wait in the queue before it is ready to send. When the delay time is over, the request will be sent to the server or removed if the newest 'similar' request is in a queue already * Setter for requestDelay