Don't try to cast a connector to Widget. Fixes #12619

author Jonatan Kronqvist <jonatan@vaadin.com>

Fri, 20 Sep 2013 12:32:12 +0000 (15:32 +0300)

committer Jonatan Kronqvist <jonatan@vaadin.com>

Fri, 20 Sep 2013 12:32:12 +0000 (15:32 +0300)
author Jonatan Kronqvist <jonatan@vaadin.com>
Fri, 20 Sep 2013 12:32:12 +0000 (15:32 +0300)
committer Jonatan Kronqvist <jonatan@vaadin.com>
Fri, 20 Sep 2013 12:32:12 +0000 (15:32 +0300)
diff --git a/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java b/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java

index e9061114aa356d5b6a7d6e151d815e117a6f0549..c3f56b410d534d29756bee2473024b5f9df04612 100644 (file)
--- a/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
+++ b/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
@@ -32,7 +32,7 @@ final public class VTargetInSubtree extends VAcceptCriterion {
      protected boolean accept(VDragEvent drag, UIDL configuration) {
  
          VTree tree = (VTree) VDragAndDropManager.get().getCurrentDropHandler()
-                .getConnector();
+                .getConnector().getWidget();
          TreeNode treeNode = tree.getNodeByKey((String) drag.getDropDetails()
                  .get("itemIdOver"));
          if (treeNode != null) {
@@ -53,4 +53,4 @@ final public class VTargetInSubtree extends VAcceptCriterion {
  
          return false;
      }
-}
-\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html b/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html

new file mode 100644 (file)

index 0000000..844636c
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <link rel="selenium.base" href="http://localhost:8888/"/>
+    <title>DnDOnSubtree</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+    <thead>
+    <tr>
+        <td rowspan="1" colspan="3">New Test</td>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td>open</td>
+        <td>/run/com.vaadin.tests.dd.DDTest8?restartApplication</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>drag</td>
+        <td>vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[3]</td>
+        <td>11,8</td>
+    </tr>
+    <!-- Drop on Bar5, which is a subtree target -->
+    <tr>
+        <td>drop</td>
+        <td>vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[6]</td>
+        <td>34,9</td>
+    </tr>
+    <tr>
+        <td>mouseClick</td>
+        <td>
+            vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[5]/expand
+        </td>
+        <td>10,8</td>
+    </tr>
+    <!-- Assert that the dragged & dropped node is now a child of Bar5 -->
+    <tr>
+        <td>assertElementPresent</td>
+        <td>
+            vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[5]/n[0]
+        </td>
+        <td></td>
+    </tr>
+    </tbody>
+</table>
+</body>
+</html>
author	Jonatan Kronqvist <jonatan@vaadin.com>
	Fri, 20 Sep 2013 12:32:12 +0000 (15:32 +0300)
committer	Jonatan Kronqvist <jonatan@vaadin.com>
	Fri, 20 Sep 2013 12:32:12 +0000 (15:32 +0300)
client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java		patch \| blob \| history
uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html	[new file with mode: 0644]	patch \| blob