diff options
35 files changed, 69 insertions, 68 deletions
diff --git a/src/com/vaadin/event/dd/DragAndDropEvent.java b/src/com/vaadin/event/dd/DragAndDropEvent.java index 5fbdeefe51..01817200f9 100644 --- a/src/com/vaadin/event/dd/DragAndDropEvent.java +++ b/src/com/vaadin/event/dd/DragAndDropEvent.java @@ -6,7 +6,7 @@ package com.vaadin.event.dd; import java.io.Serializable; import com.vaadin.event.Transferable; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; /** * DragAndDropEvent wraps information related to drag and drop operation. It is diff --git a/src/com/vaadin/event/dd/DragSource.java b/src/com/vaadin/event/dd/DragSource.java index 3635bf5468..ea58f48952 100644 --- a/src/com/vaadin/event/dd/DragSource.java +++ b/src/com/vaadin/event/dd/DragSource.java @@ -6,7 +6,7 @@ package com.vaadin.event.dd; import java.util.Map; import com.vaadin.event.Transferable; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.ui.Component; import com.vaadin.ui.Tree; diff --git a/src/com/vaadin/event/dd/DropHandler.java b/src/com/vaadin/event/dd/DropHandler.java index c1c720ae2c..c9a28b5343 100644 --- a/src/com/vaadin/event/dd/DropHandler.java +++ b/src/com/vaadin/event/dd/DropHandler.java @@ -5,9 +5,10 @@ package com.vaadin.event.dd; import java.io.Serializable; -import com.vaadin.event.dd.acceptCriteria.AcceptAll; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; -import com.vaadin.event.dd.acceptCriteria.ServerSideCriterion; +import com.vaadin.event.Transferable; +import com.vaadin.event.dd.acceptcriteria.AcceptAll; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; /** * DropHandlers contain the actual business logic for drag and drop operations. diff --git a/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java b/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java index 3916d8e7e6..b4199b5924 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java +++ b/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java @@ -4,7 +4,7 @@ /** * */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.terminal.gwt.client.ui.dd.VAcceptAll; diff --git a/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java b/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java index 5c2ec6a4a8..a2b631de56 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java +++ b/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java @@ -4,7 +4,7 @@ /** * */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import java.io.Serializable; diff --git a/src/com/vaadin/event/dd/acceptcriteria/And.java b/src/com/vaadin/event/dd/acceptcriteria/And.java index 3db317c213..90240ac2ed 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/And.java +++ b/src/com/vaadin/event/dd/acceptcriteria/And.java @@ -4,7 +4,7 @@ /** * */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.terminal.PaintException; diff --git a/src/com/vaadin/event/dd/acceptcriteria/ClientCriterion.java b/src/com/vaadin/event/dd/acceptcriteria/ClientCriterion.java index 465637afe7..1592820ad6 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ClientCriterion.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ClientCriterion.java @@ -1,7 +1,7 @@ /* @ITMillApache2LicenseForJavaFiles@ */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java b/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java index e98e3c2719..11e642bf23 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java @@ -1,7 +1,7 @@ /* @ITMillApache2LicenseForJavaFiles@ */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import java.io.Serializable; diff --git a/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java b/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java index 806a3b5d2d..69aa033262 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java @@ -4,7 +4,7 @@ /** * */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; diff --git a/src/com/vaadin/event/dd/acceptcriteria/DragSourceIs.java b/src/com/vaadin/event/dd/acceptcriteria/DragSourceIs.java index 218133815c..cd549110ca 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/DragSourceIs.java +++ b/src/com/vaadin/event/dd/acceptcriteria/DragSourceIs.java @@ -4,7 +4,7 @@ /** * */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.TransferableImpl; import com.vaadin.event.dd.DragAndDropEvent; diff --git a/src/com/vaadin/event/dd/acceptcriteria/DropTargetDetailEquals.java b/src/com/vaadin/event/dd/acceptcriteria/DropTargetDetailEquals.java index a2b24533b3..ceb98bbcee 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/DropTargetDetailEquals.java +++ b/src/com/vaadin/event/dd/acceptcriteria/DropTargetDetailEquals.java @@ -4,7 +4,7 @@ /** * */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropTargetDetails; diff --git a/src/com/vaadin/event/dd/acceptcriteria/IsDataBound.java b/src/com/vaadin/event/dd/acceptcriteria/IsDataBound.java index 8615d207ca..6b7121e493 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/IsDataBound.java +++ b/src/com/vaadin/event/dd/acceptcriteria/IsDataBound.java @@ -4,7 +4,7 @@ /** * */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import com.vaadin.data.Container; import com.vaadin.data.Item; diff --git a/src/com/vaadin/event/dd/acceptcriteria/IsSameSourceAndTarget.java b/src/com/vaadin/event/dd/acceptcriteria/IsSameSourceAndTarget.java index 2637d27a0b..ac522da999 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/IsSameSourceAndTarget.java +++ b/src/com/vaadin/event/dd/acceptcriteria/IsSameSourceAndTarget.java @@ -4,7 +4,7 @@ /** * */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.Transferable; import com.vaadin.event.TransferableImpl; diff --git a/src/com/vaadin/event/dd/acceptcriteria/Not.java b/src/com/vaadin/event/dd/acceptcriteria/Not.java index 874016c9b7..94a6e83ec4 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/Not.java +++ b/src/com/vaadin/event/dd/acceptcriteria/Not.java @@ -4,7 +4,7 @@ /** * */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.terminal.PaintException; diff --git a/src/com/vaadin/event/dd/acceptcriteria/Or.java b/src/com/vaadin/event/dd/acceptcriteria/Or.java index 41aef10738..3ccdff4854 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/Or.java +++ b/src/com/vaadin/event/dd/acceptcriteria/Or.java @@ -4,7 +4,7 @@ /** * */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.terminal.PaintException; diff --git a/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java b/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java index 69405db8ed..2ff65bfd31 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java @@ -1,7 +1,7 @@ /* @ITMillApache2LicenseForJavaFiles@ */ -package com.vaadin.event.dd.acceptCriteria; +package com.vaadin.event.dd.acceptcriteria; import java.io.Serializable; diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java index 02d2f4ac34..cea6944944 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java @@ -8,7 +8,7 @@ import java.util.Iterator; import com.google.gwt.user.client.Command; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DropTarget; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java index 8c75269860..3c17cb0b32 100644 --- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java +++ b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java @@ -14,7 +14,7 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.DropTargetDetails; import com.vaadin.event.dd.DropTargetDetailsImpl; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.VariableOwner; import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager.DragEventType; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java index e9a463c0bc..08712a61f5 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java @@ -16,8 +16,8 @@ import com.google.gwt.core.ext.typeinfo.JClassType; import com.google.gwt.core.ext.typeinfo.TypeOracle; import com.google.gwt.user.rebind.ClassSourceFileComposerFactory; import com.google.gwt.user.rebind.SourceWriter; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; -import com.vaadin.event.dd.acceptCriteria.ClientCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.ClientCriterion; import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion; import com.vaadin.ui.ClientWidget; diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java index e75a0445bc..2b5ea6aa90 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java @@ -29,8 +29,8 @@ import java.util.jar.Manifest; import java.util.logging.Level; import java.util.logging.Logger; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; -import com.vaadin.event.dd.acceptCriteria.ClientCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.ClientCriterion; import com.vaadin.terminal.Paintable; import com.vaadin.ui.ClientWidget; diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java index 4a13c191f1..550cf3913e 100644 --- a/src/com/vaadin/ui/AbstractSelect.java +++ b/src/com/vaadin/ui/AbstractSelect.java @@ -23,8 +23,8 @@ import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.DropTargetDetailsImpl; -import com.vaadin.event.dd.acceptCriteria.ClientCriterion; -import com.vaadin.event.dd.acceptCriteria.ClientSideCriterion; +import com.vaadin.event.dd.acceptcriteria.ClientCriterion; +import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion; import com.vaadin.terminal.KeyMapper; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java index d50d0dcf2c..dbd778c7aa 100644 --- a/src/com/vaadin/ui/Table.java +++ b/src/com/vaadin/ui/Table.java @@ -32,8 +32,8 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DragSource; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; -import com.vaadin.event.dd.acceptCriteria.ClientCriterion; -import com.vaadin.event.dd.acceptCriteria.ServerSideCriterion; +import com.vaadin.event.dd.acceptcriteria.ClientCriterion; +import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; import com.vaadin.terminal.KeyMapper; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; @@ -3446,7 +3446,7 @@ public class Table extends AbstractSelect implements Action.Container, * (non-Javadoc) * * @see - * com.vaadin.event.dd.acceptCriteria.ServerSideCriterion#getIdentifier + * com.vaadin.event.dd.acceptcriteria.ServerSideCriterion#getIdentifier * () */ @Override @@ -3458,7 +3458,7 @@ public class Table extends AbstractSelect implements Action.Container, * (non-Javadoc) * * @see - * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#accepts(com.vaadin + * com.vaadin.event.dd.acceptcriteria.AcceptCriterion#accepts(com.vaadin * .event.dd.DragAndDropEvent) */ public boolean accept(DragAndDropEvent dragEvent) { @@ -3482,7 +3482,7 @@ public class Table extends AbstractSelect implements Action.Container, * (non-Javadoc) * * @see - * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#paintResponse( + * com.vaadin.event.dd.acceptcriteria.AcceptCriterion#paintResponse( * com.vaadin.terminal.PaintTarget) */ @Override diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java index 0b1ee9b104..2ce6fe2341 100644 --- a/src/com/vaadin/ui/Tree.java +++ b/src/com/vaadin/ui/Tree.java @@ -33,10 +33,10 @@ import com.vaadin.event.dd.DragSource; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.DropTargetDetails; -import com.vaadin.event.dd.acceptCriteria.ClientCriterion; -import com.vaadin.event.dd.acceptCriteria.ClientSideCriterion; -import com.vaadin.event.dd.acceptCriteria.DropTargetDetailEquals; -import com.vaadin.event.dd.acceptCriteria.ServerSideCriterion; +import com.vaadin.event.dd.acceptcriteria.ClientCriterion; +import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion; +import com.vaadin.event.dd.acceptcriteria.DropTargetDetailEquals; +import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; import com.vaadin.terminal.KeyMapper; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; diff --git a/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java b/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java index d2dfd454e3..c9bfa528a3 100644 --- a/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java +++ b/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java @@ -5,8 +5,8 @@ import com.vaadin.event.Transferable; import com.vaadin.event.TransferableImpl; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; -import com.vaadin.event.dd.acceptCriteria.AcceptAll; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptAll; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.Component; diff --git a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java index 8cf8cb3c5a..da602fd0b8 100644 --- a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java +++ b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java @@ -5,8 +5,8 @@ import com.vaadin.event.Transferable; import com.vaadin.event.TransferableImpl; 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.ServerSideCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.Component; diff --git a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java b/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java index 6c116d1546..04292a6ba9 100644 --- a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java +++ b/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java @@ -6,8 +6,8 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.DropTargetDetails; -import com.vaadin.event.dd.acceptCriteria.AcceptAll; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptAll; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.ClientWidget; import com.vaadin.ui.Component; diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java index dc46de7e32..861367889d 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest1.java +++ b/tests/src/com/vaadin/tests/dd/DDTest1.java @@ -8,9 +8,9 @@ import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; 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.IsDataBound; -import com.vaadin.event.dd.acceptCriteria.ServerSideCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.IsDataBound; +import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; import com.vaadin.terminal.ExternalResource; import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; import com.vaadin.tests.components.TestBase; diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java index 868d2486de..2646a05986 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest2.java +++ b/tests/src/com/vaadin/tests/dd/DDTest2.java @@ -13,11 +13,11 @@ import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; 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.DragSourceIs; -import com.vaadin.event.dd.acceptCriteria.IsDataBound; -import com.vaadin.event.dd.acceptCriteria.Or; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.And; +import com.vaadin.event.dd.acceptcriteria.DragSourceIs; +import com.vaadin.event.dd.acceptcriteria.IsDataBound; +import com.vaadin.event.dd.acceptcriteria.Or; import com.vaadin.terminal.Resource; import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; diff --git a/tests/src/com/vaadin/tests/dd/DDTest4.java b/tests/src/com/vaadin/tests/dd/DDTest4.java index bc32ffe2ae..eb71ce37dd 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest4.java +++ b/tests/src/com/vaadin/tests/dd/DDTest4.java @@ -9,8 +9,8 @@ import com.vaadin.demo.tutorial.addressbook.data.PersonContainer; import com.vaadin.event.DataBoundTransferable; 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.DragSourceIs; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.DragSourceIs; import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; import com.vaadin.tests.components.TestBase; diff --git a/tests/src/com/vaadin/tests/dd/DDTest5.java b/tests/src/com/vaadin/tests/dd/DDTest5.java index 5514402074..ce37f7ae30 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest5.java +++ b/tests/src/com/vaadin/tests/dd/DDTest5.java @@ -5,8 +5,8 @@ import java.util.Iterator; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; -import com.vaadin.event.dd.acceptCriteria.AcceptAll; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptAll; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; diff --git a/tests/src/com/vaadin/tests/dd/DDTest6.java b/tests/src/com/vaadin/tests/dd/DDTest6.java index 00fffdbaf0..58e6e1b5cc 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest6.java +++ b/tests/src/com/vaadin/tests/dd/DDTest6.java @@ -22,10 +22,10 @@ import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; -import com.vaadin.event.dd.acceptCriteria.AcceptAll; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; -import com.vaadin.event.dd.acceptCriteria.IsSameSourceAndTarget; -import com.vaadin.event.dd.acceptCriteria.Not; +import com.vaadin.event.dd.acceptcriteria.AcceptAll; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.IsSameSourceAndTarget; +import com.vaadin.event.dd.acceptcriteria.Not; import com.vaadin.terminal.ApplicationResource; import com.vaadin.terminal.Resource; import com.vaadin.terminal.StreamResource; diff --git a/tests/src/com/vaadin/tests/dd/DDTest7.java b/tests/src/com/vaadin/tests/dd/DDTest7.java index 1591af0408..8f0e3827fe 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest7.java +++ b/tests/src/com/vaadin/tests/dd/DDTest7.java @@ -11,7 +11,7 @@ import com.vaadin.demo.tutorial.addressbook.data.PersonContainer; import com.vaadin.event.DataBoundTransferable; 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.AcceptCriterion; import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; diff --git a/tests/src/com/vaadin/tests/dd/DragDropPane.java b/tests/src/com/vaadin/tests/dd/DragDropPane.java index 2b75760e50..543f5bfa1d 100644 --- a/tests/src/com/vaadin/tests/dd/DragDropPane.java +++ b/tests/src/com/vaadin/tests/dd/DragDropPane.java @@ -8,8 +8,8 @@ import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; -import com.vaadin.event.dd.acceptCriteria.AcceptAll; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptAll; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.Component; diff --git a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java index fbaf70b276..4837934cad 100644 --- a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java +++ b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java @@ -8,11 +8,11 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; 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.IsSameSourceAndTarget; -import com.vaadin.event.dd.acceptCriteria.Not; +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.IsSameSourceAndTarget; +import com.vaadin.event.dd.acceptcriteria.Not; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.HorizontalLayout; diff --git a/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java index 013ab32cea..521712490e 100644 --- a/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java +++ b/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java @@ -2,14 +2,14 @@ package com.vaadin.tests.dd; import java.util.Iterator; -import com.vaadin.event.TransferableImpl; import com.vaadin.event.Transferable; +import com.vaadin.event.TransferableImpl; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.DropTargetDetails; -import com.vaadin.event.dd.acceptCriteria.AcceptAll; -import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; +import com.vaadin.event.dd.acceptcriteria.AcceptAll; +import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; import com.vaadin.ui.DragAndDropWrapper; |