diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-06-20 17:38:17 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-06-20 17:38:17 +0300 |
| commit | d83a57c7facca417e4e92cacaa64ee9b6dbe4597 (patch) | |
| tree | 22d127d79edea56a6c20bdd43b6bc24bb008a1da /src/com/vaadin/ui/AbstractSelect.java | |
| parent | 93e9eaf7abfad12d200e9f1805630b7b04daf7e2 (diff) | |
| parent | 0f8f9d32e0584743c858afeec12e57dedf0a5f71 (diff) | |
| download | vaadin-framework-d83a57c7facca417e4e92cacaa64ee9b6dbe4597.tar.gz vaadin-framework-d83a57c7facca417e4e92cacaa64ee9b6dbe4597.zip | |
Merge branch 'master' into gwt
Diffstat (limited to 'src/com/vaadin/ui/AbstractSelect.java')
| -rw-r--r-- | src/com/vaadin/ui/AbstractSelect.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java index e586810b2d..6a927251af 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/src/com/vaadin/ui/AbstractSelect.java @@ -24,7 +24,6 @@ import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.TargetDetailsImpl; -import com.vaadin.event.dd.acceptcriteria.ClientCriterion; import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion; import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor; import com.vaadin.event.dd.acceptcriteria.TargetDetailIs; @@ -33,8 +32,6 @@ import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Resource; import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.gwt.client.ui.dd.VIsOverId; -import com.vaadin.terminal.gwt.client.ui.dd.VItemIdIs; import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; import com.vaadin.ui.AbstractSelect.ItemCaptionMode; @@ -1800,7 +1797,6 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @since 6.3 */ - @ClientCriterion(VIsOverId.class) public static class TargetItemIs extends AbstractItemSetCriterion { /** @@ -1867,7 +1863,6 @@ public abstract class AbstractSelect extends AbstractField<Object> implements * * @since 6.3 */ - @ClientCriterion(VItemIdIs.class) public static class AcceptItem extends AbstractItemSetCriterion { /** |