Author: nbelaevski
Date: 2010-11-01 10:34:47 -0400 (Mon, 01 Nov 2010)
New Revision: 19833
Modified:
trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java
trunk/examples/iteration-demo/src/main/webapp/tree.xhtml
Log:
https://jira.jboss.org/browse/RF-9315
- removed selection interface
- renamed toggleMode/selectionMode attributes
Modified: trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java
===================================================================
---
trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java 2010-11-01
14:33:47 UTC (rev 19832)
+++
trunk/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java 2010-11-01
14:34:47 UTC (rev 19833)
@@ -22,6 +22,7 @@
package org.richfaces.demo;
import java.io.Serializable;
+import java.util.Collection;
import java.util.List;
import javax.annotation.PostConstruct;
@@ -31,7 +32,6 @@
import javax.faces.context.FacesContext;
import javax.swing.tree.TreeNode;
-import org.richfaces.component.Selection;
import org.richfaces.component.SwitchType;
import org.richfaces.log.LogFactory;
import org.richfaces.log.Logger;
@@ -50,13 +50,13 @@
private List<TreeNode> rootNodes;
- private SwitchType toggleMode = SwitchType.DEFAULT;
+ private SwitchType toggleType = SwitchType.DEFAULT;
- private SwitchType selectionMode = SwitchType.client;
+ private SwitchType selectionType = SwitchType.client;
private Object nodeData;
- private Selection selection;
+ private Collection<Object> selection;
@PostConstruct
public void init() {
@@ -73,24 +73,24 @@
return rootNodes;
}
- public SwitchType[] getModes() {
+ public SwitchType[] getTypes() {
return SwitchType.values();
}
- public SwitchType getToggleMode() {
- return toggleMode;
+ public SwitchType getToggleType() {
+ return toggleType;
}
- public void setToggleMode(SwitchType switchType) {
- this.toggleMode = switchType;
+ public void setToggleType(SwitchType switchType) {
+ this.toggleType = switchType;
}
- public SwitchType getSelectionMode() {
- return selectionMode;
+ public SwitchType getSelectionType() {
+ return selectionType;
}
- public void setSelectionMode(SwitchType selectionMode) {
- this.selectionMode = selectionMode;
+ public void setSelectionType(SwitchType selectionMode) {
+ this.selectionType = selectionMode;
}
public Object getNodeData() {
@@ -101,11 +101,11 @@
this.nodeData = nodeData;
}
- public Selection getSelection() {
+ public Collection<Object> getSelection() {
return selection;
}
- public void setSelection(Selection selection) {
+ public void setSelection(Collection<Object> selection) {
this.selection = selection;
}
Modified: trunk/examples/iteration-demo/src/main/webapp/tree.xhtml
===================================================================
--- trunk/examples/iteration-demo/src/main/webapp/tree.xhtml 2010-11-01 14:33:47 UTC (rev
19832)
+++ trunk/examples/iteration-demo/src/main/webapp/tree.xhtml 2010-11-01 14:34:47 UTC (rev
19833)
@@ -14,17 +14,17 @@
<h:messages id="messages" />
<h:form>
- Toggle mode: <h:selectOneRadio value="#{treeBean.toggleMode}"
onclick="submit()">
- <f:selectItems value="#{treeBean.modes}" var="item"
itemValue="#{item}" />
+ Toggle mode: <h:selectOneRadio value="#{treeBean.toggleType}"
onclick="submit()">
+ <f:selectItems value="#{treeBean.types}" var="item"
itemValue="#{item}" />
</h:selectOneRadio>
- Selection mode: <h:selectOneRadio value="#{treeBean.selectionMode}"
onclick="submit()">
- <f:selectItems value="#{treeBean.modes}" itemDisabled="#{item ==
'server'}" var="item" itemValue="#{item}" />
+ Selection mode: <h:selectOneRadio value="#{treeBean.selectionType}"
onclick="submit()">
+ <f:selectItems value="#{treeBean.types}" itemDisabled="#{item ==
'server'}" var="item" itemValue="#{item}" />
</h:selectOneRadio>
</h:form>
<h:form id="form">
- <it:tree id="tree" var="node"
value="#{treeBean.rootNodes}"
selectionMode="#{treeBean.selectionMode}"
toggleMode="#{treeBean.toggleMode}">
+ <it:tree id="tree" var="node"
value="#{treeBean.rootNodes}"
selectionType="#{treeBean.selectionType}"
toggleType="#{treeBean.toggleType}">
<it:treeNode>
<h:panelGroup id="group">
#{node.data} -