diff options
Diffstat (limited to 'tests')
23 files changed, 196 insertions, 196 deletions
diff --git a/tests/client-side/com/vaadin/terminal/gwt/client/ApplicationConnectionTestURLGeneration.java b/tests/client-side/com/vaadin/client/ApplicationConnectionTestURLGeneration.java index 3535d50529..da5970d64d 100644 --- a/tests/client-side/com/vaadin/terminal/gwt/client/ApplicationConnectionTestURLGeneration.java +++ b/tests/client-side/com/vaadin/client/ApplicationConnectionTestURLGeneration.java @@ -1,10 +1,10 @@ -package com.vaadin.terminal.gwt.client; +package com.vaadin.client; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.terminal.gwt.client.ApplicationConnection; +import com.vaadin.client.ApplicationConnection; public class ApplicationConnectionTestURLGeneration { diff --git a/tests/client-side/com/vaadin/terminal/gwt/client/DateTimeServiceTest.java b/tests/client-side/com/vaadin/client/DateTimeServiceTest.java index b111faf5bc..6852e9ec3f 100755 --- a/tests/client-side/com/vaadin/terminal/gwt/client/DateTimeServiceTest.java +++ b/tests/client-side/com/vaadin/client/DateTimeServiceTest.java @@ -1,4 +1,4 @@ -package com.vaadin.terminal.gwt.client; +package com.vaadin.client; import java.util.Calendar; import java.util.Date; @@ -7,7 +7,7 @@ import java.util.Map; import junit.framework.TestCase; -import com.vaadin.terminal.gwt.client.DateTimeService; +import com.vaadin.client.DateTimeService; public class DateTimeServiceTest extends TestCase { diff --git a/tests/client-side/com/vaadin/terminal/gwt/client/TestVBrowserDetailsUserAgentParser.java b/tests/client-side/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java index 34b64606a5..04e8be699b 100644 --- a/tests/client-side/com/vaadin/terminal/gwt/client/TestVBrowserDetailsUserAgentParser.java +++ b/tests/client-side/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java @@ -1,4 +1,4 @@ -package com.vaadin.terminal.gwt.client; +package com.vaadin.client; import com.vaadin.shared.VBrowserDetails; diff --git a/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java b/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java index 58dfdf246c..941525bed4 100644 --- a/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java +++ b/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java @@ -22,9 +22,9 @@ import java.util.Map; import junit.framework.TestCase; +import com.vaadin.client.communication.JsonDecoder; +import com.vaadin.client.communication.JsonEncoder; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState; -import com.vaadin.terminal.gwt.client.communication.JsonDecoder; -import com.vaadin.terminal.gwt.client.communication.JsonEncoder; import com.vaadin.terminal.gwt.server.JsonCodec.BeanProperty; /** diff --git a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java index d703fb0364..9c7e526dad 100644 --- a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java +++ b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java @@ -319,7 +319,7 @@ public abstract class AbstractContainerTest extends TestCase { validateContainer(container, "com.vaadin.data.BufferedValidatable", "com.vaadin.ui.TabSheet", - "com.vaadin.terminal.gwt.client.Focusable", + "com.vaadin.client.Focusable", "com.vaadin.data.Buffered", isFilteredOutItemNull(), 20); // Filter by "contains da" (reversed as ad here) @@ -330,7 +330,7 @@ public abstract class AbstractContainerTest extends TestCase { validateContainer(container, "com.vaadin.data.Buffered", "com.vaadin.terminal.gwt.server.ComponentSizeValidator", "com.vaadin.data.util.IndexedContainer", - "com.vaadin.terminal.gwt.client.ui.VUriFragmentUtility", + "com.vaadin.client.ui.VUriFragmentUtility", isFilteredOutItemNull(), 37); } @@ -483,116 +483,116 @@ public abstract class AbstractContainerTest extends TestCase { "com.vaadin.terminal.ErrorMessage", "com.vaadin.terminal.ExternalResource", "com.vaadin.terminal.FileResource", - "com.vaadin.terminal.gwt.client.ApplicationConfiguration", - "com.vaadin.terminal.gwt.client.ApplicationConnection", - "com.vaadin.terminal.gwt.client.BrowserInfo", - "com.vaadin.terminal.gwt.client.ClientExceptionHandler", - "com.vaadin.terminal.gwt.client.ComponentDetail", - "com.vaadin.terminal.gwt.client.ComponentDetailMap", - "com.vaadin.terminal.gwt.client.ComponentLocator", - "com.vaadin.terminal.gwt.client.Console", - "com.vaadin.terminal.gwt.client.Container", - "com.vaadin.terminal.gwt.client.ContainerResizedListener", - "com.vaadin.terminal.gwt.client.CSSRule", - "com.vaadin.terminal.gwt.client.DateTimeService", - "com.vaadin.terminal.gwt.client.DefaultWidgetSet", - "com.vaadin.terminal.gwt.client.Focusable", - "com.vaadin.terminal.gwt.client.HistoryImplIEVaadin", - "com.vaadin.terminal.gwt.client.LocaleNotLoadedException", - "com.vaadin.terminal.gwt.client.LocaleService", - "com.vaadin.terminal.gwt.client.MouseEventDetails", - "com.vaadin.terminal.gwt.client.NullConsole", - "com.vaadin.terminal.gwt.client.Paintable", - "com.vaadin.terminal.gwt.client.RenderInformation", - "com.vaadin.terminal.gwt.client.RenderSpace", - "com.vaadin.terminal.gwt.client.StyleConstants", - "com.vaadin.terminal.gwt.client.TooltipInfo", - "com.vaadin.terminal.gwt.client.ui.Action", - "com.vaadin.terminal.gwt.client.ui.ActionOwner", - "com.vaadin.terminal.gwt.client.ui.AlignmentInfo", - "com.vaadin.terminal.gwt.client.ui.CalendarEntry", - "com.vaadin.terminal.gwt.client.ui.ClickEventHandler", - "com.vaadin.terminal.gwt.client.ui.Field", - "com.vaadin.terminal.gwt.client.ui.Icon", - "com.vaadin.terminal.gwt.client.ui.layout.CellBasedLayout", - "com.vaadin.terminal.gwt.client.ui.layout.ChildComponentContainer", - "com.vaadin.terminal.gwt.client.ui.layout.Margins", - "com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler", - "com.vaadin.terminal.gwt.client.ui.MenuBar", - "com.vaadin.terminal.gwt.client.ui.MenuItem", - "com.vaadin.terminal.gwt.client.ui.richtextarea.VRichTextArea", - "com.vaadin.terminal.gwt.client.ui.richtextarea.VRichTextToolbar", - "com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler", - "com.vaadin.terminal.gwt.client.ui.SubPartAware", - "com.vaadin.terminal.gwt.client.ui.Table", - "com.vaadin.terminal.gwt.client.ui.TreeAction", - "com.vaadin.terminal.gwt.client.ui.TreeImages", - "com.vaadin.terminal.gwt.client.ui.VAbsoluteLayout", - "com.vaadin.terminal.gwt.client.ui.VAccordion", - "com.vaadin.terminal.gwt.client.ui.VButton", - "com.vaadin.terminal.gwt.client.ui.VCalendarPanel", - "com.vaadin.terminal.gwt.client.ui.VCheckBox", - "com.vaadin.terminal.gwt.client.ui.VContextMenu", - "com.vaadin.terminal.gwt.client.ui.VCssLayout", - "com.vaadin.terminal.gwt.client.ui.VCustomComponent", - "com.vaadin.terminal.gwt.client.ui.VCustomLayout", - "com.vaadin.terminal.gwt.client.ui.VDateField", - "com.vaadin.terminal.gwt.client.ui.VDateFieldCalendar", - "com.vaadin.terminal.gwt.client.ui.VEmbedded", - "com.vaadin.terminal.gwt.client.ui.VFilterSelect", - "com.vaadin.terminal.gwt.client.ui.VForm", - "com.vaadin.terminal.gwt.client.ui.VFormLayout", - "com.vaadin.terminal.gwt.client.ui.VGridLayout", - "com.vaadin.terminal.gwt.client.ui.VHorizontalLayout", - "com.vaadin.terminal.gwt.client.ui.VLabel", - "com.vaadin.terminal.gwt.client.ui.VLink", - "com.vaadin.terminal.gwt.client.ui.VListSelect", - "com.vaadin.terminal.gwt.client.ui.VMarginInfo", - "com.vaadin.terminal.gwt.client.ui.VMenuBar", - "com.vaadin.terminal.gwt.client.ui.VNativeButton", - "com.vaadin.terminal.gwt.client.ui.VNativeSelect", - "com.vaadin.terminal.gwt.client.ui.VNotification", - "com.vaadin.terminal.gwt.client.ui.VOptionGroup", - "com.vaadin.terminal.gwt.client.ui.VOptionGroupBase", - "com.vaadin.terminal.gwt.client.ui.VOrderedLayout", - "com.vaadin.terminal.gwt.client.ui.VOverlay", - "com.vaadin.terminal.gwt.client.ui.VPanel", - "com.vaadin.terminal.gwt.client.ui.VPasswordField", - "com.vaadin.terminal.gwt.client.ui.VPopupCalendar", - "com.vaadin.terminal.gwt.client.ui.VPopupView", - "com.vaadin.terminal.gwt.client.ui.VProgressIndicator", - "com.vaadin.terminal.gwt.client.ui.VScrollTable", - "com.vaadin.terminal.gwt.client.ui.VSlider", - "com.vaadin.terminal.gwt.client.ui.VSplitPanel", - "com.vaadin.terminal.gwt.client.ui.VSplitPanelHorizontal", - "com.vaadin.terminal.gwt.client.ui.VSplitPanelVertical", - "com.vaadin.terminal.gwt.client.ui.VTablePaging", - "com.vaadin.terminal.gwt.client.ui.VTabsheet", - "com.vaadin.terminal.gwt.client.ui.VTabsheetBase", - "com.vaadin.terminal.gwt.client.ui.VTabsheetPanel", - "com.vaadin.terminal.gwt.client.ui.VTextArea", - "com.vaadin.terminal.gwt.client.ui.VTextField", - "com.vaadin.terminal.gwt.client.ui.VTextualDate", - "com.vaadin.terminal.gwt.client.ui.VTime", - "com.vaadin.terminal.gwt.client.ui.VTree", - "com.vaadin.terminal.gwt.client.ui.VTwinColSelect", - "com.vaadin.terminal.gwt.client.ui.VUnknownComponent", - "com.vaadin.terminal.gwt.client.ui.VUpload", - "com.vaadin.terminal.gwt.client.ui.VUriFragmentUtility", - "com.vaadin.terminal.gwt.client.ui.VVerticalLayout", - "com.vaadin.terminal.gwt.client.ui.VView", - "com.vaadin.terminal.gwt.client.ui.VWindow", - "com.vaadin.terminal.gwt.client.UIDL", - "com.vaadin.terminal.gwt.client.Util", - "com.vaadin.terminal.gwt.client.ValueMap", - "com.vaadin.terminal.gwt.client.VCaption", - "com.vaadin.terminal.gwt.client.VCaptionWrapper", - "com.vaadin.terminal.gwt.client.VDebugConsole", - "com.vaadin.terminal.gwt.client.VErrorMessage", - "com.vaadin.terminal.gwt.client.VTooltip", - "com.vaadin.terminal.gwt.client.VUIDLBrowser", - "com.vaadin.terminal.gwt.client.WidgetMap", - "com.vaadin.terminal.gwt.client.WidgetSet", + "com.vaadin.client.ApplicationConfiguration", + "com.vaadin.client.ApplicationConnection", + "com.vaadin.client.BrowserInfo", + "com.vaadin.client.ClientExceptionHandler", + "com.vaadin.client.ComponentDetail", + "com.vaadin.client.ComponentDetailMap", + "com.vaadin.client.ComponentLocator", + "com.vaadin.client.Console", + "com.vaadin.client.Container", + "com.vaadin.client.ContainerResizedListener", + "com.vaadin.client.CSSRule", + "com.vaadin.client.DateTimeService", + "com.vaadin.client.DefaultWidgetSet", + "com.vaadin.client.Focusable", + "com.vaadin.client.HistoryImplIEVaadin", + "com.vaadin.client.LocaleNotLoadedException", + "com.vaadin.client.LocaleService", + "com.vaadin.client.MouseEventDetails", + "com.vaadin.client.NullConsole", + "com.vaadin.client.Paintable", + "com.vaadin.client.RenderInformation", + "com.vaadin.client.RenderSpace", + "com.vaadin.client.StyleConstants", + "com.vaadin.client.TooltipInfo", + "com.vaadin.client.ui.Action", + "com.vaadin.client.ui.ActionOwner", + "com.vaadin.client.ui.AlignmentInfo", + "com.vaadin.client.ui.CalendarEntry", + "com.vaadin.client.ui.ClickEventHandler", + "com.vaadin.client.ui.Field", + "com.vaadin.client.ui.Icon", + "com.vaadin.client.ui.layout.CellBasedLayout", + "com.vaadin.client.ui.layout.ChildComponentContainer", + "com.vaadin.client.ui.layout.Margins", + "com.vaadin.client.ui.LayoutClickEventHandler", + "com.vaadin.client.ui.MenuBar", + "com.vaadin.client.ui.MenuItem", + "com.vaadin.client.ui.richtextarea.VRichTextArea", + "com.vaadin.client.ui.richtextarea.VRichTextToolbar", + "com.vaadin.client.ui.ShortcutActionHandler", + "com.vaadin.client.ui.SubPartAware", + "com.vaadin.client.ui.Table", + "com.vaadin.client.ui.TreeAction", + "com.vaadin.client.ui.TreeImages", + "com.vaadin.client.ui.VAbsoluteLayout", + "com.vaadin.client.ui.VAccordion", + "com.vaadin.client.ui.VButton", + "com.vaadin.client.ui.VCalendarPanel", + "com.vaadin.client.ui.VCheckBox", + "com.vaadin.client.ui.VContextMenu", + "com.vaadin.client.ui.VCssLayout", + "com.vaadin.client.ui.VCustomComponent", + "com.vaadin.client.ui.VCustomLayout", + "com.vaadin.client.ui.VDateField", + "com.vaadin.client.ui.VDateFieldCalendar", + "com.vaadin.client.ui.VEmbedded", + "com.vaadin.client.ui.VFilterSelect", + "com.vaadin.client.ui.VForm", + "com.vaadin.client.ui.VFormLayout", + "com.vaadin.client.ui.VGridLayout", + "com.vaadin.client.ui.VHorizontalLayout", + "com.vaadin.client.ui.VLabel", + "com.vaadin.client.ui.VLink", + "com.vaadin.client.ui.VListSelect", + "com.vaadin.client.ui.VMarginInfo", + "com.vaadin.client.ui.VMenuBar", + "com.vaadin.client.ui.VNativeButton", + "com.vaadin.client.ui.VNativeSelect", + "com.vaadin.client.ui.VNotification", + "com.vaadin.client.ui.VOptionGroup", + "com.vaadin.client.ui.VOptionGroupBase", + "com.vaadin.client.ui.VOrderedLayout", + "com.vaadin.client.ui.VOverlay", + "com.vaadin.client.ui.VPanel", + "com.vaadin.client.ui.VPasswordField", + "com.vaadin.client.ui.VPopupCalendar", + "com.vaadin.client.ui.VPopupView", + "com.vaadin.client.ui.VProgressIndicator", + "com.vaadin.client.ui.VScrollTable", + "com.vaadin.client.ui.VSlider", + "com.vaadin.client.ui.VSplitPanel", + "com.vaadin.client.ui.VSplitPanelHorizontal", + "com.vaadin.client.ui.VSplitPanelVertical", + "com.vaadin.client.ui.VTablePaging", + "com.vaadin.client.ui.VTabsheet", + "com.vaadin.client.ui.VTabsheetBase", + "com.vaadin.client.ui.VTabsheetPanel", + "com.vaadin.client.ui.VTextArea", + "com.vaadin.client.ui.VTextField", + "com.vaadin.client.ui.VTextualDate", + "com.vaadin.client.ui.VTime", + "com.vaadin.client.ui.VTree", + "com.vaadin.client.ui.VTwinColSelect", + "com.vaadin.client.ui.VUnknownComponent", + "com.vaadin.client.ui.VUpload", + "com.vaadin.client.ui.VUriFragmentUtility", + "com.vaadin.client.ui.VVerticalLayout", + "com.vaadin.client.ui.VView", + "com.vaadin.client.ui.VWindow", + "com.vaadin.client.UIDL", + "com.vaadin.client.Util", + "com.vaadin.client.ValueMap", + "com.vaadin.client.VCaption", + "com.vaadin.client.VCaptionWrapper", + "com.vaadin.client.VDebugConsole", + "com.vaadin.client.VErrorMessage", + "com.vaadin.client.VTooltip", + "com.vaadin.client.VUIDLBrowser", + "com.vaadin.client.WidgetMap", + "com.vaadin.client.WidgetSet", "com.vaadin.terminal.gwt.server.AbstractApplicationPortlet", "com.vaadin.terminal.gwt.server.AbstractApplicationServlet", "com.vaadin.terminal.gwt.server.AbstractCommunicationManager", diff --git a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java index 9e0558a122..f0cbfe7a87 100644 --- a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java +++ b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java @@ -46,7 +46,7 @@ public class TestHierarchicalContainer extends assertNull("Parent should be null, is " + p1, p1); container.removeAllItems(); - p1 = container.getParent("com.vaadin.terminal.gwt.client.Focusable"); + p1 = container.getParent("com.vaadin.client.Focusable"); assertNull("Parent should be null, is " + p1, p1); } @@ -59,12 +59,12 @@ public class TestHierarchicalContainer extends Object p1 = container.getParent("com.vaadin.ui.TabSheet"); assertEquals("com.vaadin.ui", p1); p1 = container - .getParent("com.vaadin.terminal.gwt.client.ui.VPopupCalendar"); + .getParent("com.vaadin.client.ui.VPopupCalendar"); assertNull(p1); container.removeAllContainerFilters(); p1 = container - .getParent("com.vaadin.terminal.gwt.client.ui.VPopupCalendar"); - assertEquals("com.vaadin.terminal.gwt.client.ui", p1); + .getParent("com.vaadin.client.ui.VPopupCalendar"); + assertEquals("com.vaadin.client.ui", p1); } @@ -111,7 +111,7 @@ public class TestHierarchicalContainer extends validateHierarchicalContainer(container, "com", "com.vaadin.ui.TabSheet", - "com.vaadin.terminal.gwt.client.Focusable", "blah", true, + "com.vaadin.client.Focusable", "blah", true, expectedSize, expectedRoots, true); // only include .gwt.client classes @@ -126,8 +126,8 @@ public class TestHierarchicalContainer extends expectedRoots = 1; validateHierarchicalContainer(container, "com", - "com.vaadin.terminal.gwt.client.WidgetSet", - "com.vaadin.terminal.gwt.client.ui.VSplitPanelVertical", + "com.vaadin.client.WidgetSet", + "com.vaadin.client.ui.VSplitPanelVertical", "blah", true, expectedSize, expectedRoots, true); // Additionally remove all without 'm' in the simple name. @@ -139,8 +139,8 @@ public class TestHierarchicalContainer extends validateHierarchicalContainer( container, "com", - "com.vaadin.terminal.gwt.client.ui.VUriFragmentUtility", - "com.vaadin.terminal.gwt.client.ui.layout.ChildComponentContainer", + "com.vaadin.client.ui.VUriFragmentUtility", + "com.vaadin.client.ui.layout.ChildComponentContainer", "blah", true, expectedSize, expectedRoots, true); } @@ -208,15 +208,15 @@ public class TestHierarchicalContainer extends // 20 items match the filter. // com.vaadin.data.BufferedValidatable // com.vaadin.data.Validatable - // com.vaadin.terminal.gwt.client.Focusable - // com.vaadin.terminal.gwt.client.Paintable - // com.vaadin.terminal.gwt.client.ui.Table - // com.vaadin.terminal.gwt.client.ui.VLabel - // com.vaadin.terminal.gwt.client.ui.VScrollTable - // com.vaadin.terminal.gwt.client.ui.VTablePaging - // com.vaadin.terminal.gwt.client.ui.VTabsheet - // com.vaadin.terminal.gwt.client.ui.VTabsheetBase - // com.vaadin.terminal.gwt.client.ui.VTabsheetPanel + // com.vaadin.client.Focusable + // com.vaadin.client.Paintable + // com.vaadin.client.ui.Table + // com.vaadin.client.ui.VLabel + // com.vaadin.client.ui.VScrollTable + // com.vaadin.client.ui.VTablePaging + // com.vaadin.client.ui.VTabsheet + // com.vaadin.client.ui.VTabsheetBase + // com.vaadin.client.ui.VTabsheetPanel // com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent // com.vaadin.terminal.Paintable // com.vaadin.terminal.Scrollable @@ -233,7 +233,7 @@ public class TestHierarchicalContainer extends validateHierarchicalContainer(container, "com.vaadin.data.BufferedValidatable", "com.vaadin.ui.TabSheet", - "com.vaadin.terminal.gwt.client.ui.VTabsheetBase", "blah", + "com.vaadin.client.ui.VTabsheetBase", "blah", true, expectedSize, expectedRoots, false); // only include .gwt.client classes @@ -245,14 +245,14 @@ public class TestHierarchicalContainer extends int classes = 110; expectedSize = packages + classes; - expectedRoots = 35 + 1; // com.vaadin.terminal.gwt.client.ui + - // com.vaadin.terminal.gwt.client.* + expectedRoots = 35 + 1; // com.vaadin.client.ui + + // com.vaadin.client.* // Sorting is case insensitive validateHierarchicalContainer(container, - "com.vaadin.terminal.gwt.client.ApplicationConfiguration", - "com.vaadin.terminal.gwt.client.WidgetSet", - "com.vaadin.terminal.gwt.client.ui.VOptionGroup", "blah", true, + "com.vaadin.client.ApplicationConfiguration", + "com.vaadin.client.WidgetSet", + "com.vaadin.client.ui.VOptionGroup", "blah", true, expectedSize, expectedRoots, false); // Additionally remove all without 'P' in the simple name. @@ -262,9 +262,9 @@ public class TestHierarchicalContainer extends expectedRoots = expectedSize; validateHierarchicalContainer(container, - "com.vaadin.terminal.gwt.client.Paintable", - "com.vaadin.terminal.gwt.client.ui.VTabsheetPanel", - "com.vaadin.terminal.gwt.client.ui.VPopupCalendar", "blah", + "com.vaadin.client.Paintable", + "com.vaadin.client.ui.VTabsheetPanel", + "com.vaadin.client.ui.VPopupCalendar", "blah", true, expectedSize, expectedRoots, false); } diff --git a/tests/server-side/com/vaadin/tests/VaadinClasses.java b/tests/server-side/com/vaadin/tests/VaadinClasses.java index 5d9e38398c..15e1283e47 100644 --- a/tests/server-side/com/vaadin/tests/VaadinClasses.java +++ b/tests/server-side/com/vaadin/tests/VaadinClasses.java @@ -84,7 +84,7 @@ public class VaadinClasses { public static List<Class<? extends Object>> getAllServerSideClasses() { try { return findClassesNoTests(Object.class, "com.vaadin", new String[] { - "com.vaadin.tests", "com.vaadin.terminal.gwt.client" }); + "com.vaadin.tests", "com.vaadin.client" }); } catch (IOException e) { e.printStackTrace(); return null; diff --git a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java index f02e5d2932..1ab742427d 100644 --- a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java +++ b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java @@ -188,7 +188,7 @@ public class SourceFileChecker extends TestCase { class GwtEntryChecker extends FileContentsValidator { // Matches e.g. - // @com.vaadin.terminal.gwt.client.HistoryImplIEVaadin::escapeHtml( + // @com.vaadin.client.HistoryImplIEVaadin::escapeHtml( private final Matcher matcher = Pattern.compile("@[\\w.]+::\\w+\\(") .matcher(""); diff --git a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java index abc3f7f010..e787a182e4 100644 --- a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java +++ b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java @@ -15,11 +15,11 @@ */ package com.vaadin.tests.dd; +import com.vaadin.client.ApplicationConnection; +import com.vaadin.client.Paintable; +import com.vaadin.client.UIDL; +import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.Paintable; -import com.vaadin.terminal.gwt.client.UIDL; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; import com.vaadin.tests.dd.CustomDDImplementation.MyDragSource; @Connect(MyDragSource.class) diff --git a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java index d70c788fa4..f0f2b5dfd6 100644 --- a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java +++ b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java @@ -15,11 +15,11 @@ */ package com.vaadin.tests.dd; +import com.vaadin.client.ApplicationConnection; +import com.vaadin.client.Paintable; +import com.vaadin.client.UIDL; +import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.Paintable; -import com.vaadin.terminal.gwt.client.UIDL; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; import com.vaadin.tests.dd.CustomDDImplementation.MyDropTarget; @Connect(MyDropTarget.class) diff --git a/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java b/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java index e6c7078e8e..8cca6d6459 100644 --- a/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java +++ b/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java @@ -11,8 +11,8 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Widget; -import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager; -import com.vaadin.terminal.gwt.client.ui.dd.VTransferable; +import com.vaadin.client.ui.dd.VDragAndDropManager; +import com.vaadin.client.ui.dd.VTransferable; /** * Example code to implement Component that has something to drag. diff --git a/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java b/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java index 627f0554f6..58bd326524 100644 --- a/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java +++ b/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java @@ -1,11 +1,11 @@ package com.vaadin.tests.dd; import com.google.gwt.user.client.ui.Composite; -import com.vaadin.terminal.gwt.client.ApplicationConnection; -import com.vaadin.terminal.gwt.client.ComponentConnector; -import com.vaadin.terminal.gwt.client.ui.dd.VDragEvent; -import com.vaadin.terminal.gwt.client.ui.dd.VDropHandler; -import com.vaadin.terminal.gwt.client.ui.dd.VHasDropHandler; +import com.vaadin.client.ApplicationConnection; +import com.vaadin.client.ComponentConnector; +import com.vaadin.client.ui.dd.VDragEvent; +import com.vaadin.client.ui.dd.VDropHandler; +import com.vaadin.client.ui.dd.VHasDropHandler; public class VMyDropTarget extends Composite implements VHasDropHandler, VDropHandler { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java index 0608cc092e..0306555a5d 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java @@ -17,10 +17,10 @@ package com.vaadin.tests.minitutorials.v7a2; import com.google.gwt.user.client.Element; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; -import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout; -import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeEvent; -import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener; +import com.vaadin.client.ui.AbstractComponentConnector; +import com.vaadin.client.ui.SimpleManagedLayout; +import com.vaadin.client.ui.layout.ElementResizeEvent; +import com.vaadin.client.ui.layout.ElementResizeListener; /** * Mini tutorial code for diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java index a10d318991..9d28b52ae5 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java @@ -18,10 +18,10 @@ package com.vaadin.tests.widgetset.client; import com.google.gwt.dom.client.DivElement; import com.google.gwt.dom.client.Document; +import com.vaadin.client.ServerConnector; +import com.vaadin.client.Util; +import com.vaadin.client.extensions.AbstractExtensionConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ServerConnector; -import com.vaadin.terminal.gwt.client.Util; -import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector; import com.vaadin.tests.extensions.BasicExtension; @Connect(BasicExtension.class) diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/DelegateConnector.java index c711be232f..c46a5aa007 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/DelegateConnector.java @@ -16,8 +16,8 @@ package com.vaadin.tests.widgetset.client; +import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; import com.vaadin.tests.widgetset.server.DelegateToWidgetComponent; @Connect(DelegateToWidgetComponent.class) diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/DummyLabelConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/DummyLabelConnector.java index bf3a472b33..601ec6db1f 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/DummyLabelConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/DummyLabelConnector.java @@ -16,10 +16,10 @@ package com.vaadin.tests.widgetset.client; +import com.vaadin.client.communication.StateChangeEvent; +import com.vaadin.client.ui.AbstractComponentConnector; +import com.vaadin.client.ui.label.VLabel; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.communication.StateChangeEvent; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; -import com.vaadin.terminal.gwt.client.ui.label.VLabel; import com.vaadin.tests.widgetset.server.DummyLabel; /** diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java index 35c15aaef8..bc514047f9 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java @@ -15,9 +15,9 @@ */ package com.vaadin.tests.widgetset.client; +import com.vaadin.client.ui.AbstractComponentConnector; +import com.vaadin.client.ui.label.VLabel; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; -import com.vaadin.terminal.gwt.client.ui.label.VLabel; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; @Connect(MissingFromDefaultWidgetsetComponent.class) diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java index 9fb6807bb7..7783178a3b 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java @@ -26,12 +26,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import com.vaadin.client.communication.RpcProxy; +import com.vaadin.client.communication.StateChangeEvent; +import com.vaadin.client.extensions.AbstractExtensionConnector; import com.vaadin.shared.Connector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.gwt.client.communication.RpcProxy; -import com.vaadin.terminal.gwt.client.communication.StateChangeEvent; -import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector; import com.vaadin.tests.widgetset.server.SerializerTestExtension; @Connect(SerializerTestExtension.class) diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java index 4a4d21cf4f..76dbdd5370 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java @@ -16,12 +16,12 @@ package com.vaadin.tests.widgetset.client.helloworldfeature; import com.google.gwt.user.client.Window; +import com.vaadin.client.ServerConnector; +import com.vaadin.client.Util; +import com.vaadin.client.VConsole; +import com.vaadin.client.communication.RpcProxy; +import com.vaadin.client.extensions.AbstractExtensionConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ServerConnector; -import com.vaadin.terminal.gwt.client.Util; -import com.vaadin.terminal.gwt.client.VConsole; -import com.vaadin.terminal.gwt.client.communication.RpcProxy; -import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector; import com.vaadin.tests.extensions.HelloWorldExtension; @Connect(HelloWorldExtension.class) diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java index 9c0d454e19..35469e7501 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java @@ -17,10 +17,10 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; import com.google.gwt.user.client.ui.Label; +import com.vaadin.client.ComponentConnector; +import com.vaadin.client.communication.StateChangeEvent; +import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ComponentConnector; -import com.vaadin.terminal.gwt.client.communication.StateChangeEvent; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; import com.vaadin.tests.minitutorials.v7a2.ComponentInStateComponent; @Connect(ComponentInStateComponent.class) diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java index 3a6aab617a..c80a4c88f0 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java @@ -3,12 +3,12 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; +import com.vaadin.client.MouseEventDetailsBuilder; +import com.vaadin.client.communication.RpcProxy; +import com.vaadin.client.communication.StateChangeEvent; +import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder; -import com.vaadin.terminal.gwt.client.communication.RpcProxy; -import com.vaadin.terminal.gwt.client.communication.StateChangeEvent; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; import com.vaadin.tests.minitutorials.v7a2.MyComponent; @Connect(MyComponent.class) diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java index 57579d3ec2..fa31267fd4 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java @@ -17,10 +17,10 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; import com.google.gwt.user.client.ui.Image; +import com.vaadin.client.communication.StateChangeEvent; +import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.shared.communication.URLReference; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.communication.StateChangeEvent; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; import com.vaadin.tests.minitutorials.v7a2.ResourceInStateComponent; @Connect(ResourceInStateComponent.class) diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java index 7905de89f2..fc65f6b2ae 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java @@ -4,10 +4,10 @@ import java.util.List; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.client.ComponentConnector; +import com.vaadin.client.ConnectorHierarchyChangeEvent; +import com.vaadin.client.ui.AbstractComponentContainerConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.gwt.client.ComponentConnector; -import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent; -import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector; import com.vaadin.tests.minitutorials.v7a2.WidgetContainer; @Connect(WidgetContainer.class) |