DD related refactorings and javadocs

svn changeset:11960/svn branch:6.3

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 5940046acf4351f6dbfb2fbf7d99251a9bfeb747..facf31d66fc55528c199dd683e044c1db9a335b6 100644 (file)
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -70,8 +70,16 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Modes that Table support as drag sourse.
      */
-    public enum DragModes {
-        NONE, ROWS
+    public enum TableDragMode {
+        /**
+         * Table does not start drag and drop events. HTM5 style events started
+         * by browser may still happen.
+         */
+        NONE,
+        /**
+         * Table starts drag from rows.
+         */
+        ROWS
     }
 
     private static final int CELL_KEY = 0;
@@ -345,7 +353,7 @@ public class Table extends AbstractSelect implements Action.Container,
 
     private double cacheRate = CACHE_RATE_DEFAULT;
 
-    private DragModes dragMode = DragModes.NONE;
+    private TableDragMode dragMode = TableDragMode.NONE;
 
     private DropHandler dropHandler;
 
@@ -2040,7 +2048,7 @@ public class Table extends AbstractSelect implements Action.Container,
             target.addAttribute("tabindex", getTabIndex());
         }
 
-        if (dragMode != DragModes.NONE) {
+        if (dragMode != TableDragMode.NONE) {
             target.addAttribute("dragmode", dragMode.ordinal());
         }
 
@@ -3335,11 +3343,25 @@ public class Table extends AbstractSelect implements Action.Container,
         }
     }
 
-    public void setDragMode(DragModes newDragMode) {
+    /**
+     * Sets the drag start mode of the Table. Drag start mode controls how Table
+     * behaves as a drag source.
+     * 
+     * @param newDragMode
+     */
+    public void setDragMode(TableDragMode newDragMode) {
         dragMode = newDragMode;
         requestRepaint();
     }
 
+    /**
+     * @return the current start mode of the Table. Drag start mode controls how
+     *         Table behaves as a drag source.
+     */
+    public TableDragMode getDragMode() {
+        return dragMode;
+    }
+
     /**
      * Concrete implementation of {@link DataBoundTransferable} for data
      * transferred from a table.

diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java
index de6f86e5883f357628675b253460d7cfc3ce7e77..3ca5819833360165a3082cd793ea72a8366a4a36 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest1.java
@@ -21,7 +21,7 @@ import com.vaadin.ui.Layout;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Tree;
-import com.vaadin.ui.Table.DragModes;
+import com.vaadin.ui.Table.TableDragMode;
 import com.vaadin.ui.Tree.TreeDragMode;
 import com.vaadin.ui.Tree.TreeDropTargetDetails;
 
@@ -237,7 +237,7 @@ public class DDTest1 extends TestBase {
         ta.addContainerProperty("Bars", String.class, "Bar");
         ta.setRowHeaderMode(Table.ROW_HEADER_MODE_ID);
         ta.setSizeFull();
-        ta.setDragMode(DragModes.ROWS);
+        ta.setDragMode(TableDragMode.ROWS);
 
         main.addComponent(pane1);
         main.addComponent(pane2);

diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java
index 0f777b1214fde34d4c8ea8b74b347a4e52505893..868d2486de499bd8251bba19c3f833e8efc5fc69 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest2.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest2.java
@@ -118,7 +118,7 @@ public class DDTest2 extends TestBase {
         /*
          * Make table rows draggable
          */
-        table.setDragMode(Table.DragModes.ROWS);
+        table.setDragMode(Table.TableDragMode.ROWS);
 
         OverFolderNode onNode = new OverFolderNode();
         DragSourceIs fromTable = new DragSourceIs(table);

diff --git a/tests/src/com/vaadin/tests/dd/DDTest4.java b/tests/src/com/vaadin/tests/dd/DDTest4.java
index f10d7b7c391e9737cef662dc8ae36a0920a1db1a..bc32ffe2aeacab9834b8f56296e55d8ef2540495 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest4.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest4.java
@@ -59,7 +59,7 @@ public class DDTest4 extends TestBase {
         /*
          * Make table rows draggable
          */
-        table.setDragMode(Table.DragModes.ROWS);
+        table.setDragMode(Table.TableDragMode.ROWS);
 
         table.setDropHandler(new DropHandler() {
             // accept only drags from this table