diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-03-24 15:13:24 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-03-24 15:13:24 +0000 |
| commit | fa397b38e7de75b61dff5b9db0387c23be8c5f74 (patch) | |
| tree | 186c65d8f8b924bdaf7a4c0a309b9a59d5d8c170 /tests | |
| parent | 36bc8fe1ea5eba476e28f93e5742d8c15754eaa1 (diff) | |
| download | vaadin-framework-fa397b38e7de75b61dff5b9db0387c23be8c5f74.tar.gz vaadin-framework-fa397b38e7de75b61dff5b9db0387c23be8c5f74.zip | |
renaming criteria
svn changeset:12072/svn branch:6.3
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/vaadin/tests/dd/DDTest2.java | 6 | ||||
| -rw-r--r-- | tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java index 7efdf0b23d..45552d9c79 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest2.java +++ b/tests/src/com/vaadin/tests/dd/DDTest2.java @@ -15,8 +15,8 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.And; -import com.vaadin.event.dd.acceptcriteria.SourceIs; import com.vaadin.event.dd.acceptcriteria.Or; +import com.vaadin.event.dd.acceptcriteria.SourceIs; import com.vaadin.terminal.Resource; import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; @@ -28,7 +28,7 @@ import com.vaadin.ui.Window; import com.vaadin.ui.AbstractSelect.AbstractSelectDropTargetDetails; import com.vaadin.ui.AbstractSelect.AcceptItem; import com.vaadin.ui.Table.TableTransferable; -import com.vaadin.ui.Tree.OverFolderNode; +import com.vaadin.ui.Tree.TargetItemAllowsChildren; import com.vaadin.ui.Tree.TreeDragMode; public class DDTest2 extends TestBase { @@ -120,7 +120,7 @@ public class DDTest2 extends TestBase { */ table.setDragMode(Table.TableDragMode.ROW); - OverFolderNode onNode = new OverFolderNode(); + TargetItemAllowsChildren onNode = TargetItemAllowsChildren.get(); SourceIs fromTable = new SourceIs(table); SourceIs fromTree = new SourceIs(tree1); diff --git a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java index 4837934cad..2f2baa581c 100644 --- a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java +++ b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java @@ -10,7 +10,7 @@ import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.DropTargetDetails; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.And; -import com.vaadin.event.dd.acceptcriteria.DropTargetDetailEquals; +import com.vaadin.event.dd.acceptcriteria.TargetDetailIs; import com.vaadin.event.dd.acceptcriteria.IsSameSourceAndTarget; import com.vaadin.event.dd.acceptcriteria.Not; import com.vaadin.ui.Component; @@ -51,7 +51,7 @@ public class HorizontalLayoutSortableWithWrappers extends Window { } private DropHandler dh = new DropHandler() { - AcceptCriterion crit = new And(new DropTargetDetailEquals( + AcceptCriterion crit = new And(new TargetDetailIs( "horizontalLocation", "LEFT"), new Not(IsSameSourceAndTarget .get())); |