Fixed drag mode support for Tree

svn changeset:11449/svn branch:6.3_dd

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index 9926d2921af75f0a96882ca92d28080c9eaae5d9..dc6f914389f85cd8904a7566bbe72d1cfd5a9b8f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -67,7 +67,7 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler {
 
     private boolean rendering;
 
-    private int dragModes;
+    private int dragMode = 0;
 
     private VAbstractDropHandler dropHandler;
 
@@ -150,8 +150,10 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler {
 
         selectedIds = uidl.getStringArrayVariableAsSet("selected");
 
-        if (uidl.hasAttribute("dragModes")) {
-            dragModes = uidl.getIntAttribute("dragModes");
+        if (uidl.hasAttribute("dragMode")) {
+            dragMode = uidl.getIntAttribute("dragMode");
+        } else {
+            dragMode = 0;
         }
 
         rendering = false;
@@ -396,7 +398,7 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler {
                 showContextMenu(event);
             }
 
-            if (dragModes != 0 || dropHandler != null) {
+            if (dragMode != 0 || dropHandler != null) {
                 if (type == Event.ONMOUSEDOWN) {
                     if (nodeCaptionDiv.isOrHasChild(event.getTarget())) {
                         ApplicationConnection.getConsole().log(

diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java
index 22dd0a418224c67552caa41f2dc15c16ad8c083e..5e0e66fae5fb8d81ae48d58d8f28f0ea94ec49f1 100644 (file)
--- a/src/com/vaadin/ui/Tree.java
+++ b/src/com/vaadin/ui/Tree.java
@@ -111,12 +111,15 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      */
     private boolean initialPaint = true;
 
-    // TODO sort DD members and methods
-    public static int DRAG_SORTABLE = 1;
-    public static int DRAG_OUT = 2;
-    public static int DRAG_NONE = 0;
+    private DragMode dragMode = DragMode.NONE;
 
-    private int itemDragModes = DRAG_OUT;
+    /**
+     * Supported drag modes for Tree.
+     */
+    public enum DragMode {
+        NONE, NODES;
+
+    }
 
     class TreeTransferable extends DataBoundTransferable {
 
@@ -480,8 +483,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
                 target.addAttribute("nullselect", true);
             }
 
-            if (itemDragModes != 0) {
-                target.addAttribute("dragModes", itemDragModes);
+            if (dragMode != DragMode.NONE) {
+                target.addAttribute("dragMode", dragMode.ordinal());
             }
 
         }