9:44 a.m.
Author: nbelaevski
Date: 2007-08-20 10:44:39 -0400 (Mon, 20 Aug 2007)
New Revision: 2345
Modified:
trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java
trunk/samples/tree-demo/src/main/webapp/pages/index.jsp
trunk/ui/tree/src/main/config/component/tree.xml
trunk/ui/tree/src/main/config/component/treeNode.xml
trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
trunk/ui/tree/src/main/templates/htmlTree.jspx
Log:
http://jira.jboss.com/jira/browse/RF-630 fixed, test app updated
Modified: trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java
===================================================================
--- trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java 2007-08-20 14:44:09 UTC
(rev 2344)
+++ trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java 2007-08-20 14:44:39 UTC
(rev 2345)
@@ -29,6 +29,7 @@
import java.util.Set;
import javax.faces.FacesException;
+import javax.faces.application.Application;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.event.FacesEvent;
@@ -67,7 +68,13 @@
private String icon = null;
private String styleClass = "treeIcon16";
+
+ private static final byte MODE_DEFAULT = 1;
+ private static final byte MODE_LITERAL = 2;
+ private static final byte MODE_EL = 3;
+ private byte dndValueMode = MODE_DEFAULT;
+
private boolean renderFacets = false;
private String pathToExpand;
@@ -299,8 +306,14 @@
System.out.println(dropEvent);
System.out.println("DragValue: " + dropEvent.getDragValue());
System.out.println("DropValue: " + dropEvent.getDropValue());
- System.out.println("Drag row data: " +
getTree(dropEvent).getRowData(dropEvent.getDragValue()));
- System.out.println("Drop row data: " +
getTree(dropEvent).getRowData(dropEvent.getDropValue()));
+ if (dropEvent.getDragValue() instanceof TreeRowKey) {
+ System.out.println("Drag row data: " +
getTree(dropEvent).getRowData(dropEvent.getDragValue()));
+ }
+
+ if (dropEvent.getDropValue() instanceof TreeRowKey) {
+ System.out.println("Drop row data: " +
getTree(dropEvent).getRowData(dropEvent.getDropValue()));
+ }
+
System.out.println("+++++");
}
@@ -381,4 +394,39 @@
public void setRenderFacets(boolean renderFacets) {
this.renderFacets = renderFacets;
}
+
+ public byte getDndValueMode() {
+ return dndValueMode;
+ }
+
+ public void setDndValueMode(byte dndValueMode) {
+ this.dndValueMode = dndValueMode;
+ switch (dndValueMode) {
+ case MODE_DEFAULT:
+ this.tree.setValueBinding("dragValue", null);
+ this.tree.setValueBinding("dropValue", null);
+ this.tree.setDragValue(null);
+ this.tree.setDropValue(null);
+ break;
+
+ case MODE_LITERAL:
+ this.tree.setValueBinding("dragValue", null);
+ this.tree.setValueBinding("dropValue", null);
+ this.tree.setDragValue("dragValue");
+ this.tree.setDropValue("dropValue");
+ break;
+
+ case MODE_EL:
+ FacesContext context = FacesContext.getCurrentInstance();
+ Application application = context.getApplication();
+ this.tree.setValueBinding("dragValue",
application.createValueBinding("#{data.name}"));
+ this.tree.setValueBinding("dropValue",
application.createValueBinding("#{data.name}"));
+ this.tree.setDragValue(null);
+ this.tree.setDropValue(null);
+ break;
+
+ default:
+ break;
+ }
+ }
}
\ No newline at end of file
Modified: trunk/samples/tree-demo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/tree-demo/src/main/webapp/pages/index.jsp 2007-08-20 14:44:09 UTC (rev
2344)
+++ trunk/samples/tree-demo/src/main/webapp/pages/index.jsp 2007-08-20 14:44:39 UTC (rev
2345)
@@ -87,6 +87,13 @@
<f:selectItem itemLabel="32x32" itemValue="treeIcon32" />
</h:selectOneRadio>
+ <h:outputText value="DnD value:" />
+ <h:selectOneRadio value="#{bean.dndValueMode}"
onclick="submit()">
+ <f:selectItem itemLabel="default" itemValue="#{1}" />
+ <f:selectItem itemLabel="literal" itemValue="#{2}" />
+ <f:selectItem itemLabel="el" itemValue="#{3}" />
+ </h:selectOneRadio>
+
<h:outputText value="Drag is: #{bean.dragOn ? 'on' :
'off'}" />
<br />
<h:commandButton value="#{bean.commandButtonCaption}"
Modified: trunk/ui/tree/src/main/config/component/tree.xml
===================================================================
--- trunk/ui/tree/src/main/config/component/tree.xml 2007-08-20 14:44:09 UTC (rev 2344)
+++ trunk/ui/tree/src/main/config/component/tree.xml 2007-08-20 14:44:39 UTC (rev 2345)
@@ -189,12 +189,16 @@
</property>
- <property hidden="true">
+ <property>
<name>dragValue</name>
+ <classname>java.lang.Object</classname>
+ <defaultvalue>getRowKey()</defaultvalue>
</property>
- <property hidden="true">
+ <property>
<name>dropValue</name>
+ <classname>java.lang.Object</classname>
+ <defaultvalue>getRowKey()</defaultvalue>
</property>
<property>
Modified: trunk/ui/tree/src/main/config/component/treeNode.xml
===================================================================
--- trunk/ui/tree/src/main/config/component/treeNode.xml 2007-08-20 14:44:09 UTC (rev
2344)
+++ trunk/ui/tree/src/main/config/component/treeNode.xml 2007-08-20 14:44:39 UTC (rev
2345)
@@ -100,12 +100,16 @@
</property>
&commonTreeClientListeners;
- <property hidden="true">
+ <property>
<name>dragValue</name>
+ <classname>java.lang.Object</classname>
+ <defaultvalue>getUITree().getDragValue()</defaultvalue>
</property>
- <property hidden="true">
+ <property>
<name>dropValue</name>
+ <classname>java.lang.Object</classname>
+ <defaultvalue>getUITree().getDropValue()</defaultvalue>
</property>
&html_events;
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-08-20 14:44:09
UTC (rev 2344)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-08-20 14:44:39
UTC (rev 2345)
@@ -675,14 +675,6 @@
return (NodeSelectedListener[]) getFacesListeners(NodeSelectedListener.class);
}
- public Object getDragValue() {
- return getRowKey();
- }
-
- public Object getDropValue() {
- return getRowKey();
- }
-
public void addDropListener(DropListener listener) {
addFacesListener(listener);
}
@@ -707,16 +699,6 @@
removeFacesListener(listener);
}
- public void setDragValue(Object value) {
- // TODO Auto-generated method stub
-
- }
-
- public void setDropValue(Object o) {
- // TODO Auto-generated method stub
-
- }
-
/**
* Return the data object representing the node data for the contextual row key
*
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-08-20
14:44:09 UTC (rev 2344)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-08-20
14:44:39 UTC (rev 2345)
@@ -207,24 +207,6 @@
return map;
}
- public Object getDragValue() {
- return getUITree().getDragValue();
- }
-
- public void setDragValue(Object value) {
- // TODO Auto-generated method stub
-
- }
-
- public Object getDropValue() {
- return getUITree().getDropValue();
- }
-
- public void setDropValue(Object o) {
- // TODO Auto-generated method stub
-
- }
-
public void setAcceptedTypes(Object types) {
this.acceptedTypes = types;
}
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-08-20
14:44:09 UTC (rev 2344)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-08-20
14:44:39 UTC (rev 2345)
@@ -322,20 +322,4 @@
mergeScriptOptions(options, context, component, Dropzone.class);
return ScriptUtils.toScript(options);
}
-
- public void contributorDecodeCallback(UIComponent component,
- FacesContext context, RendererContributor contributor,
- Object argument) {
- super.contributorDecodeCallback(component, context, contributor,
- argument);
-
- if (Draggable.class.isAssignableFrom(contributor.getAcceptableClass())) {
- UITreeNode treeNode = (UITreeNode) component;
- treeNode.setDragValue(treeNode.getUITree().getRowKey());
- } else if (Dropzone.class.isAssignableFrom(contributor
- .getAcceptableClass())) {
- UITreeNode treeNode = (UITreeNode) component;
- treeNode.setDropValue(treeNode.getUITree().getRowKey());
- }
- }
}
Modified: trunk/ui/tree/src/main/templates/htmlTree.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-08-20 14:44:09 UTC (rev 2344)
+++ trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-08-20 14:44:39 UTC (rev 2345)
@@ -44,15 +44,6 @@
<f:parameter value="id,style,class"/>
</f:call>
- <!-- table width="100%" cellpadding="0" cellspacing="0"
border="0">
- <tbody>
- <vcp:body />
- </tbody>
- </table-->
- <!-- div id="#{clientId}:children">
- <vcp:body />
- </div -->
-
<vcp:body />
<f:call name="encodeSelectionStateInput" />