diff options
376 files changed, 755 insertions, 789 deletions
diff --git a/client/src/com/vaadin/client/JavaScriptExtension.java b/client/src/com/vaadin/client/JavaScriptExtension.java index 674262e35e..0a3d6b81ba 100644 --- a/client/src/com/vaadin/client/JavaScriptExtension.java +++ b/client/src/com/vaadin/client/JavaScriptExtension.java @@ -18,9 +18,9 @@ package com.vaadin.client; import com.vaadin.client.communication.HasJavaScriptConnectorHelper; import com.vaadin.client.extensions.AbstractExtensionConnector; +import com.vaadin.server.AbstractJavaScriptExtension; import com.vaadin.shared.JavaScriptExtensionState; import com.vaadin.shared.ui.Connect; -import com.vaadin.terminal.AbstractJavaScriptExtension; @Connect(AbstractJavaScriptExtension.class) public final class JavaScriptExtension extends AbstractExtensionConnector diff --git a/client/src/com/vaadin/client/UIDL.java b/client/src/com/vaadin/client/UIDL.java index dff9f91b35..f9cad3dee5 100644 --- a/client/src/com/vaadin/client/UIDL.java +++ b/client/src/com/vaadin/client/UIDL.java @@ -22,7 +22,7 @@ import java.util.Set; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArrayString; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintTarget; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; diff --git a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java index a87b761bbd..6c0d8fa725 100644 --- a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java +++ b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java @@ -36,8 +36,7 @@ public class ComboBoxConnector extends AbstractFieldConnector implements /* * (non-Javadoc) * - * @see - * com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.terminal + * @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.terminal * .gwt.client.UIDL, com.vaadin.client.ApplicationConnection) */ @Override diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java index bdad94355d..a406617288 100644 --- a/server/src/com/vaadin/Application.java +++ b/server/src/com/vaadin/Application.java @@ -51,19 +51,19 @@ import com.vaadin.data.util.converter.Converter; import com.vaadin.data.util.converter.ConverterFactory; import com.vaadin.data.util.converter.DefaultConverterFactory; import com.vaadin.event.EventRouter; +import com.vaadin.server.AbstractErrorMessage; +import com.vaadin.server.ApplicationResource; +import com.vaadin.server.CombinedRequest; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.Terminal; +import com.vaadin.server.UIProvider; +import com.vaadin.server.VariableOwner; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; +import com.vaadin.server.WrappedRequest.BrowserDetails; import com.vaadin.service.ApplicationContext; import com.vaadin.shared.ui.ui.UIConstants; -import com.vaadin.terminal.AbstractErrorMessage; -import com.vaadin.terminal.ApplicationResource; -import com.vaadin.terminal.CombinedRequest; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.Terminal; -import com.vaadin.terminal.UIProvider; -import com.vaadin.terminal.VariableOwner; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedRequest.BrowserDetails; -import com.vaadin.terminal.WrappedResponse; import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse; import com.vaadin.terminal.gwt.server.BootstrapListener; @@ -123,7 +123,7 @@ import com.vaadin.ui.Window; * found out, the window itself is queried for a preferred theme. If the window * does not prefer a specific theme, the application containing the window is * queried. If neither the application prefers a theme, the default theme for - * the {@link com.vaadin.terminal.Terminal terminal} is used. The terminal + * the {@link com.vaadin.server.Terminal terminal} is used. The terminal * always defines a default theme. * </p> * @@ -1075,7 +1075,7 @@ public class Application implements Terminal.ErrorListener, Serializable { * * @param event * the change event. - * @see com.vaadin.terminal.Terminal.ErrorListener#terminalError(com.vaadin.terminal.Terminal.ErrorEvent) + * @see com.vaadin.server.Terminal.ErrorListener#terminalError(com.vaadin.server.Terminal.ErrorEvent) */ @Override diff --git a/server/src/com/vaadin/UIRequiresMoreInformationException.java b/server/src/com/vaadin/UIRequiresMoreInformationException.java index 493c31acb6..76a31d88ef 100644 --- a/server/src/com/vaadin/UIRequiresMoreInformationException.java +++ b/server/src/com/vaadin/UIRequiresMoreInformationException.java @@ -16,8 +16,8 @@ package com.vaadin; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedRequest.BrowserDetails; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedRequest.BrowserDetails; /** * Exception that is thrown to indicate that creating or initializing the UI diff --git a/server/src/com/vaadin/annotations/EagerInit.java b/server/src/com/vaadin/annotations/EagerInit.java index 462c6bb5ac..f08d46b551 100644 --- a/server/src/com/vaadin/annotations/EagerInit.java +++ b/server/src/com/vaadin/annotations/EagerInit.java @@ -20,7 +20,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; /** @@ -29,7 +29,7 @@ import com.vaadin.ui.UI; * This will make the UI appear more quickly, as ensuring the availability of * this information typically requires an additional round trip to the client. * - * @see UI#init(com.vaadin.terminal.WrappedRequest) + * @see UI#init(com.vaadin.server.WrappedRequest) * @see WrappedRequest#getBrowserDetails() * * @since 7.0 diff --git a/server/src/com/vaadin/data/util/FilesystemContainer.java b/server/src/com/vaadin/data/util/FilesystemContainer.java index 54ee2d6f0c..4c27169409 100644 --- a/server/src/com/vaadin/data/util/FilesystemContainer.java +++ b/server/src/com/vaadin/data/util/FilesystemContainer.java @@ -33,8 +33,8 @@ import java.util.List; import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.Property; +import com.vaadin.server.Resource; import com.vaadin.service.FileTypeResolver; -import com.vaadin.terminal.Resource; /** * A hierarchical container wrapper for a filesystem. diff --git a/server/src/com/vaadin/event/Action.java b/server/src/com/vaadin/event/Action.java index aca28940a1..b8296418d3 100644 --- a/server/src/com/vaadin/event/Action.java +++ b/server/src/com/vaadin/event/Action.java @@ -18,7 +18,7 @@ package com.vaadin.event; import java.io.Serializable; -import com.vaadin.terminal.Resource; +import com.vaadin.server.Resource; /** * Implements the action framework. This class contains subinterfaces for action diff --git a/server/src/com/vaadin/event/ActionManager.java b/server/src/com/vaadin/event/ActionManager.java index 296d12ba92..85a1bf0f12 100644 --- a/server/src/com/vaadin/event/ActionManager.java +++ b/server/src/com/vaadin/event/ActionManager.java @@ -20,10 +20,10 @@ import java.util.Map; import com.vaadin.event.Action.Container; import com.vaadin.event.Action.Handler; -import com.vaadin.terminal.KeyMapper; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.VariableOwner; +import com.vaadin.server.KeyMapper; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.VariableOwner; import com.vaadin.ui.Component; /** diff --git a/server/src/com/vaadin/event/ShortcutAction.java b/server/src/com/vaadin/event/ShortcutAction.java index b3f41b474d..b1d14b15fe 100644 --- a/server/src/com/vaadin/event/ShortcutAction.java +++ b/server/src/com/vaadin/event/ShortcutAction.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.vaadin.terminal.Resource; +import com.vaadin.server.Resource; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.Panel; import com.vaadin.ui.Window; diff --git a/server/src/com/vaadin/event/ShortcutListener.java b/server/src/com/vaadin/event/ShortcutListener.java index 82a09585b3..d7e0577e84 100644 --- a/server/src/com/vaadin/event/ShortcutListener.java +++ b/server/src/com/vaadin/event/ShortcutListener.java @@ -16,7 +16,7 @@ package com.vaadin.event; import com.vaadin.event.Action.Listener; -import com.vaadin.terminal.Resource; +import com.vaadin.server.Resource; public abstract class ShortcutListener extends ShortcutAction implements Listener { diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java index 7b04efc4b3..850e68b231 100644 --- a/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java @@ -23,8 +23,8 @@ import java.io.Serializable; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * Criterion that can be used create policy to accept/discard dragged content diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/And.java b/server/src/com/vaadin/event/dd/acceptcriteria/And.java index 3d11ecf7bf..183010a298 100644 --- a/server/src/com/vaadin/event/dd/acceptcriteria/And.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/And.java @@ -19,8 +19,8 @@ package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.dd.DragAndDropEvent; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * A compound criterion that accepts the drag if all of its criteria accepts the diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java index be7e2d4033..e862cdfd39 100644 --- a/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java @@ -17,8 +17,8 @@ package com.vaadin.event.dd.acceptcriteria; import java.io.Serializable; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * Parent class for criteria that can be completely validated on client side. diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java b/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java index 55ee17fea9..97094814ef 100644 --- a/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java @@ -20,8 +20,8 @@ package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * A Criterion that checks whether {@link Transferable} contains given data diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/Not.java b/server/src/com/vaadin/event/dd/acceptcriteria/Not.java index b3f73699ea..9e1b1571ae 100644 --- a/server/src/com/vaadin/event/dd/acceptcriteria/Not.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/Not.java @@ -19,8 +19,8 @@ package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.dd.DragAndDropEvent; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * Criterion that wraps another criterion and inverts its return value. diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/Or.java b/server/src/com/vaadin/event/dd/acceptcriteria/Or.java index 42d1c3293d..7aa7d8cd20 100644 --- a/server/src/com/vaadin/event/dd/acceptcriteria/Or.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/Or.java @@ -19,8 +19,8 @@ package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.dd.DragAndDropEvent; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * A compound criterion that accepts the drag if any of its criterion accepts diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java index b9c2855021..b7457605b8 100644 --- a/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java @@ -18,8 +18,8 @@ package com.vaadin.event.dd.acceptcriteria; import java.io.Serializable; import com.vaadin.event.Transferable; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * Parent class for criteria which are verified on the server side during a drag diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java b/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java index cc1d586076..6258aed423 100644 --- a/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java @@ -23,8 +23,8 @@ import java.util.logging.Logger; import com.vaadin.event.TransferableImpl; import com.vaadin.event.dd.DragAndDropEvent; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; import com.vaadin.ui.Component; /** diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java b/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java index 536ba8780e..a6d3e2c5d5 100644 --- a/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java +++ b/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java @@ -20,8 +20,8 @@ package com.vaadin.event.dd.acceptcriteria; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.TargetDetails; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * Criterion for checking if drop target details contains the specific property diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java index 13e87c16ad..1fa11184b9 100644 --- a/server/src/com/vaadin/navigator/Navigator.java +++ b/server/src/com/vaadin/navigator/Navigator.java @@ -22,9 +22,9 @@ import java.util.LinkedList; import java.util.List; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; -import com.vaadin.terminal.Page; -import com.vaadin.terminal.Page.FragmentChangedEvent; -import com.vaadin.terminal.Page.FragmentChangedListener; +import com.vaadin.server.Page; +import com.vaadin.server.Page.FragmentChangedEvent; +import com.vaadin.server.Page.FragmentChangedListener; import com.vaadin.ui.Component; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.CssLayout; diff --git a/server/src/com/vaadin/terminal/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java index 157bd17e41..2a0d1e4425 100644 --- a/server/src/com/vaadin/terminal/AbstractClientConnector.java +++ b/server/src/com/vaadin/server/AbstractClientConnector.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; import java.lang.reflect.Constructor; diff --git a/server/src/com/vaadin/terminal/AbstractErrorMessage.java b/server/src/com/vaadin/server/AbstractErrorMessage.java index 808791158a..13bddcc6ca 100644 --- a/server/src/com/vaadin/terminal/AbstractErrorMessage.java +++ b/server/src/com/vaadin/server/AbstractErrorMessage.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/server/src/com/vaadin/terminal/AbstractExtension.java b/server/src/com/vaadin/server/AbstractExtension.java index 8ac0ce01e3..5693d1a29f 100644 --- a/server/src/com/vaadin/terminal/AbstractExtension.java +++ b/server/src/com/vaadin/server/AbstractExtension.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import com.vaadin.terminal.gwt.server.ClientConnector; diff --git a/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java b/server/src/com/vaadin/server/AbstractJavaScriptExtension.java index c8700d12ab..20e2752801 100644 --- a/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java +++ b/server/src/com/vaadin/server/AbstractJavaScriptExtension.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import com.vaadin.shared.JavaScriptExtensionState; import com.vaadin.ui.JavaScriptFunction; diff --git a/server/src/com/vaadin/terminal/AbstractUIProvider.java b/server/src/com/vaadin/server/AbstractUIProvider.java index 5bb4d35b30..ba8e266eb2 100644 --- a/server/src/com/vaadin/terminal/AbstractUIProvider.java +++ b/server/src/com/vaadin/server/AbstractUIProvider.java @@ -14,7 +14,7 @@ * the License.
*/
-package com.vaadin.terminal;
+package com.vaadin.server;
import com.vaadin.Application;
import com.vaadin.ui.UI;
diff --git a/server/src/com/vaadin/terminal/ApplicationResource.java b/server/src/com/vaadin/server/ApplicationResource.java index 1d1444b774..b18886ed55 100644 --- a/server/src/com/vaadin/terminal/ApplicationResource.java +++ b/server/src/com/vaadin/server/ApplicationResource.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; diff --git a/server/src/com/vaadin/terminal/ClassResource.java b/server/src/com/vaadin/server/ClassResource.java index e4921f2413..4b4837faa3 100644 --- a/server/src/com/vaadin/terminal/ClassResource.java +++ b/server/src/com/vaadin/server/ClassResource.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; @@ -97,7 +97,7 @@ public class ClassResource implements ApplicationResource, Serializable { /** * Gets the MIME type of this resource. * - * @see com.vaadin.terminal.Resource#getMIMEType() + * @see com.vaadin.server.Resource#getMIMEType() */ @Override public String getMIMEType() { @@ -107,7 +107,7 @@ public class ClassResource implements ApplicationResource, Serializable { /** * Gets the application of this resource. * - * @see com.vaadin.terminal.ApplicationResource#getApplication() + * @see com.vaadin.server.ApplicationResource#getApplication() */ @Override public Application getApplication() { @@ -118,7 +118,7 @@ public class ClassResource implements ApplicationResource, Serializable { * Gets the virtual filename for this resource. * * @return the file name associated to this resource. - * @see com.vaadin.terminal.ApplicationResource#getFilename() + * @see com.vaadin.server.ApplicationResource#getFilename() */ @Override public String getFilename() { @@ -134,7 +134,7 @@ public class ClassResource implements ApplicationResource, Serializable { /** * Gets resource as stream. * - * @see com.vaadin.terminal.ApplicationResource#getStream() + * @see com.vaadin.server.ApplicationResource#getStream() */ @Override public DownloadStream getStream() { diff --git a/server/src/com/vaadin/terminal/CombinedRequest.java b/server/src/com/vaadin/server/CombinedRequest.java index 3d6c3c2149..a7a4040c35 100644 --- a/server/src/com/vaadin/terminal/CombinedRequest.java +++ b/server/src/com/vaadin/server/CombinedRequest.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.IOException; import java.io.InputStream; diff --git a/server/src/com/vaadin/terminal/CompositeErrorMessage.java b/server/src/com/vaadin/server/CompositeErrorMessage.java index e86102ae3b..f51ba559eb 100644 --- a/server/src/com/vaadin/terminal/CompositeErrorMessage.java +++ b/server/src/com/vaadin/server/CompositeErrorMessage.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.util.Collection; import java.util.Iterator; diff --git a/server/src/com/vaadin/terminal/DefaultUIProvider.java b/server/src/com/vaadin/server/DefaultUIProvider.java index 8713c45b31..913402c89f 100644 --- a/server/src/com/vaadin/terminal/DefaultUIProvider.java +++ b/server/src/com/vaadin/server/DefaultUIProvider.java @@ -14,7 +14,7 @@ * the License.
*/
-package com.vaadin.terminal;
+package com.vaadin.server;
import com.vaadin.Application;
import com.vaadin.UIRequiresMoreInformationException;
diff --git a/server/src/com/vaadin/terminal/DeploymentConfiguration.java b/server/src/com/vaadin/server/DeploymentConfiguration.java index 0cfbdb7544..d365c4ce18 100644 --- a/server/src/com/vaadin/terminal/DeploymentConfiguration.java +++ b/server/src/com/vaadin/server/DeploymentConfiguration.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; import java.util.Iterator; diff --git a/server/src/com/vaadin/terminal/DownloadStream.java b/server/src/com/vaadin/server/DownloadStream.java index 30810d5da4..5d3b083f1e 100644 --- a/server/src/com/vaadin/terminal/DownloadStream.java +++ b/server/src/com/vaadin/server/DownloadStream.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.IOException; import java.io.InputStream; diff --git a/server/src/com/vaadin/terminal/ErrorMessage.java b/server/src/com/vaadin/server/ErrorMessage.java index 15273efb6f..fcc481e826 100644 --- a/server/src/com/vaadin/terminal/ErrorMessage.java +++ b/server/src/com/vaadin/server/ErrorMessage.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; diff --git a/server/src/com/vaadin/terminal/Extension.java b/server/src/com/vaadin/server/Extension.java index 87901c3c13..cf0dad5d1a 100644 --- a/server/src/com/vaadin/terminal/Extension.java +++ b/server/src/com/vaadin/server/Extension.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import com.vaadin.terminal.gwt.server.ClientConnector; diff --git a/server/src/com/vaadin/terminal/ExternalResource.java b/server/src/com/vaadin/server/ExternalResource.java index d970c0934b..925b0589f3 100644 --- a/server/src/com/vaadin/terminal/ExternalResource.java +++ b/server/src/com/vaadin/server/ExternalResource.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; import java.net.URL; @@ -108,7 +108,7 @@ public class ExternalResource implements Resource, Serializable { /** * Gets the MIME type of the resource. * - * @see com.vaadin.terminal.Resource#getMIMEType() + * @see com.vaadin.server.Resource#getMIMEType() */ @Override public String getMIMEType() { diff --git a/server/src/com/vaadin/terminal/FileResource.java b/server/src/com/vaadin/server/FileResource.java index ab8bc95ce3..7b3f338b4f 100644 --- a/server/src/com/vaadin/terminal/FileResource.java +++ b/server/src/com/vaadin/server/FileResource.java @@ -14,15 +14,15 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import com.vaadin.Application; +import com.vaadin.server.Terminal.ErrorEvent; import com.vaadin.service.FileTypeResolver; -import com.vaadin.terminal.Terminal.ErrorEvent; /** * <code>FileResources</code> are files or directories on local filesystem. The @@ -69,7 +69,7 @@ public class FileResource implements ApplicationResource { /** * Gets the resource as stream. * - * @see com.vaadin.terminal.ApplicationResource#getStream() + * @see com.vaadin.server.ApplicationResource#getStream() */ @Override public DownloadStream getStream() { @@ -116,7 +116,7 @@ public class FileResource implements ApplicationResource { } /** - * @see com.vaadin.terminal.ApplicationResource#getApplication() + * @see com.vaadin.server.ApplicationResource#getApplication() */ @Override public Application getApplication() { @@ -124,7 +124,7 @@ public class FileResource implements ApplicationResource { } /** - * @see com.vaadin.terminal.ApplicationResource#getFilename() + * @see com.vaadin.server.ApplicationResource#getFilename() */ @Override public String getFilename() { @@ -132,7 +132,7 @@ public class FileResource implements ApplicationResource { } /** - * @see com.vaadin.terminal.Resource#getMIMEType() + * @see com.vaadin.server.Resource#getMIMEType() */ @Override public String getMIMEType() { diff --git a/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java b/server/src/com/vaadin/server/JavaScriptCallbackHelper.java index 17fa2cbd32..19b19ce824 100644 --- a/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java +++ b/server/src/com/vaadin/server/JavaScriptCallbackHelper.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/server/src/com/vaadin/terminal/KeyMapper.java b/server/src/com/vaadin/server/KeyMapper.java index cf54af545f..86714cfc66 100644 --- a/server/src/com/vaadin/terminal/KeyMapper.java +++ b/server/src/com/vaadin/server/KeyMapper.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; import java.util.HashMap; diff --git a/server/src/com/vaadin/terminal/LegacyPaint.java b/server/src/com/vaadin/server/LegacyPaint.java index 3db0f52079..a5e16bb24b 100644 --- a/server/src/com/vaadin/terminal/LegacyPaint.java +++ b/server/src/com/vaadin/server/LegacyPaint.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; -import com.vaadin.terminal.PaintTarget.PaintStatus; +import com.vaadin.server.PaintTarget.PaintStatus; import com.vaadin.ui.Component; import com.vaadin.ui.HasComponents; diff --git a/server/src/com/vaadin/terminal/Page.java b/server/src/com/vaadin/server/Page.java index 66ef7da296..4cb9a1291e 100644 --- a/server/src/com/vaadin/terminal/Page.java +++ b/server/src/com/vaadin/server/Page.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; import java.lang.reflect.Method; @@ -24,10 +24,10 @@ import java.util.LinkedList; import java.util.List; import com.vaadin.event.EventRouter; +import com.vaadin.server.WrappedRequest.BrowserDetails; import com.vaadin.shared.ui.BorderStyle; import com.vaadin.shared.ui.ui.PageClientRpc; import com.vaadin.shared.ui.ui.UIConstants; -import com.vaadin.terminal.WrappedRequest.BrowserDetails; import com.vaadin.terminal.gwt.server.WebApplicationContext; import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.tools.ReflectTools; diff --git a/server/src/com/vaadin/terminal/PaintException.java b/server/src/com/vaadin/server/PaintException.java index dd5752653a..5d6f7b1d58 100644 --- a/server/src/com/vaadin/terminal/PaintException.java +++ b/server/src/com/vaadin/server/PaintException.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.IOException; import java.io.Serializable; diff --git a/server/src/com/vaadin/terminal/PaintTarget.java b/server/src/com/vaadin/server/PaintTarget.java index fd349310f6..e50fac1cb4 100644 --- a/server/src/com/vaadin/terminal/PaintTarget.java +++ b/server/src/com/vaadin/server/PaintTarget.java @@ -14,12 +14,12 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; import java.util.Map; -import com.vaadin.terminal.StreamVariable.StreamingStartEvent; +import com.vaadin.server.StreamVariable.StreamingStartEvent; import com.vaadin.terminal.gwt.server.ClientConnector; import com.vaadin.ui.Component; diff --git a/server/src/com/vaadin/terminal/RequestHandler.java b/server/src/com/vaadin/server/RequestHandler.java index 2ea02487b1..fcc506cc54 100644 --- a/server/src/com/vaadin/terminal/RequestHandler.java +++ b/server/src/com/vaadin/server/RequestHandler.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.IOException; import java.io.Serializable; diff --git a/server/src/com/vaadin/terminal/Resource.java b/server/src/com/vaadin/server/Resource.java index 27adb16869..fa1e040929 100644 --- a/server/src/com/vaadin/terminal/Resource.java +++ b/server/src/com/vaadin/server/Resource.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; diff --git a/server/src/com/vaadin/terminal/Scrollable.java b/server/src/com/vaadin/server/Scrollable.java index 641b20ab34..ca89d598c5 100644 --- a/server/src/com/vaadin/terminal/Scrollable.java +++ b/server/src/com/vaadin/server/Scrollable.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; diff --git a/server/src/com/vaadin/terminal/Sizeable.java b/server/src/com/vaadin/server/Sizeable.java index d8d0b0e043..36562a059d 100644 --- a/server/src/com/vaadin/terminal/Sizeable.java +++ b/server/src/com/vaadin/server/Sizeable.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; diff --git a/server/src/com/vaadin/terminal/StreamResource.java b/server/src/com/vaadin/server/StreamResource.java index bbb58c71e2..443831129f 100644 --- a/server/src/com/vaadin/terminal/StreamResource.java +++ b/server/src/com/vaadin/server/StreamResource.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.InputStream; import java.io.Serializable; @@ -87,7 +87,7 @@ public class StreamResource implements ApplicationResource { } /** - * @see com.vaadin.terminal.Resource#getMIMEType() + * @see com.vaadin.server.Resource#getMIMEType() */ @Override public String getMIMEType() { @@ -150,7 +150,7 @@ public class StreamResource implements ApplicationResource { } /** - * @see com.vaadin.terminal.ApplicationResource#getApplication() + * @see com.vaadin.server.ApplicationResource#getApplication() */ @Override public Application getApplication() { @@ -158,7 +158,7 @@ public class StreamResource implements ApplicationResource { } /** - * @see com.vaadin.terminal.ApplicationResource#getStream() + * @see com.vaadin.server.ApplicationResource#getStream() */ @Override public DownloadStream getStream() { diff --git a/server/src/com/vaadin/terminal/StreamVariable.java b/server/src/com/vaadin/server/StreamVariable.java index 53f398f09c..f289e7612a 100644 --- a/server/src/com/vaadin/terminal/StreamVariable.java +++ b/server/src/com/vaadin/server/StreamVariable.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.OutputStream; import java.io.Serializable; import com.vaadin.Application; -import com.vaadin.terminal.StreamVariable.StreamingEndEvent; -import com.vaadin.terminal.StreamVariable.StreamingErrorEvent; -import com.vaadin.terminal.StreamVariable.StreamingStartEvent; +import com.vaadin.server.StreamVariable.StreamingEndEvent; +import com.vaadin.server.StreamVariable.StreamingErrorEvent; +import com.vaadin.server.StreamVariable.StreamingStartEvent; /** * StreamVariable is a special kind of variable whose value is streamed to an @@ -152,7 +152,7 @@ public interface StreamVariable extends Serializable { * the streaming ended before the end of the input. The streaming may fail * due an interruption by {@link } or due an other unknown exception in * communication. In the latter case the exception is also passed to - * {@link Application#terminalError(com.vaadin.terminal.Terminal.ErrorEvent)} + * {@link Application#terminalError(com.vaadin.server.Terminal.ErrorEvent)} * . */ public interface StreamingErrorEvent extends StreamingEvent { diff --git a/server/src/com/vaadin/terminal/SystemError.java b/server/src/com/vaadin/server/SystemError.java index c4cb7eef0c..453be4f632 100644 --- a/server/src/com/vaadin/terminal/SystemError.java +++ b/server/src/com/vaadin/server/SystemError.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; diff --git a/server/src/com/vaadin/terminal/Terminal.java b/server/src/com/vaadin/server/Terminal.java index a02bcb50bb..265668aa42 100644 --- a/server/src/com/vaadin/terminal/Terminal.java +++ b/server/src/com/vaadin/server/Terminal.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; diff --git a/server/src/com/vaadin/terminal/ThemeResource.java b/server/src/com/vaadin/server/ThemeResource.java index 61fe157ee6..7ae0bab828 100644 --- a/server/src/com/vaadin/terminal/ThemeResource.java +++ b/server/src/com/vaadin/server/ThemeResource.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import com.vaadin.service.FileTypeResolver; @@ -97,7 +97,7 @@ public class ThemeResource implements Resource { } /** - * @see com.vaadin.terminal.Resource#getMIMEType() + * @see com.vaadin.server.Resource#getMIMEType() */ @Override public String getMIMEType() { diff --git a/server/src/com/vaadin/terminal/UIProvider.java b/server/src/com/vaadin/server/UIProvider.java index 27b63fbcac..e06b80c62f 100644 --- a/server/src/com/vaadin/terminal/UIProvider.java +++ b/server/src/com/vaadin/server/UIProvider.java @@ -14,7 +14,7 @@ * the License.
*/
-package com.vaadin.terminal;
+package com.vaadin.server;
import com.vaadin.Application;
import com.vaadin.UIRequiresMoreInformationException;
diff --git a/server/src/com/vaadin/terminal/UserError.java b/server/src/com/vaadin/server/UserError.java index 18680f912f..756f2e70e0 100644 --- a/server/src/com/vaadin/terminal/UserError.java +++ b/server/src/com/vaadin/server/UserError.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; /** * <code>UserError</code> is a controlled error occurred in application. User diff --git a/server/src/com/vaadin/terminal/Vaadin6Component.java b/server/src/com/vaadin/server/Vaadin6Component.java index eb169c90f9..00889df14a 100644 --- a/server/src/com/vaadin/terminal/Vaadin6Component.java +++ b/server/src/com/vaadin/server/Vaadin6Component.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.util.EventListener; diff --git a/server/src/com/vaadin/terminal/VariableOwner.java b/server/src/com/vaadin/server/VariableOwner.java index faa0298311..4c6c86669c 100644 --- a/server/src/com/vaadin/terminal/VariableOwner.java +++ b/server/src/com/vaadin/server/VariableOwner.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.Serializable; import java.util.Map; diff --git a/server/src/com/vaadin/terminal/WrappedRequest.java b/server/src/com/vaadin/server/WrappedRequest.java index 343a60848e..d012d572ea 100644 --- a/server/src/com/vaadin/terminal/WrappedRequest.java +++ b/server/src/com/vaadin/server/WrappedRequest.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.IOException; import java.io.InputStream; diff --git a/server/src/com/vaadin/terminal/WrappedResponse.java b/server/src/com/vaadin/server/WrappedResponse.java index 02daaa1bdd..c8d9342418 100644 --- a/server/src/com/vaadin/terminal/WrappedResponse.java +++ b/server/src/com/vaadin/server/WrappedResponse.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal; +package com.vaadin.server; import java.io.IOException; import java.io.OutputStream; diff --git a/server/src/com/vaadin/terminal/package.html b/server/src/com/vaadin/server/package.html index 83514a0de5..83514a0de5 100644 --- a/server/src/com/vaadin/terminal/package.html +++ b/server/src/com/vaadin/server/package.html diff --git a/server/src/com/vaadin/service/ApplicationContext.java b/server/src/com/vaadin/service/ApplicationContext.java index 55495dcd5c..aaf5d1b386 100644 --- a/server/src/com/vaadin/service/ApplicationContext.java +++ b/server/src/com/vaadin/service/ApplicationContext.java @@ -22,7 +22,7 @@ import java.net.URL; import java.util.Collection; import com.vaadin.Application; -import com.vaadin.terminal.ApplicationResource; +import com.vaadin.server.ApplicationResource; import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; /** diff --git a/server/src/com/vaadin/service/FileTypeResolver.java b/server/src/com/vaadin/service/FileTypeResolver.java index 2b289d6752..4b1c8697eb 100644 --- a/server/src/com/vaadin/service/FileTypeResolver.java +++ b/server/src/com/vaadin/service/FileTypeResolver.java @@ -23,8 +23,8 @@ import java.util.Hashtable; import java.util.Map; import java.util.StringTokenizer; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; /** * Utility class that can figure out mime-types and icons related to files. diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java index 345f462239..47b9e97648 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java @@ -57,10 +57,10 @@ import com.vaadin.Application; import com.vaadin.Application.ApplicationStartEvent; import com.vaadin.Application.SystemMessages; import com.vaadin.UIRequiresMoreInformationException; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.Terminal; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.Terminal; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback; import com.vaadin.ui.UI; diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index 13fd869166..c92dfddd3b 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -49,12 +49,12 @@ import javax.servlet.http.HttpSession; import com.vaadin.Application; import com.vaadin.Application.ApplicationStartEvent; import com.vaadin.Application.SystemMessages; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.Terminal; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; import com.vaadin.shared.ApplicationConstants; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.Terminal; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback; import com.vaadin.ui.UI; diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index 47923a1374..d4c1cfb157 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -66,6 +66,21 @@ import com.vaadin.annotations.StyleSheet; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; +import com.vaadin.server.AbstractClientConnector; +import com.vaadin.server.CombinedRequest; +import com.vaadin.server.LegacyPaint; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.StreamVariable; +import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.VariableOwner; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; +import com.vaadin.server.StreamVariable.StreamingEndEvent; +import com.vaadin.server.StreamVariable.StreamingErrorEvent; +import com.vaadin.server.Terminal.ErrorEvent; +import com.vaadin.server.Terminal.ErrorListener; import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.Connector; import com.vaadin.shared.JavaScriptConnectorState; @@ -75,21 +90,6 @@ import com.vaadin.shared.communication.MethodInvocation; import com.vaadin.shared.communication.SharedState; import com.vaadin.shared.communication.UidlValue; import com.vaadin.shared.ui.ui.UIConstants; -import com.vaadin.terminal.AbstractClientConnector; -import com.vaadin.terminal.CombinedRequest; -import com.vaadin.terminal.LegacyPaint; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.StreamVariable; -import com.vaadin.terminal.StreamVariable.StreamingEndEvent; -import com.vaadin.terminal.StreamVariable.StreamingErrorEvent; -import com.vaadin.terminal.Terminal.ErrorEvent; -import com.vaadin.terminal.Terminal.ErrorListener; -import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.VariableOwner; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; import com.vaadin.terminal.gwt.server.BootstrapHandler.BootstrapContext; import com.vaadin.terminal.gwt.server.ComponentSizeValidator.InvalidLayout; import com.vaadin.terminal.gwt.server.RpcManager.RpcInvocationException; diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java b/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java index 4052f5a400..ab85214d25 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java @@ -22,7 +22,7 @@ import java.util.Properties; import java.util.ServiceLoader; import java.util.logging.Logger; -import com.vaadin.terminal.DeploymentConfiguration; +import com.vaadin.server.DeploymentConfiguration; public abstract class AbstractDeploymentConfiguration implements DeploymentConfiguration { diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java b/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java index ec2aa84947..4ee309576b 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java @@ -15,7 +15,7 @@ */ package com.vaadin.terminal.gwt.server; -import com.vaadin.terminal.StreamVariable.StreamingEvent; +import com.vaadin.server.StreamVariable.StreamingEvent; /** * Abstract base class for StreamingEvent implementations. diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java index d857eeef4a..29a2bcf72f 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java @@ -34,9 +34,9 @@ import javax.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingListener; import com.vaadin.Application; +import com.vaadin.server.ApplicationResource; import com.vaadin.service.ApplicationContext; import com.vaadin.shared.ApplicationConstants; -import com.vaadin.terminal.ApplicationResource; /** * Base class for web application contexts (including portlet contexts) that diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java b/server/src/com/vaadin/terminal/gwt/server/AddonContext.java index 2af22c560b..03f1d95a56 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java +++ b/server/src/com/vaadin/terminal/gwt/server/AddonContext.java @@ -24,7 +24,7 @@ import java.util.ServiceLoader; import com.vaadin.Application; import com.vaadin.event.EventRouter; -import com.vaadin.terminal.DeploymentConfiguration; +import com.vaadin.server.DeploymentConfiguration; import com.vaadin.tools.ReflectTools; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java index d5c0d604c3..397c8e7369 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java +++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java @@ -23,11 +23,11 @@ import java.util.regex.Pattern; import javax.servlet.http.HttpServletResponse; import com.vaadin.Application; -import com.vaadin.terminal.ApplicationResource; -import com.vaadin.terminal.DownloadStream; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.ApplicationResource; +import com.vaadin.server.DownloadStream; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; public class ApplicationResourceHandler implements RequestHandler { private static final Pattern APP_RESOURCE_PATTERN = Pattern diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java index 857c7c738c..6765958369 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java +++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java @@ -20,7 +20,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import com.vaadin.Application; -import com.vaadin.terminal.DefaultUIProvider; +import com.vaadin.server.DefaultUIProvider; import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java index 6f69086523..ff26a1270a 100644 --- a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java +++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java @@ -21,7 +21,7 @@ import java.util.List; import org.jsoup.nodes.Node; import com.vaadin.Application; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; /** * A representation of a bootstrap fragment being generated. The bootstrap diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java index 02005e8d22..94328b47bf 100644 --- a/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java +++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java @@ -40,14 +40,14 @@ import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.PaintException; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.Version; import com.vaadin.shared.ui.ui.UIConstants; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; import com.vaadin.ui.UI; public abstract class BootstrapHandler implements RequestHandler { diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java index 847578ef97..1d244a69be 100644 --- a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java +++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java @@ -21,8 +21,8 @@ import java.util.Map; import org.jsoup.nodes.Document; import com.vaadin.Application; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; /** * A representation of a bootstrap page being generated. The bootstrap page diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java index a422cba345..bc2fdb0dd2 100644 --- a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java +++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java @@ -20,7 +20,7 @@ import java.util.EventObject; import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java b/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java index c2fbbe37d4..152acf9d2b 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java +++ b/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java @@ -20,10 +20,10 @@ import java.util.List; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; +import com.vaadin.server.AbstractClientConnector; +import com.vaadin.server.Extension; import com.vaadin.shared.Connector; import com.vaadin.shared.communication.SharedState; -import com.vaadin.terminal.AbstractClientConnector; -import com.vaadin.terminal.Extension; import com.vaadin.ui.Component; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.UI; diff --git a/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java index 7551e849a1..93a2ede4ce 100644 --- a/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java +++ b/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java @@ -23,8 +23,8 @@ import javax.servlet.ServletContext; import com.vaadin.Application; import com.vaadin.external.json.JSONException; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.PaintException; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java index 2349be1974..b8a116b1ad 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java +++ b/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java @@ -28,7 +28,7 @@ import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; -import com.vaadin.terminal.Sizeable.Unit; +import com.vaadin.server.Sizeable.Unit; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.AbstractSplitPanel; import com.vaadin.ui.Component; diff --git a/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java index 0106f466fc..ff5cedd656 100644 --- a/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java +++ b/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java @@ -33,12 +33,12 @@ import com.vaadin.event.dd.TargetDetailsImpl; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; +import com.vaadin.server.Extension; +import com.vaadin.server.PaintException; +import com.vaadin.server.VariableOwner; import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.communication.SharedState; import com.vaadin.shared.ui.dd.DragEventType; -import com.vaadin.terminal.Extension; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.VariableOwner; import com.vaadin.ui.Component; import com.vaadin.ui.UI; diff --git a/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java b/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java index 22467a0c1a..3b5eb9b42f 100644 --- a/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java +++ b/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java @@ -23,8 +23,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.vaadin.Application; +import com.vaadin.server.Terminal; import com.vaadin.service.ApplicationContext.TransactionListener; -import com.vaadin.terminal.Terminal; /** * {@link Application} that implements this interface gets notified of request diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java index cfc3cc7e7e..e7efd28a9c 100644 --- a/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java +++ b/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java @@ -27,11 +27,11 @@ import java.util.Stack; import java.util.Vector; import java.util.logging.Logger; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.StreamVariable; -import com.vaadin.terminal.VariableOwner; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; +import com.vaadin.server.StreamVariable; +import com.vaadin.server.VariableOwner; import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; import com.vaadin.ui.CustomLayout; @@ -589,7 +589,7 @@ public class JsonPaintTarget implements PaintTarget { * @throws PaintException * if the paint operation failed. * - * @see com.vaadin.terminal.PaintTarget#addXMLSection(String, String, + * @see com.vaadin.server.PaintTarget#addXMLSection(String, String, * String) */ diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java index 3e0f8d6b99..b10e661fb3 100644 --- a/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java +++ b/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java @@ -45,7 +45,7 @@ import javax.servlet.http.HttpSessionBindingListener; import javax.xml.namespace.QName; import com.vaadin.Application; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java index e127425786..a2aa446ac7 100644 --- a/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java +++ b/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java @@ -29,11 +29,11 @@ import javax.portlet.ResourceURL; import com.vaadin.Application; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.PaintException; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; import com.vaadin.shared.ApplicationConstants; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java b/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java index f7b6421e11..5647606a75 100644 --- a/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java +++ b/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java @@ -22,8 +22,8 @@ import javax.portlet.PortletResponse; import javax.servlet.Filter; import com.vaadin.Application; +import com.vaadin.server.Terminal; import com.vaadin.service.ApplicationContext.TransactionListener; -import com.vaadin.terminal.Terminal; /** * An {@link Application} that implements this interface gets notified of diff --git a/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java b/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java index a1d5731f7d..98aa61a885 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java +++ b/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java @@ -16,11 +16,11 @@ package com.vaadin.terminal.gwt.server; import com.vaadin.Application; +import com.vaadin.server.ApplicationResource; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.shared.communication.URLReference; -import com.vaadin.terminal.ApplicationResource; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; public class ResourceReference extends URLReference { diff --git a/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java b/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java index 1a3cf28fcc..0bdb141b6f 100644 --- a/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java +++ b/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java @@ -18,7 +18,7 @@ package com.vaadin.terminal.gwt.server; import java.io.Serializable; -import com.vaadin.terminal.VariableOwner; +import com.vaadin.server.VariableOwner; /** * Marker interface for server side classes that can receive RPC calls. diff --git a/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java b/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java index 1d35785a57..cb95eada22 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java +++ b/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java @@ -3,9 +3,9 @@ package com.vaadin.terminal.gwt.server; import java.io.Serializable; import com.vaadin.Application; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.WrappedRequest; import com.vaadin.shared.ApplicationConstants; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.WrappedRequest; import com.vaadin.ui.UI; /* diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java index 6bc9f8fbd9..a484705ca5 100644 --- a/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java +++ b/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java @@ -15,7 +15,7 @@ */ package com.vaadin.terminal.gwt.server; -import com.vaadin.terminal.StreamVariable.StreamingEndEvent; +import com.vaadin.server.StreamVariable.StreamingEndEvent; @SuppressWarnings("serial") final class StreamingEndEventImpl extends AbstractStreamingEvent implements diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java index cf9339d676..8e794b5fbf 100644 --- a/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java +++ b/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java @@ -15,7 +15,7 @@ */ package com.vaadin.terminal.gwt.server; -import com.vaadin.terminal.StreamVariable.StreamingErrorEvent; +import com.vaadin.server.StreamVariable.StreamingErrorEvent; @SuppressWarnings("serial") final class StreamingErrorEventImpl extends AbstractStreamingEvent implements diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java index bcb114db60..14d0ed4f3a 100644 --- a/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java +++ b/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java @@ -15,7 +15,7 @@ */ package com.vaadin.terminal.gwt.server; -import com.vaadin.terminal.StreamVariable.StreamingProgressEvent; +import com.vaadin.server.StreamVariable.StreamingProgressEvent; @SuppressWarnings("serial") final class StreamingProgressEventImpl extends AbstractStreamingEvent implements diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java index 07ff6cf7b1..51c286549d 100644 --- a/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java +++ b/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java @@ -15,7 +15,7 @@ */ package com.vaadin.terminal.gwt.server; -import com.vaadin.terminal.StreamVariable.StreamingStartEvent; +import com.vaadin.server.StreamVariable.StreamingStartEvent; @SuppressWarnings("serial") final class StreamingStartEventImpl extends AbstractStreamingEvent implements diff --git a/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java b/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java index 22e46cb722..b30133191d 100644 --- a/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java +++ b/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java @@ -19,9 +19,9 @@ import java.io.IOException; import java.io.Writer; import com.vaadin.Application; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; /** * A {@link RequestHandler} that presents an informative page if the browser in diff --git a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java index 37bc81cfcf..25193b5cbe 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java +++ b/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java @@ -19,8 +19,8 @@ package com.vaadin.terminal.gwt.server; import java.util.Date; import java.util.Locale; +import com.vaadin.server.WrappedRequest; import com.vaadin.shared.VBrowserDetails; -import com.vaadin.terminal.WrappedRequest; /** * Class that provides information about the web browser the user is using. diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java index a64be4c163..6b69a125a2 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java +++ b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java @@ -20,9 +20,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import com.vaadin.Application; -import com.vaadin.terminal.CombinedRequest; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.CombinedRequest; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.WrappedRequest; /** * Wrapper for {@link HttpServletRequest}. diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java index 237bb643ee..c2e8ed1416 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java +++ b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java @@ -19,8 +19,8 @@ package com.vaadin.terminal.gwt.server; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.WrappedResponse; /** * Wrapper for {@link HttpServletResponse}. diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java index 9ac2e5a608..80d6f9571e 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java +++ b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java @@ -26,10 +26,10 @@ import javax.portlet.PortletRequest; import javax.portlet.ResourceRequest; import com.vaadin.Application; +import com.vaadin.server.CombinedRequest; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.WrappedRequest; import com.vaadin.shared.ApplicationConstants; -import com.vaadin.terminal.CombinedRequest; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.WrappedRequest; /** * Wrapper for {@link PortletRequest} and its subclasses. diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java index 39ccacd331..584c304eaa 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java +++ b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java @@ -29,8 +29,8 @@ import javax.portlet.MimeResponse; import javax.portlet.PortletResponse; import javax.portlet.ResourceResponse; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.WrappedResponse; /** * Wrapper for {@link PortletResponse} and its subclasses. diff --git a/server/src/com/vaadin/ui/AbsoluteLayout.java b/server/src/com/vaadin/ui/AbsoluteLayout.java index 56bbd19852..412a3390e4 100644 --- a/server/src/com/vaadin/ui/AbsoluteLayout.java +++ b/server/src/com/vaadin/ui/AbsoluteLayout.java @@ -24,12 +24,12 @@ import java.util.Map; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.LayoutEvents.LayoutClickNotifier; +import com.vaadin.server.Sizeable; import com.vaadin.shared.Connector; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutServerRpc; import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutState; -import com.vaadin.terminal.Sizeable; /** * AbsoluteLayout is a layout implementation that mimics html absolute diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java index 33ba80656d..d651755a2a 100644 --- a/server/src/com/vaadin/ui/AbstractComponent.java +++ b/server/src/com/vaadin/ui/AbstractComponent.java @@ -32,11 +32,11 @@ import com.vaadin.event.ActionManager; import com.vaadin.event.EventRouter; import com.vaadin.event.MethodEventSource; import com.vaadin.event.ShortcutListener; +import com.vaadin.server.AbstractClientConnector; +import com.vaadin.server.ErrorMessage; +import com.vaadin.server.Resource; +import com.vaadin.server.Terminal; import com.vaadin.shared.ComponentState; -import com.vaadin.terminal.AbstractClientConnector; -import com.vaadin.terminal.ErrorMessage; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.Terminal; import com.vaadin.terminal.gwt.server.ClientConnector; import com.vaadin.terminal.gwt.server.ComponentSizeValidator; import com.vaadin.terminal.gwt.server.ResourceReference; @@ -1072,7 +1072,7 @@ public abstract class AbstractComponent extends AbstractClientConnector /* * (non-Javadoc) * - * @see com.vaadin.terminal.Sizeable#getHeight() + * @see com.vaadin.Sizeable#getHeight() */ @Override public float getHeight() { @@ -1082,7 +1082,7 @@ public abstract class AbstractComponent extends AbstractClientConnector /* * (non-Javadoc) * - * @see com.vaadin.terminal.Sizeable#getHeightUnits() + * @see com.vaadin.server.Sizeable#getHeightUnits() */ @Override public Unit getHeightUnits() { @@ -1092,7 +1092,7 @@ public abstract class AbstractComponent extends AbstractClientConnector /* * (non-Javadoc) * - * @see com.vaadin.terminal.Sizeable#getWidth() + * @see com.vaadin.server.Sizeable#getWidth() */ @Override public float getWidth() { @@ -1102,7 +1102,7 @@ public abstract class AbstractComponent extends AbstractClientConnector /* * (non-Javadoc) * - * @see com.vaadin.terminal.Sizeable#getWidthUnits() + * @see com.vaadin.server.Sizeable#getWidthUnits() */ @Override public Unit getWidthUnits() { @@ -1112,7 +1112,7 @@ public abstract class AbstractComponent extends AbstractClientConnector /* * (non-Javadoc) * - * @see com.vaadin.terminal.Sizeable#setHeight(float, Unit) + * @see com.vaadin.server.Sizeable#setHeight(float, Unit) */ @Override public void setHeight(float height, Unit unit) { @@ -1128,7 +1128,7 @@ public abstract class AbstractComponent extends AbstractClientConnector /* * (non-Javadoc) * - * @see com.vaadin.terminal.Sizeable#setSizeFull() + * @see com.vaadin.server.Sizeable#setSizeFull() */ @Override public void setSizeFull() { @@ -1139,7 +1139,7 @@ public abstract class AbstractComponent extends AbstractClientConnector /* * (non-Javadoc) * - * @see com.vaadin.terminal.Sizeable#setSizeUndefined() + * @see com.vaadin.server.Sizeable#setSizeUndefined() */ @Override public void setSizeUndefined() { @@ -1150,7 +1150,7 @@ public abstract class AbstractComponent extends AbstractClientConnector /* * (non-Javadoc) * - * @see com.vaadin.terminal.Sizeable#setWidth(float, Unit) + * @see com.vaadin.server.Sizeable#setWidth(float, Unit) */ @Override public void setWidth(float width, Unit unit) { @@ -1166,7 +1166,7 @@ public abstract class AbstractComponent extends AbstractClientConnector /* * (non-Javadoc) * - * @see com.vaadin.terminal.Sizeable#setWidth(java.lang.String) + * @see com.vaadin.server.Sizeable#setWidth(java.lang.String) */ @Override public void setWidth(String width) { @@ -1181,7 +1181,7 @@ public abstract class AbstractComponent extends AbstractClientConnector /* * (non-Javadoc) * - * @see com.vaadin.terminal.Sizeable#setHeight(java.lang.String) + * @see com.vaadin.server.Sizeable#setHeight(java.lang.String) */ @Override public void setHeight(String height) { diff --git a/server/src/com/vaadin/ui/AbstractEmbedded.java b/server/src/com/vaadin/ui/AbstractEmbedded.java index 9396af5c44..de44c89656 100644 --- a/server/src/com/vaadin/ui/AbstractEmbedded.java +++ b/server/src/com/vaadin/ui/AbstractEmbedded.java @@ -4,8 +4,8 @@ package com.vaadin.ui; +import com.vaadin.server.Resource; import com.vaadin.shared.ui.AbstractEmbeddedState; -import com.vaadin.terminal.Resource; import com.vaadin.terminal.gwt.server.ResourceReference; /** diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java index 5123d08da9..eaedfa5809 100644 --- a/server/src/com/vaadin/ui/AbstractField.java +++ b/server/src/com/vaadin/ui/AbstractField.java @@ -37,10 +37,10 @@ import com.vaadin.data.util.converter.ConverterUtil; import com.vaadin.event.Action; import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutListener; +import com.vaadin.server.AbstractErrorMessage; +import com.vaadin.server.CompositeErrorMessage; +import com.vaadin.server.ErrorMessage; import com.vaadin.shared.AbstractFieldState; -import com.vaadin.terminal.AbstractErrorMessage; -import com.vaadin.terminal.CompositeErrorMessage; -import com.vaadin.terminal.ErrorMessage; /** * <p> diff --git a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java index bd5735144e..3b80ac1f68 100644 --- a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java +++ b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java @@ -15,8 +15,8 @@ */ package com.vaadin.ui; +import com.vaadin.server.JavaScriptCallbackHelper; import com.vaadin.shared.ui.JavaScriptComponentState; -import com.vaadin.terminal.JavaScriptCallbackHelper; /** * Base class for Components with all client-side logic implemented using diff --git a/server/src/com/vaadin/ui/AbstractMedia.java b/server/src/com/vaadin/ui/AbstractMedia.java index 77c12ac045..f26fe714b9 100644 --- a/server/src/com/vaadin/ui/AbstractMedia.java +++ b/server/src/com/vaadin/ui/AbstractMedia.java @@ -19,10 +19,10 @@ package com.vaadin.ui; import java.util.ArrayList; import java.util.List; +import com.vaadin.server.Resource; import com.vaadin.shared.communication.URLReference; import com.vaadin.shared.ui.AbstractMediaState; import com.vaadin.shared.ui.MediaControl; -import com.vaadin.terminal.Resource; import com.vaadin.terminal.gwt.server.ResourceReference; /** diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java index 596bbb7ee2..53572097e0 100644 --- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java +++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java @@ -22,6 +22,7 @@ import java.util.LinkedList; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.LayoutEvents.LayoutClickNotifier; +import com.vaadin.server.Sizeable; import com.vaadin.shared.Connector; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; @@ -29,7 +30,6 @@ import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutServerRpc; import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState; import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState.ChildComponentData; -import com.vaadin.terminal.Sizeable; @SuppressWarnings("serial") public abstract class AbstractOrderedLayout extends AbstractLayout implements diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java index 21ff7ba948..05169552d7 100644 --- a/server/src/com/vaadin/ui/AbstractSelect.java +++ b/server/src/com/vaadin/ui/AbstractSelect.java @@ -39,12 +39,12 @@ import com.vaadin.event.dd.TargetDetailsImpl; import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion; import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor; import com.vaadin.event.dd.acceptcriteria.TargetDetailIs; +import com.vaadin.server.KeyMapper; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.ui.dd.VerticalDropLocation; -import com.vaadin.terminal.KeyMapper; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.Vaadin6Component; import com.vaadin.ui.AbstractSelect.ItemCaptionMode; /** diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java index 8b7499115c..f9fea66276 100644 --- a/server/src/com/vaadin/ui/AbstractSplitPanel.java +++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java @@ -22,12 +22,12 @@ import java.util.Iterator; import com.vaadin.event.ComponentEventListener; import com.vaadin.event.MouseEvents.ClickEvent; +import com.vaadin.server.Sizeable; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelRpc; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState.SplitterState; -import com.vaadin.terminal.Sizeable; import com.vaadin.tools.ReflectTools; /** diff --git a/server/src/com/vaadin/ui/AbstractTextField.java b/server/src/com/vaadin/ui/AbstractTextField.java index 1bd61023a4..94a32dac96 100644 --- a/server/src/com/vaadin/ui/AbstractTextField.java +++ b/server/src/com/vaadin/ui/AbstractTextField.java @@ -27,11 +27,11 @@ import com.vaadin.event.FieldEvents.FocusNotifier; import com.vaadin.event.FieldEvents.TextChangeEvent; import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.event.FieldEvents.TextChangeNotifier; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.ui.textfield.AbstractTextFieldState; import com.vaadin.shared.ui.textfield.TextFieldConstants; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Vaadin6Component; public abstract class AbstractTextField extends AbstractField<String> implements BlurNotifier, FocusNotifier, TextChangeNotifier, Vaadin6Component { diff --git a/server/src/com/vaadin/ui/Audio.java b/server/src/com/vaadin/ui/Audio.java index 03ed7ba6d5..d111c0c74c 100644 --- a/server/src/com/vaadin/ui/Audio.java +++ b/server/src/com/vaadin/ui/Audio.java @@ -16,7 +16,7 @@ package com.vaadin.ui; -import com.vaadin.terminal.Resource; +import com.vaadin.server.Resource; /** * The Audio component translates into an HTML5 <audio> element and as diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java index af19ca5b96..9cc4caa7c3 100644 --- a/server/src/com/vaadin/ui/ComboBox.java +++ b/server/src/com/vaadin/ui/ComboBox.java @@ -19,9 +19,9 @@ package com.vaadin.ui; import java.util.Collection; import com.vaadin.data.Container; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.combobox.ComboBoxConstants; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; /** * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's diff --git a/server/src/com/vaadin/ui/Component.java b/server/src/com/vaadin/ui/Component.java index f0993aac6d..5f9a093366 100644 --- a/server/src/com/vaadin/ui/Component.java +++ b/server/src/com/vaadin/ui/Component.java @@ -23,10 +23,10 @@ import java.util.Locale; import com.vaadin.Application; import com.vaadin.event.FieldEvents; -import com.vaadin.terminal.ErrorMessage; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.Sizeable; -import com.vaadin.terminal.VariableOwner; +import com.vaadin.server.ErrorMessage; +import com.vaadin.server.Resource; +import com.vaadin.server.Sizeable; +import com.vaadin.server.VariableOwner; import com.vaadin.terminal.gwt.server.ClientConnector; /** @@ -463,7 +463,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * * <p> * The image is loaded by the browser from a resource, typically a - * {@link com.vaadin.terminal.ThemeResource}. + * {@link com.vaadin.server.ThemeResource}. * </p> * * <pre> diff --git a/server/src/com/vaadin/ui/ConnectorTracker.java b/server/src/com/vaadin/ui/ConnectorTracker.java index ad62b90211..e8f7b5e8c7 100644 --- a/server/src/com/vaadin/ui/ConnectorTracker.java +++ b/server/src/com/vaadin/ui/ConnectorTracker.java @@ -25,7 +25,7 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import com.vaadin.terminal.AbstractClientConnector; +import com.vaadin.server.AbstractClientConnector; import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; import com.vaadin.terminal.gwt.server.ClientConnector; diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java index 54308b99c3..cf64af85ca 100644 --- a/server/src/com/vaadin/ui/CustomLayout.java +++ b/server/src/com/vaadin/ui/CustomLayout.java @@ -24,10 +24,10 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.ui.customlayout.CustomLayoutState; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Vaadin6Component; import com.vaadin.terminal.gwt.server.JsonPaintTarget; /** diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java index 828fa3b21d..b4bf93b5b0 100644 --- a/server/src/com/vaadin/ui/DateField.java +++ b/server/src/com/vaadin/ui/DateField.java @@ -36,10 +36,10 @@ import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.ui.datefield.DateFieldConstants; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Vaadin6Component; /** * <p> diff --git a/server/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/com/vaadin/ui/DragAndDropWrapper.java index ec805ecf46..fcd0b95015 100644 --- a/server/src/com/vaadin/ui/DragAndDropWrapper.java +++ b/server/src/com/vaadin/ui/DragAndDropWrapper.java @@ -29,14 +29,14 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.TargetDetails; import com.vaadin.event.dd.TargetDetailsImpl; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.StreamVariable; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.HorizontalDropLocation; import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.shared.ui.draganddropwrapper.DragAndDropWrapperConstants; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.StreamVariable; -import com.vaadin.terminal.Vaadin6Component; @SuppressWarnings("serial") public class DragAndDropWrapper extends CustomComponent implements DropTarget, diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java index 41b93d0b27..a8663abd32 100644 --- a/server/src/com/vaadin/ui/Embedded.java +++ b/server/src/com/vaadin/ui/Embedded.java @@ -22,14 +22,14 @@ import java.util.Map; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.embedded.EmbeddedConstants; import com.vaadin.shared.ui.embedded.EmbeddedServerRpc; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.Vaadin6Component; /** * Component for embedding external objects. diff --git a/server/src/com/vaadin/ui/Form.java b/server/src/com/vaadin/ui/Form.java index 55404b2e6b..8bf46ed198 100644 --- a/server/src/com/vaadin/ui/Form.java +++ b/server/src/com/vaadin/ui/Form.java @@ -36,14 +36,14 @@ import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.Action.ShortcutNotifier; import com.vaadin.event.ActionManager; +import com.vaadin.server.AbstractErrorMessage; +import com.vaadin.server.CompositeErrorMessage; +import com.vaadin.server.ErrorMessage; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.UserError; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.ui.form.FormState; -import com.vaadin.terminal.AbstractErrorMessage; -import com.vaadin.terminal.CompositeErrorMessage; -import com.vaadin.terminal.ErrorMessage; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.UserError; -import com.vaadin.terminal.Vaadin6Component; /** * Form component provides easy way of creating and managing sets fields. diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java index 3870b71611..27a25699ba 100644 --- a/server/src/com/vaadin/ui/GridLayout.java +++ b/server/src/com/vaadin/ui/GridLayout.java @@ -27,16 +27,16 @@ import java.util.Map.Entry; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.LayoutEvents.LayoutClickNotifier; +import com.vaadin.server.LegacyPaint; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.Connector; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.gridlayout.GridLayoutServerRpc; import com.vaadin.shared.ui.gridlayout.GridLayoutState; -import com.vaadin.terminal.LegacyPaint; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Vaadin6Component; /** * A layout where the components are laid out on a grid using cell coordinates. diff --git a/server/src/com/vaadin/ui/Html5File.java b/server/src/com/vaadin/ui/Html5File.java index 596f83a1d8..47af708160 100644 --- a/server/src/com/vaadin/ui/Html5File.java +++ b/server/src/com/vaadin/ui/Html5File.java @@ -18,7 +18,7 @@ package com.vaadin.ui; import java.io.Serializable; import com.vaadin.event.dd.DropHandler; -import com.vaadin.terminal.StreamVariable; +import com.vaadin.server.StreamVariable; /** * {@link DragAndDropWrapper} can receive also files from client computer if diff --git a/server/src/com/vaadin/ui/Image.java b/server/src/com/vaadin/ui/Image.java index b0dbc9e629..8e43d88b37 100644 --- a/server/src/com/vaadin/ui/Image.java +++ b/server/src/com/vaadin/ui/Image.java @@ -6,11 +6,11 @@ package com.vaadin.ui; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; +import com.vaadin.server.Resource; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.image.ImageServerRpc; import com.vaadin.shared.ui.image.ImageState; -import com.vaadin.terminal.Resource; /** * Component for embedding images. diff --git a/server/src/com/vaadin/ui/JavaScript.java b/server/src/com/vaadin/ui/JavaScript.java index e34ccae82a..f3e8564fab 100644 --- a/server/src/com/vaadin/ui/JavaScript.java +++ b/server/src/com/vaadin/ui/JavaScript.java @@ -21,11 +21,11 @@ import java.util.Map; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; +import com.vaadin.server.AbstractExtension; +import com.vaadin.server.Page; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.extension.javascriptmanager.ExecuteJavaScriptRpc; import com.vaadin.shared.extension.javascriptmanager.JavaScriptManagerState; -import com.vaadin.terminal.AbstractExtension; -import com.vaadin.terminal.Page; /** * Provides access to JavaScript functionality in the web browser. To get an diff --git a/server/src/com/vaadin/ui/JavaScriptFunction.java b/server/src/com/vaadin/ui/JavaScriptFunction.java index 3a17fef995..ebb5e2c073 100644 --- a/server/src/com/vaadin/ui/JavaScriptFunction.java +++ b/server/src/com/vaadin/ui/JavaScriptFunction.java @@ -20,7 +20,7 @@ import java.io.Serializable; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; -import com.vaadin.terminal.AbstractJavaScriptExtension; +import com.vaadin.server.AbstractJavaScriptExtension; /** * Defines a method that is called by a client-side JavaScript function. When diff --git a/server/src/com/vaadin/ui/Link.java b/server/src/com/vaadin/ui/Link.java index f98a2b0d2d..cb6b643c33 100644 --- a/server/src/com/vaadin/ui/Link.java +++ b/server/src/com/vaadin/ui/Link.java @@ -18,11 +18,11 @@ package com.vaadin.ui; import java.util.Map; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.ui.BorderStyle; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.Vaadin6Component; /** * Link is used to create external or internal URL links. diff --git a/server/src/com/vaadin/ui/ListSelect.java b/server/src/com/vaadin/ui/ListSelect.java index da78e24fa8..90e1c16a4d 100644 --- a/server/src/com/vaadin/ui/ListSelect.java +++ b/server/src/com/vaadin/ui/ListSelect.java @@ -19,8 +19,8 @@ package com.vaadin.ui; import java.util.Collection; import com.vaadin.data.Container; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * This is a simple list select without, for instance, support for new items, diff --git a/server/src/com/vaadin/ui/LoginForm.java b/server/src/com/vaadin/ui/LoginForm.java index 1c154699d8..7715f08a6e 100644 --- a/server/src/com/vaadin/ui/LoginForm.java +++ b/server/src/com/vaadin/ui/LoginForm.java @@ -25,12 +25,12 @@ import java.util.Iterator; import java.util.Map; import com.vaadin.Application; +import com.vaadin.server.ApplicationResource; +import com.vaadin.server.DownloadStream; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; import com.vaadin.shared.ApplicationConstants; -import com.vaadin.terminal.ApplicationResource; -import com.vaadin.terminal.DownloadStream; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; /** * LoginForm is a Vaadin component to handle common problem among Ajax diff --git a/server/src/com/vaadin/ui/MenuBar.java b/server/src/com/vaadin/ui/MenuBar.java index 51c06cf934..4414bef9aa 100644 --- a/server/src/com/vaadin/ui/MenuBar.java +++ b/server/src/com/vaadin/ui/MenuBar.java @@ -22,11 +22,11 @@ import java.util.List; import java.util.Map; import java.util.Stack; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.ui.menubar.MenuBarConstants; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.Vaadin6Component; /** * <p> diff --git a/server/src/com/vaadin/ui/NativeSelect.java b/server/src/com/vaadin/ui/NativeSelect.java index c2969874b0..8006813276 100644 --- a/server/src/com/vaadin/ui/NativeSelect.java +++ b/server/src/com/vaadin/ui/NativeSelect.java @@ -19,8 +19,8 @@ package com.vaadin.ui; import java.util.Collection; import com.vaadin.data.Container; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * This is a simple drop-down select without, for instance, support for diff --git a/server/src/com/vaadin/ui/Notification.java b/server/src/com/vaadin/ui/Notification.java index 22ad31dffe..758d2c86a3 100644 --- a/server/src/com/vaadin/ui/Notification.java +++ b/server/src/com/vaadin/ui/Notification.java @@ -18,9 +18,9 @@ package com.vaadin.ui; import java.io.Serializable; +import com.vaadin.server.Page; +import com.vaadin.server.Resource; import com.vaadin.shared.Position; -import com.vaadin.terminal.Page; -import com.vaadin.terminal.Resource; /** * A notification message, used to display temporary messages to the user - for diff --git a/server/src/com/vaadin/ui/OptionGroup.java b/server/src/com/vaadin/ui/OptionGroup.java index 12507442c9..8846ec36e3 100644 --- a/server/src/com/vaadin/ui/OptionGroup.java +++ b/server/src/com/vaadin/ui/OptionGroup.java @@ -27,9 +27,9 @@ import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; /** * Configures select to be used as an option group. diff --git a/server/src/com/vaadin/ui/Panel.java b/server/src/com/vaadin/ui/Panel.java index 00810b83db..d076e4d612 100644 --- a/server/src/com/vaadin/ui/Panel.java +++ b/server/src/com/vaadin/ui/Panel.java @@ -25,14 +25,14 @@ import com.vaadin.event.Action.Handler; import com.vaadin.event.ActionManager; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Scrollable; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.panel.PanelServerRpc; import com.vaadin.shared.ui.panel.PanelState; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Scrollable; -import com.vaadin.terminal.Vaadin6Component; import com.vaadin.ui.Component.Focusable; /** @@ -195,8 +195,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, /* * (non-Javadoc) * - * @see - * com.vaadin.terminal.Vaadin6Component#paintContent(com.vaadin.terminal + * @see com.vaadin.server.Vaadin6Component#paintContent(com.vaadin.server * .PaintTarget) */ @Override @@ -250,7 +249,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * Called when one or more variables handled by the implementing class are * changed. * - * @see com.vaadin.terminal.VariableOwner#changeVariables(Object, Map) + * @see com.vaadin.server.VariableOwner#changeVariables(Object, Map) */ @Override @SuppressWarnings("unchecked") @@ -289,7 +288,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, /* * (non-Javadoc) * - * @see com.vaadin.terminal.Scrollable#setScrollable(boolean) + * @see com.vaadin.server.Scrollable#setScrollable(boolean) */ @Override public int getScrollLeft() { @@ -299,7 +298,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, /* * (non-Javadoc) * - * @see com.vaadin.terminal.Scrollable#setScrollable(boolean) + * @see com.vaadin.server.Scrollable#setScrollable(boolean) */ @Override public int getScrollTop() { @@ -309,7 +308,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, /* * (non-Javadoc) * - * @see com.vaadin.terminal.Scrollable#setScrollLeft(int) + * @see com.vaadin.server.Scrollable#setScrollLeft(int) */ @Override public void setScrollLeft(int scrollLeft) { @@ -323,7 +322,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, /* * (non-Javadoc) * - * @see com.vaadin.terminal.Scrollable#setScrollTop(int) + * @see com.vaadin.server.Scrollable#setScrollTop(int) */ @Override public void setScrollTop(int scrollTop) { diff --git a/server/src/com/vaadin/ui/PopupDateField.java b/server/src/com/vaadin/ui/PopupDateField.java index acff49a142..39e0578301 100644 --- a/server/src/com/vaadin/ui/PopupDateField.java +++ b/server/src/com/vaadin/ui/PopupDateField.java @@ -19,8 +19,8 @@ package com.vaadin.ui; import java.util.Date; import com.vaadin.data.Property; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; /** * <p> diff --git a/server/src/com/vaadin/ui/PopupView.java b/server/src/com/vaadin/ui/PopupView.java index 786257c240..a4832a013f 100644 --- a/server/src/com/vaadin/ui/PopupView.java +++ b/server/src/com/vaadin/ui/PopupView.java @@ -20,10 +20,10 @@ import java.lang.reflect.Method; import java.util.Iterator; import java.util.Map; -import com.vaadin.terminal.LegacyPaint; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Vaadin6Component; +import com.vaadin.server.LegacyPaint; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Vaadin6Component; /** * @@ -309,7 +309,7 @@ public class PopupView extends AbstractComponentContainer implements /** * Paint (serialize) the component for the client. * - * @see com.vaadin.ui.AbstractComponent#paintContent(com.vaadin.terminal.PaintTarget) + * @see com.vaadin.ui.AbstractComponent#paintContent(com.vaadin.server.PaintTarget) */ @Override public void paintContent(PaintTarget target) throws PaintException { diff --git a/server/src/com/vaadin/ui/ProgressIndicator.java b/server/src/com/vaadin/ui/ProgressIndicator.java index 528c404ab9..4ad441a949 100644 --- a/server/src/com/vaadin/ui/ProgressIndicator.java +++ b/server/src/com/vaadin/ui/ProgressIndicator.java @@ -20,9 +20,9 @@ import java.util.Map; import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Vaadin6Component; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Vaadin6Component; /** * <code>ProgressIndicator</code> is component that shows user state of a diff --git a/server/src/com/vaadin/ui/RichTextArea.java b/server/src/com/vaadin/ui/RichTextArea.java index 51caa82136..e2beace1be 100644 --- a/server/src/com/vaadin/ui/RichTextArea.java +++ b/server/src/com/vaadin/ui/RichTextArea.java @@ -19,9 +19,9 @@ package com.vaadin.ui; import java.util.Map; import com.vaadin.data.Property; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Vaadin6Component; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Vaadin6Component; /** * A simple RichTextArea to edit HTML format text. diff --git a/server/src/com/vaadin/ui/Select.java b/server/src/com/vaadin/ui/Select.java index 6ff7c9c9bc..c7688df7e8 100644 --- a/server/src/com/vaadin/ui/Select.java +++ b/server/src/com/vaadin/ui/Select.java @@ -32,9 +32,9 @@ import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; /** * <p> diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java index 82faedcc41..f84e6f52ad 100644 --- a/server/src/com/vaadin/ui/TabSheet.java +++ b/server/src/com/vaadin/ui/TabSheet.java @@ -30,15 +30,15 @@ import com.vaadin.event.FieldEvents.BlurNotifier; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.FocusNotifier; +import com.vaadin.server.ErrorMessage; +import com.vaadin.server.KeyMapper; +import com.vaadin.server.LegacyPaint; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; import com.vaadin.shared.ui.tabsheet.TabsheetConstants; -import com.vaadin.terminal.ErrorMessage; -import com.vaadin.terminal.KeyMapper; -import com.vaadin.terminal.LegacyPaint; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.Vaadin6Component; import com.vaadin.ui.Component.Focusable; import com.vaadin.ui.themes.Reindeer; import com.vaadin.ui.themes.Runo; diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java index 8fc3fc2572..118e3b3fcf 100644 --- a/server/src/com/vaadin/ui/Table.java +++ b/server/src/com/vaadin/ui/Table.java @@ -52,13 +52,13 @@ import com.vaadin.event.dd.DragSource; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; +import com.vaadin.server.KeyMapper; +import com.vaadin.server.LegacyPaint; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.table.TableConstants; -import com.vaadin.terminal.KeyMapper; -import com.vaadin.terminal.LegacyPaint; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; /** * <p> @@ -4759,7 +4759,7 @@ public class Table extends AbstractSelect implements Action.Container, * * @see * com.vaadin.event.dd.acceptcriteria.AcceptCriterion#paintResponse( - * com.vaadin.terminal.PaintTarget) + * com.vaadin.server.PaintTarget) */ @Override diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java index 2d6673a67d..529847d54c 100644 --- a/server/src/com/vaadin/ui/Tree.java +++ b/server/src/com/vaadin/ui/Tree.java @@ -49,13 +49,13 @@ import com.vaadin.event.dd.TargetDetails; import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion; import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; import com.vaadin.event.dd.acceptcriteria.TargetDetailIs; +import com.vaadin.server.KeyMapper; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.shared.ui.tree.TreeConstants; -import com.vaadin.terminal.KeyMapper; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; import com.vaadin.tools.ReflectTools; /** @@ -1449,7 +1449,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#paintResponse( - * com.vaadin.terminal.PaintTarget) + * com.vaadin.server.PaintTarget) */ @Override public void paintResponse(PaintTarget target) throws PaintException { diff --git a/server/src/com/vaadin/ui/TreeTable.java b/server/src/com/vaadin/ui/TreeTable.java index 05757a6d09..dd79461f37 100644 --- a/server/src/com/vaadin/ui/TreeTable.java +++ b/server/src/com/vaadin/ui/TreeTable.java @@ -32,10 +32,10 @@ import com.vaadin.data.Container.ItemSetChangeEvent; import com.vaadin.data.util.ContainerHierarchicalWrapper; import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.data.util.HierarchicalContainerOrderedWrapper; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; import com.vaadin.shared.ui.treetable.TreeTableConstants; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; import com.vaadin.ui.Tree.CollapseEvent; import com.vaadin.ui.Tree.CollapseListener; import com.vaadin.ui.Tree.ExpandEvent; diff --git a/server/src/com/vaadin/ui/TwinColSelect.java b/server/src/com/vaadin/ui/TwinColSelect.java index 891e695a5f..76f1e1e8c7 100644 --- a/server/src/com/vaadin/ui/TwinColSelect.java +++ b/server/src/com/vaadin/ui/TwinColSelect.java @@ -19,9 +19,9 @@ package com.vaadin.ui; import java.util.Collection; import com.vaadin.data.Container; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; /** * Multiselect component with two lists: left side for available items and right diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 17a028bcdf..4731ebffe6 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -34,21 +34,21 @@ import com.vaadin.event.Action.Handler; import com.vaadin.event.ActionManager; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; +import com.vaadin.server.Page; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Resource; +import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.Page.BrowserWindowResizeEvent; +import com.vaadin.server.Page.BrowserWindowResizeListener; +import com.vaadin.server.WrappedRequest.BrowserDetails; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.BorderStyle; import com.vaadin.shared.ui.ui.UIConstants; import com.vaadin.shared.ui.ui.UIServerRpc; import com.vaadin.shared.ui.ui.UIState; -import com.vaadin.terminal.Page; -import com.vaadin.terminal.Page.BrowserWindowResizeEvent; -import com.vaadin.terminal.Page.BrowserWindowResizeListener; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.Vaadin6Component; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedRequest.BrowserDetails; import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; import com.vaadin.tools.ReflectTools; diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java index 619db07eea..683b9ce478 100644 --- a/server/src/com/vaadin/ui/Upload.java +++ b/server/src/com/vaadin/ui/Upload.java @@ -24,10 +24,10 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.StreamVariable.StreamingProgressEvent; -import com.vaadin.terminal.Vaadin6Component; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.StreamVariable.StreamingProgressEvent; import com.vaadin.terminal.gwt.server.NoInputStreamException; import com.vaadin.terminal.gwt.server.NoOutputStreamException; @@ -936,11 +936,11 @@ public class Upload extends AbstractComponent implements Component.Focusable, * Handle to terminal via Upload monitors and controls the upload during it * is being streamed. */ - private com.vaadin.terminal.StreamVariable streamVariable; + private com.vaadin.server.StreamVariable streamVariable; - protected com.vaadin.terminal.StreamVariable getStreamVariable() { + protected com.vaadin.server.StreamVariable getStreamVariable() { if (streamVariable == null) { - streamVariable = new com.vaadin.terminal.StreamVariable() { + streamVariable = new com.vaadin.server.StreamVariable() { private StreamingStartEvent lastStartedEvent; @Override diff --git a/server/src/com/vaadin/ui/Video.java b/server/src/com/vaadin/ui/Video.java index b54d404da6..939614c7a1 100644 --- a/server/src/com/vaadin/ui/Video.java +++ b/server/src/com/vaadin/ui/Video.java @@ -16,8 +16,8 @@ package com.vaadin.ui; +import com.vaadin.server.Resource; import com.vaadin.shared.ui.video.VideoState; -import com.vaadin.terminal.Resource; import com.vaadin.terminal.gwt.server.ResourceReference; /** diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java index 6102350566..af85439e23 100644 --- a/server/src/com/vaadin/ui/Window.java +++ b/server/src/com/vaadin/ui/Window.java @@ -31,12 +31,12 @@ import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; import com.vaadin.event.ShortcutListener; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.window.WindowServerRpc; import com.vaadin.shared.ui.window.WindowState; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.Vaadin6Component; /** * A component that represents a floating popup window that can be added to a @@ -127,7 +127,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, /* * (non-Javadoc) * - * @see com.vaadin.ui.Panel#paintContent(com.vaadin.terminal.PaintTarget) + * @see com.vaadin.ui.Panel#paintContent(com.vaadin.server.PaintTarget) */ @Override diff --git a/shared/src/com/vaadin/shared/ComponentState.java b/shared/src/com/vaadin/shared/ComponentState.java index ac6f1185bf..1b08f9b2d2 100644 --- a/shared/src/com/vaadin/shared/ComponentState.java +++ b/shared/src/com/vaadin/shared/ComponentState.java @@ -155,7 +155,7 @@ public class ComponentState extends SharedState { /** * Returns true if the component is in immediate mode. * - * @see com.vaadin.terminal.VariableOwner#isImmediate() + * @see com.vaadin.server.VariableOwner#isImmediate() * * @return true if the component is in immediate mode */ @@ -166,7 +166,7 @@ public class ComponentState extends SharedState { /** * Sets or resets the immediate mode for a component. * - * @see com.vaadin.terminal.VariableOwner#setImmediate() + * @see com.vaadin.server.VariableOwner#setImmediate() * * @param immediate * new mode for the component diff --git a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java index 9c7e526dad..7a240a1f1d 100644 --- a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java +++ b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java @@ -318,8 +318,7 @@ public abstract class AbstractContainerTest extends TestCase { FULLY_QUALIFIED_NAME, "ab", false, false)); validateContainer(container, "com.vaadin.data.BufferedValidatable", - "com.vaadin.ui.TabSheet", - "com.vaadin.client.Focusable", + "com.vaadin.ui.TabSheet", "com.vaadin.client.Focusable", "com.vaadin.data.Buffered", isFilteredOutItemNull(), 20); // Filter by "contains da" (reversed as ad here) @@ -382,7 +381,7 @@ public abstract class AbstractContainerTest extends TestCase { validateContainer(container, "com.vaadin.Application", "org.vaadin.test.LastClass", - "com.vaadin.terminal.ApplicationResource", "blah", true, + "com.vaadin.server.ApplicationResource", "blah", true, sampleData.length); sortable.sort(new Object[] { REVERSE_FULLY_QUALIFIED_NAME }, @@ -476,60 +475,52 @@ public abstract class AbstractContainerTest extends TestCase { "com.vaadin.launcher.util.BrowserLauncher", "com.vaadin.service.ApplicationContext", "com.vaadin.service.FileTypeResolver", - "com.vaadin.terminal.ApplicationResource", - "com.vaadin.terminal.ClassResource", - "com.vaadin.terminal.CompositeErrorMessage", - "com.vaadin.terminal.DownloadStream", - "com.vaadin.terminal.ErrorMessage", - "com.vaadin.terminal.ExternalResource", - "com.vaadin.terminal.FileResource", + "com.vaadin.server.ApplicationResource", + "com.vaadin.server.ClassResource", + "com.vaadin.server.CompositeErrorMessage", + "com.vaadin.server.DownloadStream", + "com.vaadin.server.ErrorMessage", + "com.vaadin.server.ExternalResource", + "com.vaadin.server.FileResource", "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.ComponentLocator", "com.vaadin.client.Console", "com.vaadin.client.Container", "com.vaadin.client.ContainerResizedListener", - "com.vaadin.client.CSSRule", - "com.vaadin.client.DateTimeService", + "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.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.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.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.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.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.VAccordion", "com.vaadin.client.ui.VButton", "com.vaadin.client.ui.VCalendarPanel", "com.vaadin.client.ui.VCheckBox", "com.vaadin.client.ui.VContextMenu", @@ -539,13 +530,11 @@ public abstract class AbstractContainerTest extends TestCase { "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.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.VLabel", "com.vaadin.client.ui.VLink", "com.vaadin.client.ui.VListSelect", "com.vaadin.client.ui.VMarginInfo", "com.vaadin.client.ui.VMenuBar", @@ -555,15 +544,13 @@ public abstract class AbstractContainerTest extends TestCase { "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.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.VSlider", "com.vaadin.client.ui.VSplitPanel", "com.vaadin.client.ui.VSplitPanelHorizontal", "com.vaadin.client.ui.VSplitPanelVertical", "com.vaadin.client.ui.VTablePaging", @@ -572,26 +559,20 @@ public abstract class AbstractContainerTest extends TestCase { "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.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.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.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", @@ -621,18 +602,16 @@ public abstract class AbstractContainerTest extends TestCase { "com.vaadin.terminal.gwt.widgetsetutils.ClassPathExplorer", "com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator", "com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder", - "com.vaadin.terminal.KeyMapper", "com.vaadin.terminal.Paintable", - "com.vaadin.terminal.PaintException", - "com.vaadin.terminal.PaintTarget", - "com.vaadin.terminal.ParameterHandler", - "com.vaadin.terminal.Resource", "com.vaadin.terminal.Scrollable", - "com.vaadin.terminal.Sizeable", - "com.vaadin.terminal.StreamResource", - "com.vaadin.terminal.SystemError", "com.vaadin.terminal.Terminal", - "com.vaadin.terminal.ThemeResource", - "com.vaadin.terminal.UploadStream", - "com.vaadin.terminal.URIHandler", "com.vaadin.terminal.UserError", - "com.vaadin.terminal.VariableOwner", + "com.vaadin.server.KeyMapper", "com.vaadin.server.Paintable", + "com.vaadin.server.PaintException", + "com.vaadin.server.PaintTarget", + "com.vaadin.server.ParameterHandler", "com.vaadin.server.Resource", + "com.vaadin.server.Scrollable", "com.vaadin.server.Sizeable", + "com.vaadin.server.StreamResource", + "com.vaadin.server.SystemError", "com.vaadin.server.Terminal", + "com.vaadin.server.ThemeResource", + "com.vaadin.server.UploadStream", "com.vaadin.server.URIHandler", + "com.vaadin.server.UserError", "com.vaadin.server.VariableOwner", "com.vaadin.tools.ReflectTools", "com.vaadin.tools.WidgetsetCompiler", "com.vaadin.ui.AbsoluteLayout", "com.vaadin.ui.AbstractComponent", diff --git a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java index 6bfff90c7b..918c9dfb7b 100644 --- a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java +++ b/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java @@ -149,7 +149,7 @@ public abstract class AbstractHierarchicalContainerTest extends int expectedSize = sampleData.length + packages; validateHierarchicalContainer(container, "com", "org.vaadin.test.LastClass", - "com.vaadin.terminal.ApplicationResource", "blah", true, + "com.vaadin.server.ApplicationResource", "blah", true, expectedSize, 2, true); } @@ -172,7 +172,7 @@ public abstract class AbstractHierarchicalContainerTest extends int expectedSize = sampleData.length + packages; validateHierarchicalContainer(container, "com", "org.vaadin.test.LastClass", - "com.vaadin.terminal.ApplicationResource", "blah", true, + "com.vaadin.server.ApplicationResource", "blah", true, expectedSize, 2, true); sortable.sort(new Object[] { REVERSE_FULLY_QUALIFIED_NAME }, @@ -181,7 +181,7 @@ public abstract class AbstractHierarchicalContainerTest extends validateHierarchicalContainer(container, "com.vaadin.terminal.gwt.server.ApplicationPortlet2", "com.vaadin.data.util.ObjectProperty", - "com.vaadin.terminal.ApplicationResource", "blah", true, + "com.vaadin.server.ApplicationResource", "blah", true, expectedSize, 2, true); } diff --git a/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java b/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java index ebe604ff3a..ff6de50651 100644 --- a/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java +++ b/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java @@ -2,9 +2,6 @@ package com.vaadin.data.util; import java.util.Collection; -import com.vaadin.data.util.ContainerHierarchicalWrapper; -import com.vaadin.data.util.IndexedContainer; - public class TestContainerHierarchicalWrapper extends AbstractHierarchicalContainerTest { @@ -34,7 +31,7 @@ public class TestContainerHierarchicalWrapper extends int expectedSize = sampleData.length + packages - 1; validateContainer(container, "com", "com.vaadin.util.SerializerHelper", - "com.vaadin.terminal.ApplicationResource", "blah", true, + "com.vaadin.server.ApplicationResource", "blah", true, expectedSize); // rootItemIds diff --git a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java index f0cbfe7a87..d3d7d37690 100644 --- a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java +++ b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java @@ -2,7 +2,6 @@ package com.vaadin.data.util; import com.vaadin.data.Container.Filter; import com.vaadin.data.Item; -import com.vaadin.data.util.HierarchicalContainer; public class TestHierarchicalContainer extends AbstractHierarchicalContainerTest { @@ -58,12 +57,10 @@ public class TestHierarchicalContainer extends container.addContainerFilter(FULLY_QUALIFIED_NAME, "ab", false, false); Object p1 = container.getParent("com.vaadin.ui.TabSheet"); assertEquals("com.vaadin.ui", p1); - p1 = container - .getParent("com.vaadin.client.ui.VPopupCalendar"); + p1 = container.getParent("com.vaadin.client.ui.VPopupCalendar"); assertNull(p1); container.removeAllContainerFilters(); - p1 = container - .getParent("com.vaadin.client.ui.VPopupCalendar"); + p1 = container.getParent("com.vaadin.client.ui.VPopupCalendar"); assertEquals("com.vaadin.client.ui", p1); } @@ -110,9 +107,8 @@ public class TestHierarchicalContainer extends int expectedRoots = 1; validateHierarchicalContainer(container, "com", - "com.vaadin.ui.TabSheet", - "com.vaadin.client.Focusable", "blah", true, - expectedSize, expectedRoots, true); + "com.vaadin.ui.TabSheet", "com.vaadin.client.Focusable", + "blah", true, expectedSize, expectedRoots, true); // only include .gwt.client classes container.removeAllContainerFilters(); @@ -127,8 +123,8 @@ public class TestHierarchicalContainer extends validateHierarchicalContainer(container, "com", "com.vaadin.client.WidgetSet", - "com.vaadin.client.ui.VSplitPanelVertical", - "blah", true, expectedSize, expectedRoots, true); + "com.vaadin.client.ui.VSplitPanelVertical", "blah", true, + expectedSize, expectedRoots, true); // Additionally remove all without 'm' in the simple name. container.addContainerFilter(SIMPLE_NAME, "m", false, false); @@ -136,12 +132,10 @@ public class TestHierarchicalContainer extends expectedSize = 7 + 18; expectedRoots = 1; - validateHierarchicalContainer( - container, - "com", + validateHierarchicalContainer(container, "com", "com.vaadin.client.ui.VUriFragmentUtility", - "com.vaadin.client.ui.layout.ChildComponentContainer", - "blah", true, expectedSize, expectedRoots, true); + "com.vaadin.client.ui.layout.ChildComponentContainer", "blah", + true, expectedSize, expectedRoots, true); } @@ -218,10 +212,10 @@ public class TestHierarchicalContainer extends // com.vaadin.client.ui.VTabsheetBase // com.vaadin.client.ui.VTabsheetPanel // com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent - // com.vaadin.terminal.Paintable - // com.vaadin.terminal.Scrollable - // com.vaadin.terminal.Sizeable - // com.vaadin.terminal.VariableOwner + // com.vaadin.server.Paintable + // com.vaadin.server.Scrollable + // com.vaadin.server.Sizeable + // com.vaadin.server.VariableOwner // com.vaadin.ui.Label // com.vaadin.ui.Table // com.vaadin.ui.TableFieldFactory @@ -232,9 +226,8 @@ public class TestHierarchicalContainer extends validateHierarchicalContainer(container, "com.vaadin.data.BufferedValidatable", - "com.vaadin.ui.TabSheet", - "com.vaadin.client.ui.VTabsheetBase", "blah", - true, expectedSize, expectedRoots, false); + "com.vaadin.ui.TabSheet", "com.vaadin.client.ui.VTabsheetBase", + "blah", true, expectedSize, expectedRoots, false); // only include .gwt.client classes container.removeAllContainerFilters(); @@ -261,11 +254,10 @@ public class TestHierarchicalContainer extends expectedSize = 13; expectedRoots = expectedSize; - validateHierarchicalContainer(container, - "com.vaadin.client.Paintable", + validateHierarchicalContainer(container, "com.vaadin.client.Paintable", "com.vaadin.client.ui.VTabsheetPanel", - "com.vaadin.client.ui.VPopupCalendar", "blah", - true, expectedSize, expectedRoots, false); + "com.vaadin.client.ui.VPopupCalendar", "blah", true, + expectedSize, expectedRoots, false); } } diff --git a/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java b/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java index 4f5f0b1431..1c1f9624c8 100644 --- a/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java +++ b/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java @@ -5,7 +5,7 @@ import java.util.HashMap; import junit.framework.TestCase; -import com.vaadin.terminal.KeyMapper; +import com.vaadin.server.KeyMapper; public class TestKeyMapper extends TestCase { diff --git a/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java b/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java index 8231030666..7bb1fd0050 100644 --- a/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java +++ b/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java @@ -3,7 +3,7 @@ package com.vaadin.tests.server; import junit.framework.TestCase; import com.vaadin.Application; -import com.vaadin.terminal.ClassResource; +import com.vaadin.server.ClassResource; import com.vaadin.ui.Embedded; public class TestMimeTypes extends TestCase { diff --git a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java index 5ea4bc52c4..8b35b322cb 100644 --- a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java +++ b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java @@ -5,8 +5,8 @@ import junit.framework.TestCase; import org.easymock.EasyMock; import com.vaadin.Application; -import com.vaadin.terminal.StreamVariable; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.StreamVariable; +import com.vaadin.server.WrappedRequest; import com.vaadin.terminal.gwt.server.CommunicationManager; import com.vaadin.ui.UI; import com.vaadin.ui.Upload; diff --git a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java index f7ac55b6da..efebc097bf 100644 --- a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java +++ b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java @@ -19,8 +19,8 @@ import junit.framework.TestCase; import com.vaadin.Application; import com.vaadin.Application.ApplicationStartEvent; +import com.vaadin.server.DeploymentConfiguration; import com.vaadin.service.ApplicationContext.TransactionListener; -import com.vaadin.terminal.DeploymentConfiguration; import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext; import com.vaadin.terminal.gwt.server.WebApplicationContext; diff --git a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java b/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java index 4458872c79..d76dcffa2f 100644 --- a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java +++ b/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java @@ -2,8 +2,8 @@ package com.vaadin.tests.server.component.absolutelayout; import junit.framework.TestCase; -import com.vaadin.terminal.Sizeable; -import com.vaadin.terminal.Sizeable.Unit; +import com.vaadin.server.Sizeable; +import com.vaadin.server.Sizeable.Unit; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.Button; diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java index 3a251ecbb9..5dbab8467e 100644 --- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java +++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java @@ -8,7 +8,7 @@ import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.util.AbstractProperty; import com.vaadin.data.util.converter.Converter.ConversionException; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.AbstractField; import com.vaadin.ui.UI; diff --git a/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java b/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java index 9b4d9492a2..906d6ccebd 100644 --- a/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java +++ b/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java @@ -11,9 +11,9 @@ import org.easymock.EasyMock; import com.vaadin.Application; import com.vaadin.Application.ApplicationStartEvent; import com.vaadin.UIRequiresMoreInformationException; -import com.vaadin.terminal.DefaultUIProvider; -import com.vaadin.terminal.DeploymentConfiguration; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.DefaultUIProvider; +import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; public class CustomUIClassLoader extends TestCase { diff --git a/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java b/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java index c9ce0ac0a2..265e5382d4 100644 --- a/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java +++ b/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java @@ -1,6 +1,6 @@ package com.vaadin.tests.server.component.upload; -import com.vaadin.terminal.StreamVariable.StreamingProgressEvent; +import com.vaadin.server.StreamVariable.StreamingProgressEvent; import com.vaadin.tests.server.component.AbstractListenerMethodsTest; import com.vaadin.ui.Upload; import com.vaadin.ui.Upload.FailedEvent; diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java index 2a0a733140..0fb0765c9f 100644 --- a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java +++ b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java @@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import com.vaadin.Application; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; diff --git a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java index e342ee9005..18ed52cc2a 100644 --- a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java +++ b/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java @@ -23,8 +23,8 @@ import org.easymock.IMocksControl; import com.vaadin.navigator.Navigator; import com.vaadin.navigator.Navigator.UriFragmentManager; -import com.vaadin.terminal.Page; -import com.vaadin.terminal.Page.FragmentChangedEvent; +import com.vaadin.server.Page; +import com.vaadin.server.Page.FragmentChangedEvent; public class UriFragmentManagerTest extends TestCase { diff --git a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java index 8183ed2d0b..b4a339c97f 100644 --- a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -31,8 +31,8 @@ import javax.servlet.http.HttpServletResponse; import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; -import com.vaadin.terminal.AbstractUIProvider; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.AbstractUIProvider; +import com.vaadin.server.WrappedRequest; import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; import com.vaadin.terminal.gwt.server.WrappedHttpServletRequest; import com.vaadin.tests.components.TestBase; diff --git a/tests/testbench/com/vaadin/tests/Components.java b/tests/testbench/com/vaadin/tests/Components.java index 66e693a1de..5882c5cdb1 100644 --- a/tests/testbench/com/vaadin/tests/Components.java +++ b/tests/testbench/com/vaadin/tests/Components.java @@ -15,9 +15,9 @@ import com.vaadin.data.util.DefaultItemSorter; import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.Sizeable; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.Sizeable; import com.vaadin.tests.components.AbstractComponentTest; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/LayoutDemo.java b/tests/testbench/com/vaadin/tests/LayoutDemo.java index 23997ac084..3348eda7a4 100644 --- a/tests/testbench/com/vaadin/tests/LayoutDemo.java +++ b/tests/testbench/com/vaadin/tests/LayoutDemo.java @@ -16,8 +16,8 @@ package com.vaadin.tests; +import com.vaadin.server.ClassResource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ClassResource; import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; diff --git a/tests/testbench/com/vaadin/tests/NativeWindowing.java b/tests/testbench/com/vaadin/tests/NativeWindowing.java index 4bce92b668..2418c74db8 100644 --- a/tests/testbench/com/vaadin/tests/NativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/NativeWindowing.java @@ -96,7 +96,7 @@ public class NativeWindowing extends Application.LegacyApplication { public void buttonClick(ClickEvent event) { try { main.open( - new com.vaadin.terminal.ExternalResource( + new com.vaadin.server.ExternalResource( new URL( getURL(), "mainwin-" diff --git a/tests/testbench/com/vaadin/tests/Parameters.java b/tests/testbench/com/vaadin/tests/Parameters.java index d6bc9007ed..b16d4ef65b 100644 --- a/tests/testbench/com/vaadin/tests/Parameters.java +++ b/tests/testbench/com/vaadin/tests/Parameters.java @@ -22,10 +22,10 @@ import java.util.Iterator; import java.util.Map; import com.vaadin.Application; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; import com.vaadin.ui.Label; import com.vaadin.ui.Layout.MarginHandler; import com.vaadin.ui.Link; diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java index 5f92484c6c..0e76617cc5 100644 --- a/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java @@ -19,8 +19,8 @@ package com.vaadin.tests; import java.util.Date; import java.util.Map; +import com.vaadin.server.UserError; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; import com.vaadin.ui.CustomComponent; diff --git a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java b/tests/testbench/com/vaadin/tests/RandomLayoutStress.java index 0161a2a20e..0b6b0cf8ba 100644 --- a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java +++ b/tests/testbench/com/vaadin/tests/RandomLayoutStress.java @@ -18,7 +18,7 @@ package com.vaadin.tests; import java.util.Random; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; diff --git a/tests/testbench/com/vaadin/tests/TestBench.java b/tests/testbench/com/vaadin/tests/TestBench.java index 32fff09455..67e1180d75 100644 --- a/tests/testbench/com/vaadin/tests/TestBench.java +++ b/tests/testbench/com/vaadin/tests/TestBench.java @@ -27,9 +27,9 @@ import java.util.List; import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.util.HierarchicalContainer; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.Page; -import com.vaadin.terminal.Page.FragmentChangedEvent; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.Page; +import com.vaadin.server.Page.FragmentChangedEvent; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.HorizontalSplitPanel; diff --git a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java b/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java index d5669e5689..57a98f787f 100644 --- a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java +++ b/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java @@ -16,11 +16,11 @@ package com.vaadin.tests; +import com.vaadin.server.ClassResource; +import com.vaadin.server.ErrorMessage; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.UserError; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ClassResource; -import com.vaadin.terminal.ErrorMessage; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.UserError; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; diff --git a/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java b/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java index e13b907f77..1a93de387a 100644 --- a/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java +++ b/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java @@ -3,7 +3,7 @@ */ package com.vaadin.tests; -import com.vaadin.terminal.Page; +import com.vaadin.server.Page; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; diff --git a/tests/testbench/com/vaadin/tests/TestDateField.java b/tests/testbench/com/vaadin/tests/TestDateField.java index 6cdeb3ffbd..67b2f2cc69 100644 --- a/tests/testbench/com/vaadin/tests/TestDateField.java +++ b/tests/testbench/com/vaadin/tests/TestDateField.java @@ -18,9 +18,9 @@ package com.vaadin.tests; import java.util.Locale; -import com.vaadin.terminal.ClassResource; -import com.vaadin.terminal.ErrorMessage; -import com.vaadin.terminal.UserError; +import com.vaadin.server.ClassResource; +import com.vaadin.server.ErrorMessage; +import com.vaadin.server.UserError; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.DateField; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java b/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java index 1692c2fe7b..1d28a0a1b4 100644 --- a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java +++ b/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java @@ -18,7 +18,7 @@ package com.vaadin.tests; import java.util.Locale; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; diff --git a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java index 81b21c46c3..da6b7ddf3e 100644 --- a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java @@ -19,7 +19,7 @@ package com.vaadin.tests; import java.util.ArrayList; import java.util.Iterator; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java index eb807504fa..a94198b1c8 100644 --- a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java @@ -19,7 +19,7 @@ package com.vaadin.tests; import java.util.ArrayList; import java.util.Iterator; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java index 41b3309c57..cef9269b53 100644 --- a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java @@ -96,7 +96,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication { public void buttonClick(ClickEvent event) { try { main.open( - new com.vaadin.terminal.ExternalResource( + new com.vaadin.server.ExternalResource( new URL( getURL(), "mainwin-" diff --git a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java index af41ccc37b..a6fdaf5643 100644 --- a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java +++ b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java @@ -27,8 +27,8 @@ import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; import com.vaadin.Application; +import com.vaadin.server.StreamResource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.StreamResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java index 61cf9c1c16..ac69cbd096 100644 --- a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java @@ -19,7 +19,7 @@ package com.vaadin.tests; import java.util.Iterator; import java.util.Vector; -import com.vaadin.terminal.UserError; +import com.vaadin.server.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; diff --git a/tests/testbench/com/vaadin/tests/TestForUpload.java b/tests/testbench/com/vaadin/tests/TestForUpload.java index d42870b5b1..eb59ed9f1f 100644 --- a/tests/testbench/com/vaadin/tests/TestForUpload.java +++ b/tests/testbench/com/vaadin/tests/TestForUpload.java @@ -29,8 +29,8 @@ import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.server.StreamResource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.StreamResource; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java index 3b5c7404e7..253fd3aeea 100644 --- a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java +++ b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java @@ -16,7 +16,7 @@ package com.vaadin.tests; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; diff --git a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java index a0ff6f0fc7..6121647bc1 100644 --- a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java +++ b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java @@ -25,7 +25,7 @@ import com.vaadin.Application; import com.vaadin.data.Container; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.IndexedContainer; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java index 9fa716a23e..26bf90948b 100644 --- a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java +++ b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java @@ -4,8 +4,8 @@ import com.google.apphosting.api.DeadlineExceededException; import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.terminal.ClassResource; -import com.vaadin.terminal.DownloadStream; +import com.vaadin.server.ClassResource; +import com.vaadin.server.DownloadStream; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Embedded; @@ -29,7 +29,7 @@ public class GAESyncTest extends Application.LegacyApplication { } @Override - public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) { + public void terminalError(com.vaadin.server.Terminal.ErrorEvent event) { Throwable t = event.getThrowable(); // Was this caused by a GAE timeout? while (t != null) { diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java index 1e6509ab85..3013659ed7 100644 --- a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java +++ b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java @@ -2,8 +2,8 @@ package com.vaadin.tests.application; import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; -import com.vaadin.terminal.AbstractUIProvider; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.AbstractUIProvider; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestApplication; import com.vaadin.ui.Label; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java index 992a3afbca..0dcf0a6fa8 100644 --- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java +++ b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java @@ -38,7 +38,7 @@ public class TerminalErrorNotification extends TestBase { } @Override - public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) { + public void terminalError(com.vaadin.server.Terminal.ErrorEvent event) { event.getThrowable().printStackTrace(); UI mainWindow = getMainWindow(); diff --git a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java index fa5ab7d100..f31ea76728 100644 --- a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java +++ b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java @@ -2,10 +2,10 @@ package com.vaadin.tests.application; import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; -import com.vaadin.terminal.ApplicationResource; -import com.vaadin.terminal.DownloadStream; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.ApplicationResource; +import com.vaadin.server.DownloadStream; +import com.vaadin.server.PaintException; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestApplication; import com.vaadin.tests.integration.FlagSeResource; import com.vaadin.tests.util.Log; @@ -28,7 +28,7 @@ public class ThreadLocalInstances extends AbstractTestApplication { } @Override - public void paintContent(com.vaadin.terminal.PaintTarget target) + public void paintContent(com.vaadin.server.PaintTarget target) throws PaintException { if (!paintReported) { reportCurrentStatus("root paint"); diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java index cece73a14d..ece40f5b00 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java @@ -14,8 +14,8 @@ import com.vaadin.event.FieldEvents.BlurNotifier; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.FocusNotifier; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.util.Log; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.AbstractComponent; @@ -715,7 +715,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> } @Override - public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) { + public void terminalError(com.vaadin.server.Terminal.ErrorEvent event) { String logMsg = "Exception occured, " + event.getThrowable().getClass().getName(); diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java index d8ae43fd6d..81ec4a9da4 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java @@ -5,9 +5,9 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Field; import com.vaadin.ui.Layout.SpacingHandler; diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java b/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java index 7dd742952f..db5fffa761 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java @@ -1,9 +1,9 @@ package com.vaadin.tests.components; import com.vaadin.Application; +import com.vaadin.server.WrappedRequest; import com.vaadin.service.ApplicationContext; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext; import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/components/ErrorMessages.java b/tests/testbench/com/vaadin/tests/components/ErrorMessages.java index d4008a4dfb..0e8dcc210b 100644 --- a/tests/testbench/com/vaadin/tests/components/ErrorMessages.java +++ b/tests/testbench/com/vaadin/tests/components/ErrorMessages.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components; import java.util.ArrayList; import java.util.List; -import com.vaadin.terminal.CompositeErrorMessage; -import com.vaadin.terminal.UserError; +import com.vaadin.server.CompositeErrorMessage; +import com.vaadin.server.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/components/UnknownComponentConnectorTest.java b/tests/testbench/com/vaadin/tests/components/UnknownComponentConnectorTest.java index a64216aed1..197408a533 100644 --- a/tests/testbench/com/vaadin/tests/components/UnknownComponentConnectorTest.java +++ b/tests/testbench/com/vaadin/tests/components/UnknownComponentConnectorTest.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.AbstractComponent; public class UnknownComponentConnectorTest extends AbstractTestUI { diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java index 5deec3b4f5..d318afc34f 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java +++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.components.abstractcomponent; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.VaadinClasses; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractComponent; diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java b/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java index fc08a4505c..3a8275bd51 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java @@ -5,7 +5,7 @@ import java.util.Date; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.terminal.UserError; +import com.vaadin.server.UserError; import com.vaadin.ui.AbstractComponent.ComponentErrorEvent; import com.vaadin.ui.AbstractComponent.ComponentErrorHandler; import com.vaadin.ui.ComboBox; diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java b/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java index 56fc5f208c..4ab18e994a 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.button; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.NativeButton; diff --git a/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.java b/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.java index 3e438a5d5b..73dbd95829 100644 --- a/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.java +++ b/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.button; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java b/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java index 4fb8df678e..d0321100dd 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java +++ b/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java @@ -53,7 +53,7 @@ public class ShortCutListenerModification extends TestBase implements } @Override - public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) { + public void terminalError(com.vaadin.server.Terminal.ErrorEvent event) { super.terminalError(event); getMainWindow().showNotification("Failed!", Notification.TYPE_ERROR_MESSAGE); diff --git a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.java b/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.java index 8e0e8d1071..05b8333e7d 100644 --- a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.java +++ b/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.caption; -import com.vaadin.terminal.UserError; +import com.vaadin.server.UserError; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java b/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java index 57ef9e6656..46539b42d7 100644 --- a/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java +++ b/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.caption; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.server.ThemeResource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.VaadinClasses; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; diff --git a/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.java b/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.java index 603fdf458b..d09b5c02ac 100644 --- a/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.java +++ b/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.caption; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java index 28abf5172d..22e260b442 100644 --- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java +++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.checkbox; import com.vaadin.data.Validator.InvalidValueException; -import com.vaadin.terminal.AbstractErrorMessage; +import com.vaadin.server.AbstractErrorMessage; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.java index f4d65b8d53..24f53889b3 100644 --- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.java +++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.checkbox; import java.util.Date; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.CheckBox; diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxIcon.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxIcon.java index 6fa714a6d7..50998a96eb 100644 --- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxIcon.java +++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxIcon.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.checkbox; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.CheckBox; diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java index 75325b798f..62ae652dd0 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.combobox; import com.vaadin.data.Item; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.ComboBox; diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java index 0f8124ca20..07cd1f046c 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.combobox; import java.util.Date; import com.vaadin.data.Item; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.ComboBox; diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java index eb28a9ff4e..05b52dee80 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.combobox; import com.vaadin.data.Item; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.ComboBox; diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java index 3071ab4c2d..7b241c9fe1 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.combobox; import java.util.LinkedHashMap; -import com.vaadin.terminal.Resource; +import com.vaadin.server.Resource; import com.vaadin.tests.components.select.SelectTest; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Select; diff --git a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java b/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java index 5b1af58421..3e409069d0 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.LinkedHashMap; import java.util.List; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java b/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java index e22482ed8b..c73bb28c43 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.combobox; import com.vaadin.data.Item; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.ComboBox; diff --git a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java b/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java index ce6a24d9bd..1099d03786 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.combobox; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java b/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java index 8a37d85b31..8170f152c2 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.customcomponent; import java.util.Date; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Embedded; diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.java b/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.java index 44260e9247..66de59ffde 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.datefield; import java.util.Date; -import com.vaadin.terminal.UserError; +import com.vaadin.server.UserError; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.DateField; diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java index 9a412cee9d..aedfafe627 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.embedded; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.java index 5091f3a929..4b318c3890 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.embedded; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java index c9b6991d8f..3c5801e90e 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.embedded; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Embedded; diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedFlash.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedFlash.java index fb6b55ded0..38aea4a4f0 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedFlash.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedFlash.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.embedded; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Embedded; diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java index 3020942844..254d27c1dd 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java @@ -11,7 +11,7 @@ import java.util.Date; import javax.imageio.ImageIO; -import com.vaadin.terminal.StreamResource; +import com.vaadin.server.StreamResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java index 252229cbe3..ae98a55348 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.embedded; -import com.vaadin.terminal.ClassResource; +import com.vaadin.server.ClassResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedTooltip.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedTooltip.java index d8be22f507..aa24337013 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedTooltip.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedTooltip.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.embedded; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Embedded; diff --git a/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.java b/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.java index 5d626cfc0b..1724fc11b7 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.embedded; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Embedded; diff --git a/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java b/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java index fdf9405855..b15f33f633 100644 --- a/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java +++ b/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java @@ -4,7 +4,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.UnsupportedEncodingException; -import com.vaadin.terminal.StreamResource; +import com.vaadin.server.StreamResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.java b/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.java index 66cb8819d4..74bb216002 100644 --- a/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.java +++ b/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.flash; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Flash; diff --git a/tests/testbench/com/vaadin/tests/components/flash/FlashPresentation.java b/tests/testbench/com/vaadin/tests/components/flash/FlashPresentation.java index 843e61ace1..5c28feb7f8 100644 --- a/tests/testbench/com/vaadin/tests/components/flash/FlashPresentation.java +++ b/tests/testbench/com/vaadin/tests/components/flash/FlashPresentation.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.flash; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Flash; diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java index a73c88cf73..dc3cffffb6 100644 --- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java +++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.components.formlayout; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.FormLayout; import com.vaadin.ui.PopupDateField; diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java b/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java index 1f787fd64f..e7aaf0c0e4 100644 --- a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java +++ b/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.image; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageClicks.java b/tests/testbench/com/vaadin/tests/components/image/ImageClicks.java index 394e38a106..f1a3a09952 100644 --- a/tests/testbench/com/vaadin/tests/components/image/ImageClicks.java +++ b/tests/testbench/com/vaadin/tests/components/image/ImageClicks.java @@ -12,7 +12,7 @@ import javax.imageio.ImageIO; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; -import com.vaadin.terminal.StreamResource; +import com.vaadin.server.StreamResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Image; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java index a0df85a5b3..416d538e7c 100644 --- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java +++ b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java @@ -22,12 +22,12 @@ import java.util.List; import com.vaadin.annotations.JavaScript; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; +import com.vaadin.server.ClassResource; +import com.vaadin.server.WrappedRequest; import com.vaadin.shared.communication.ClientRpc; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.communication.URLReference; import com.vaadin.shared.ui.JavaScriptComponentState; -import com.vaadin.terminal.ClassResource; -import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.gwt.server.ResourceReference; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.Log; diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.java b/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.java index 5ce19bcff8..bc399e7d3c 100644 --- a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.java +++ b/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.label; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java index 18d3b1e8ed..060c937feb 100644 --- a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java +++ b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.label; +import com.vaadin.server.WrappedRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractLayout; import com.vaadin.ui.Accordion; diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkIcon.java b/tests/testbench/com/vaadin/tests/components/link/LinkIcon.java index ae8eccb59a..970c2f71c7 100644 --- a/tests/testbench/com/vaadin/tests/components/link/LinkIcon.java +++ b/tests/testbench/com/vaadin/tests/components/link/LinkIcon.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.link; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Link; diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkTargetSize.java b/tests/testbench/com/vaadin/tests/components/link/LinkTargetSize.java index 0b3643c3ac..822a8d5991 100644 --- a/tests/testbench/com/vaadin/tests/components/link/LinkTargetSize.java +++ b/tests/testbench/com/vaadin/tests/components/link/LinkTargetSize.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.link; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Link; diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java b/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java index f14e1afd8c..70ddc74616 100644 --- a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java +++ b/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java @@ -3,9 +3,9 @@ package com.vaadin.tests.components.link; import java.io.IOException; import java.io.InputStream; -import com.vaadin.terminal.ApplicationResource; -import com.vaadin.terminal.StreamResource; -import com.vaadin.terminal.StreamResource.StreamSource; +import com.vaadin.server.ApplicationResource; +import com.vaadin.server.StreamResource; +import com.vaadin.server.StreamResource.StreamSource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Link; diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java index 480c186df7..ac4c3c8ea3 100644 --- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java +++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.loginform; import com.vaadin.Application; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.LoginForm; import com.vaadin.ui.LoginForm.LoginEvent; import com.vaadin.ui.LoginForm.LoginListener; diff --git a/tests/testbench/com/vaadin/tests/components/media/Media.java b/tests/testbench/com/vaadin/tests/components/media/Media.java index ef7fc36c63..945285fbb4 100644 --- a/tests/testbench/com/vaadin/tests/components/media/Media.java +++ b/tests/testbench/com/vaadin/tests/components/media/Media.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.media; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Audio; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java index d7585af8ac..d6e79224a3 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.menubar; import java.util.Arrays; import java.util.List; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.Component; import com.vaadin.ui.MenuBar; diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java index 2c4a975f9b..c88edf5bdc 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.menubar; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Alignment; import com.vaadin.ui.MenuBar; diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java index 5ab2b2145f..982b16c6e2 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.menubar; import java.util.Date; import java.util.LinkedHashMap; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.AbstractComponentTest; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.MenuItem; diff --git a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java b/tests/testbench/com/vaadin/tests/components/notification/Notifications.java index 97e038dc1a..10fef434ca 100644 --- a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java +++ b/tests/testbench/com/vaadin/tests/components/notification/Notifications.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.notification; -import com.vaadin.terminal.Page; +import com.vaadin.server.Page; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java index 767d16b6da..89e97c0b6a 100644 --- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java +++ b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.notification; -import com.vaadin.terminal.Page; +import com.vaadin.server.Page; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java index c20de87ec7..c4c588d1ea 100644 --- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java +++ b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.optiongroup; import java.util.Collection; import java.util.LinkedHashMap; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.select.AbstractSelectTestCase; import com.vaadin.ui.OptionGroup; diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java index 07562b7cfe..4122bd626a 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.orderedlayout; +import com.vaadin.server.ThemeResource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java index 5aaaaec6a6..864ca2e6da 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java @@ -7,7 +7,7 @@ import java.util.List; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.AbstractOrderedLayout; diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java b/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java index a4067c3dcb..fd96b08cfb 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java +++ b/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.components.panel; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java b/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java index 99bfc7acfb..d755f5961e 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.components.popupview; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java index 6eaffa5cf3..e775bf6aca 100644 --- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java +++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.richtextarea; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ShortcutAction; -import com.vaadin.terminal.Page; +import com.vaadin.server.Page; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java index 7c2d8dd243..b0c6c08a62 100644 --- a/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java +++ b/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java @@ -11,7 +11,7 @@ import com.vaadin.event.Action; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.event.ItemClickEvent.ItemClickNotifier; -import com.vaadin.terminal.Resource; +import com.vaadin.server.Resource; import com.vaadin.tests.components.abstractfield.AbstractFieldTest; import com.vaadin.ui.AbstractSelect; diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.java b/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.java index 51a899a7e6..0cba74b941 100644 --- a/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.java +++ b/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.select; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Select; diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java b/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java index dc361b1b27..7c0648876b 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.splitpanel; -import com.vaadin.terminal.Sizeable; -import com.vaadin.terminal.Sizeable.Unit; +import com.vaadin.server.Sizeable; +import com.vaadin.server.Sizeable.Unit; import com.vaadin.tests.components.AbstractComponentContainerTest; import com.vaadin.ui.AbstractSplitPanel; import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java index 5554b2b9f3..342cd9de6c 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.splitpanel; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java index c06ca5b0b9..a1d0fcb42b 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.splitpanel; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java index a86d209f65..18ea015d01 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.splitpanel; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent; import com.vaadin.ui.AbstractSplitPanel.SplitterClickListener; diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java index 3cdc0c8913..c35838e751 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.splitpanel; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalSplitPanel; diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java index 2a730da9be..beebbf4d2a 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.splitpanel; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java index 4fca8c1742..828d184086 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java +++ b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java @@ -4,7 +4,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.MethodProperty; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java index bc0601684f..f9a0add6fc 100644 --- a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java +++ b/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.table; import java.util.Arrays; import com.vaadin.data.util.BeanItemContainer; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index b9e7fde17a..99ad913674 100644 --- a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.table; import com.vaadin.data.Item; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; +import com.vaadin.server.ThemeResource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; diff --git a/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java b/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java index dffab6dbad..6f4436880a 100644 --- a/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java +++ b/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.table; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Panel; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java index 18eec814bc..039b02e801 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java @@ -6,7 +6,7 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.event.Action; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java index 38b3a751e2..62a131cbbf 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java @@ -7,8 +7,8 @@ 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.terminal.Resource; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java b/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java index f54f685a1d..1c6862cf07 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.table; import java.net.MalformedURLException; +import com.vaadin.server.WrappedRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.HorizontalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableItemIcon.java b/tests/testbench/com/vaadin/tests/components/table/TableItemIcon.java index b8a6733e83..8b502268b1 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableItemIcon.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableItemIcon.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.table; import com.vaadin.data.Item; -import com.vaadin.terminal.ClassResource; -import com.vaadin.terminal.Resource; +import com.vaadin.server.ClassResource; +import com.vaadin.server.Resource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Table; diff --git a/tests/testbench/com/vaadin/tests/components/table/Tables.java b/tests/testbench/com/vaadin/tests/components/table/Tables.java index 79a5fb367d..1431155b1a 100644 --- a/tests/testbench/com/vaadin/tests/components/table/Tables.java +++ b/tests/testbench/com/vaadin/tests/components/table/Tables.java @@ -8,8 +8,8 @@ import java.util.List; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ItemClickEvent.ItemClickListener; +import com.vaadin.server.Resource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.Resource; import com.vaadin.tests.components.select.AbstractSelectTestCase; import com.vaadin.ui.AbstractSelect.MultiSelectMode; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.java index 2e334a836e..5d814ec48f 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.tabsheet; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java index fea255a98d..6c39cdab73 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.tabsheet; import java.util.LinkedHashMap; -import com.vaadin.terminal.Resource; +import com.vaadin.server.Resource; import com.vaadin.tests.components.AbstractComponentContainerTest; import com.vaadin.ui.Component; import com.vaadin.ui.TabSheet; diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java index 18934e9318..fefd7a0b28 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.tabsheet; -import com.vaadin.terminal.UserError; +import com.vaadin.server.UserError; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java index 4072610996..ab9bcd9a99 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java @@ -8,7 +8,7 @@ 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.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Tree; diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.java b/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.java index e25b2d6760..1fa73ccd6d 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.java @@ -4,7 +4,7 @@ import java.util.Iterator; import com.vaadin.data.Item; import com.vaadin.data.util.HierarchicalContainer; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Panel; import com.vaadin.ui.Tree; diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java b/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java index 2101abb630..f885e1d1da 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.tree; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Tree; diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.java b/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.java index fbf4a3c1d1..99618c0e5d 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.tree; import java.util.Date; -import com.vaadin.terminal.Sizeable; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.Sizeable; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.HorizontalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java b/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java index 0fe8a3d1b9..4cf17aef48 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.treetable; import com.vaadin.data.Container.Hierarchical; import com.vaadin.data.util.HierarchicalContainer; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java b/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java index 8f9c1deaf5..d9f6dcc2ac 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.treetable; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Link; import com.vaadin.ui.UI.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java b/tests/testbench/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java index ca1c7aeb9c..2042edeea2 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.treetable; import com.vaadin.data.Container.Hierarchical; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Alignment; diff --git a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.java b/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.java index 75a98ba14e..34bf8f6715 100644 --- a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.java +++ b/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.java @@ -2,10 +2,10 @@ package com.vaadin.tests.components.ui; import com.vaadin.UIRequiresMoreInformationException; import com.vaadin.annotations.EagerInit; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedRequest.BrowserDetails; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedRequest.BrowserDetails; import com.vaadin.tests.components.AbstractTestApplication; import com.vaadin.ui.Label; import com.vaadin.ui.Link; diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.java b/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.java index 39cc598094..ec0cdf53a2 100644 --- a/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.java +++ b/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.ui; import com.vaadin.annotations.Theme; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.java b/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.java index f26e94f243..99c3c49f72 100644 --- a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.java +++ b/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.ui; import com.vaadin.annotations.Widgetset; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset2.java b/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset2.java index 84c0780240..b9cdb7a3dc 100644 --- a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset2.java +++ b/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset2.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.ui; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIInitException.java b/tests/testbench/com/vaadin/tests/components/ui/UIInitException.java index 29de6f6ac3..e225ae73d8 100644 --- a/tests/testbench/com/vaadin/tests/components/ui/UIInitException.java +++ b/tests/testbench/com/vaadin/tests/components/ui/UIInitException.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.ui; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; public class UIInitException extends AbstractTestUI { diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIInitTest.java b/tests/testbench/com/vaadin/tests/components/ui/UIInitTest.java index 6efe1d1b28..68e6a4da34 100644 --- a/tests/testbench/com/vaadin/tests/components/ui/UIInitTest.java +++ b/tests/testbench/com/vaadin/tests/components/ui/UIInitTest.java @@ -4,7 +4,7 @@ package com.vaadin.tests.components.ui; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.java b/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.java index 8dd303a8e1..022db1bf3e 100644 --- a/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.java +++ b/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.ui; import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; -import com.vaadin.terminal.AbstractUIProvider; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.AbstractUIProvider; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestApplication; import com.vaadin.ui.Label; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.java b/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.java index d2167e67c7..b64770408b 100644 --- a/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.java +++ b/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.ui; -import com.vaadin.terminal.Page; -import com.vaadin.terminal.Page.FragmentChangedEvent; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.Page; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.Page.FragmentChangedEvent; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java b/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java index 76b93cae56..573f55b29d 100644 --- a/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.window; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.java b/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.java index cd990f94b7..6ca5837cee 100644 --- a/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.java +++ b/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.window; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Embedded; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java index 1cdfdef0b5..03deb4ea20 100644 --- a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java +++ b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.window; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java index 80497528ca..bacc4c131c 100644 --- a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java +++ b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.window; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.server.Page.BrowserWindowResizeEvent; +import com.vaadin.server.Page.BrowserWindowResizeListener; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.Page.BrowserWindowResizeEvent; -import com.vaadin.terminal.Page.BrowserWindowResizeListener; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.util.Log; import com.vaadin.tests.util.LoremIpsum; diff --git a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java b/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java index 4d2f118ec7..847ee585f7 100644 --- a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java +++ b/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.window; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java index a77a1f7703..7d4efe39ce 100644 --- a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java +++ b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.window; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java index 74d7b564db..57a125bcb7 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.window; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.terminal.Page; -import com.vaadin.terminal.Page.BrowserWindowResizeEvent; +import com.vaadin.server.Page; +import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; diff --git a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java index 4f41410ba3..8b8ad4cf70 100644 --- a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java +++ b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java @@ -4,7 +4,7 @@ import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.BeanItemContainer; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java index b30ef3e616..a1dba3eed8 100644 --- a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java +++ b/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java @@ -4,7 +4,7 @@ import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.IndexedContainer; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest1.java b/tests/testbench/com/vaadin/tests/dd/DDTest1.java index 3f0689cdc1..161a9b423e 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest1.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest1.java @@ -10,8 +10,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.ServerSideCriterion; +import com.vaadin.server.ExternalResource; import com.vaadin.shared.ui.dd.VerticalDropLocation; -import com.vaadin.terminal.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractSelect.AcceptItem; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest2.java b/tests/testbench/com/vaadin/tests/dd/DDTest2.java index 4d649c6056..7757513fc1 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest2.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest2.java @@ -15,8 +15,8 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.And; 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.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Person; import com.vaadin.tests.util.PersonContainer; diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest6.java b/tests/testbench/com/vaadin/tests/dd/DDTest6.java index f1e31c1452..05be14eb76 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest6.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest6.java @@ -25,12 +25,12 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.Not; import com.vaadin.event.dd.acceptcriteria.SourceIsTarget; +import com.vaadin.server.Resource; +import com.vaadin.server.StreamResource; +import com.vaadin.server.StreamVariable; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.StreamResource.StreamSource; import com.vaadin.shared.MouseEventDetails; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.StreamResource; -import com.vaadin.terminal.StreamResource.StreamSource; -import com.vaadin.terminal.StreamVariable; -import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.AbsoluteLayout; diff --git a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java b/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java index bea00ae0ad..4ecabee617 100644 --- a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java +++ b/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java @@ -8,7 +8,7 @@ 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.terminal.StreamVariable; +import com.vaadin.server.StreamVariable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; diff --git a/tests/testbench/com/vaadin/tests/dd/DragDropPane.java b/tests/testbench/com/vaadin/tests/dd/DragDropPane.java index a94b676f2c..970e1b0141 100644 --- a/tests/testbench/com/vaadin/tests/dd/DragDropPane.java +++ b/tests/testbench/com/vaadin/tests/dd/DragDropPane.java @@ -9,8 +9,8 @@ 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.server.StreamVariable; import com.vaadin.shared.MouseEventDetails; -import com.vaadin.terminal.StreamVariable; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.AbsoluteLayout.ComponentPosition; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java b/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java index 1a01564220..592ea92f80 100644 --- a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java +++ b/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java @@ -4,8 +4,8 @@ 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.terminal.ClassResource; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.ClassResource; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.DragAndDropWrapper.DragStartMode; diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java b/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java index 29e37d9847..e4fc291728 100644 --- a/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java +++ b/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java @@ -16,8 +16,8 @@ package com.vaadin.tests.extensions; -import com.vaadin.terminal.AbstractClientConnector; -import com.vaadin.terminal.AbstractExtension; +import com.vaadin.server.AbstractClientConnector; +import com.vaadin.server.AbstractExtension; public class BasicExtension extends AbstractExtension { @Override diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java index daa2e78353..40856af11e 100644 --- a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.extensions; import com.vaadin.annotations.Widgetset; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java index 60db95827c..e8a33fd3af 100644 --- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java +++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.extensions; -import com.vaadin.terminal.AbstractExtension; +import com.vaadin.server.AbstractExtension; import com.vaadin.tests.widgetset.client.helloworldfeature.GreetAgainRpc; import com.vaadin.tests.widgetset.client.helloworldfeature.HelloWorldRpc; import com.vaadin.tests.widgetset.client.helloworldfeature.HelloWorldState; diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java index e4646572db..576b16fbb6 100644 --- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java @@ -16,7 +16,7 @@ package com.vaadin.tests.extensions; import com.vaadin.annotations.Widgetset; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java index 6281f3eff4..a4e2acb31e 100644 --- a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java @@ -19,7 +19,7 @@ package com.vaadin.tests.extensions; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.JavaScript; diff --git a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java index c604516b9c..18054c8e0f 100644 --- a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java @@ -20,11 +20,11 @@ import com.vaadin.annotations.JavaScript; import com.vaadin.annotations.StyleSheet; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; +import com.vaadin.server.AbstractJavaScriptExtension; +import com.vaadin.server.WrappedRequest; import com.vaadin.shared.JavaScriptExtensionState; import com.vaadin.shared.communication.ClientRpc; import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.terminal.AbstractJavaScriptExtension; -import com.vaadin.terminal.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java index 6a9f696e75..7afdf906b5 100644 --- a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java +++ b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java @@ -2,8 +2,8 @@ package com.vaadin.tests.integration; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.Page; -import com.vaadin.terminal.Page.BrowserWindowResizeEvent; +import com.vaadin.server.Page; +import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.CheckBox; diff --git a/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java b/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java index f80e9e3a2f..76adecb7d8 100644 --- a/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java +++ b/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java @@ -1,7 +1,7 @@ package com.vaadin.tests.integration; import com.vaadin.Application; -import com.vaadin.terminal.ClassResource; +import com.vaadin.server.ClassResource; public class FlagSeResource extends ClassResource { diff --git a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java index b3fc9c8ffb..b089515b0e 100644 --- a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java @@ -4,8 +4,8 @@ import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.ClassResource; -import com.vaadin.terminal.Resource; +import com.vaadin.server.ClassResource; +import com.vaadin.server.Resource; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.Table; diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java index c2a01b16dd..3a17361fb7 100644 --- a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java @@ -20,8 +20,8 @@ import javax.portlet.WindowState; import com.vaadin.Application; import com.vaadin.annotations.StyleSheet; +import com.vaadin.server.ExternalResource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ExternalResource; import com.vaadin.terminal.gwt.server.PortletApplicationContext2; import com.vaadin.terminal.gwt.server.PortletApplicationContext2.PortletListener; import com.vaadin.ui.Embedded; diff --git a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java index a233191070..0cbf50ae1b 100644 --- a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java +++ b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java @@ -8,13 +8,13 @@ import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.event.Action; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.Page; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.shared.ui.slider.SliderOrientation; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.Page; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.Accordion; diff --git a/tests/testbench/com/vaadin/tests/integration/SpecialNameResource.java b/tests/testbench/com/vaadin/tests/integration/SpecialNameResource.java index b8dd199e3d..3a0bf7cdd5 100644 --- a/tests/testbench/com/vaadin/tests/integration/SpecialNameResource.java +++ b/tests/testbench/com/vaadin/tests/integration/SpecialNameResource.java @@ -1,7 +1,7 @@ package com.vaadin.tests.integration; import com.vaadin.Application; -import com.vaadin.terminal.ClassResource; +import com.vaadin.server.ClassResource; public class SpecialNameResource extends ClassResource { public SpecialNameResource(Application application) { diff --git a/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java b/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java index 77b8e249ba..03c3c43ccd 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java +++ b/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java @@ -6,8 +6,8 @@ import java.util.List; import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java index 7877ca3fe3..f4050ea085 100644 --- a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java +++ b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java @@ -1,6 +1,6 @@ package com.vaadin.tests.layouts; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java index 2d5bc8d59a..9f2715a09b 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java @@ -3,7 +3,7 @@ package com.vaadin.tests.layouts; import com.vaadin.data.Item; import com.vaadin.data.Validator; import com.vaadin.data.util.BeanItem; -import com.vaadin.terminal.AbstractErrorMessage; +import com.vaadin.server.AbstractErrorMessage; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java index 2ceb6428ed..9e0380a1f6 100644 --- a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java +++ b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java @@ -4,8 +4,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java index d53fda1748..8da94feb7f 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java @@ -3,10 +3,10 @@ package com.vaadin.tests.layouts.layouttester; import java.util.Date; import com.vaadin.Application; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.SystemError; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; +import com.vaadin.server.Resource; +import com.vaadin.server.SystemError; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Alignment; diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java index ab4bb265c5..0042f0ba11 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java @@ -1,11 +1,11 @@ package com.vaadin.tests.layouts.layouttester; import com.vaadin.Application; +import com.vaadin.server.Resource; +import com.vaadin.server.SystemError; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.SystemError; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Alignment; diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java index be32ca513b..3e668289fe 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java @@ -1,11 +1,11 @@ package com.vaadin.tests.layouts.layouttester; import com.vaadin.Application; +import com.vaadin.server.Resource; +import com.vaadin.server.SystemError; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.SystemError; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Alignment; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java index 08556e99d0..4e8d2f3160 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java @@ -19,7 +19,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.data.fieldgroup.BeanFieldGroup; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.util.BeanItem; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; /** diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java index f3e6653288..f55377b3f4 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a1; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java index 39b11177b6..a96b8957c6 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a1; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java index eb34747450..2cbff64117 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java @@ -1,6 +1,6 @@ package com.vaadin.tests.minitutorials.v7a1; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java index 12938f9f12..9da6a75a45 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.annotations.Theme; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index b0a33c14cf..2dad3d38b5 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -18,8 +18,8 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedRequest.BrowserDetails; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedRequest.BrowserDetails; import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.ui.Label; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java index f3e96aaafc..4fd9c1187b 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java @@ -8,10 +8,10 @@ import java.net.URL; import javax.imageio.ImageIO; import com.vaadin.Application; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Embedded; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java index 9830ee6aeb..e0f53935c7 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.Application; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java index 2a8b228bc3..a3de39c039 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java @@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.fieldgroup.PropertyId; import com.vaadin.data.util.BeanItem; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.ui.TextArea; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java index 5dd9322364..ae8de83e30 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java @@ -4,7 +4,7 @@ import java.text.NumberFormat; import java.util.Locale; import com.vaadin.data.util.converter.StringToNumberConverter; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Table; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java index 38a578189a..f0df14e158 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java @@ -2,7 +2,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.data.Property; import com.vaadin.data.util.BeanItem; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java index 9d968f360a..1e32916d0b 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java @@ -2,7 +2,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.data.util.converter.Converter.ConversionException; import com.vaadin.data.util.converter.StringToIntegerConverter; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java index d82f4b1382..2c7d6ee7ba 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java @@ -16,8 +16,8 @@ package com.vaadin.tests.minitutorials.v7a1; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Label; import com.vaadin.ui.Link; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java index 67a795a314..5834f320af 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java @@ -4,7 +4,7 @@ import java.util.Locale; import com.vaadin.data.util.converter.Converter; import com.vaadin.data.util.converter.Converter.ConversionException; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java index c2f983c9bb..4beb321cd1 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java @@ -22,7 +22,7 @@ import javax.validation.constraints.Size; import com.vaadin.data.util.BeanItem; import com.vaadin.data.validator.BeanValidator; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java index 042c02316f..cde71d5ac2 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java @@ -16,9 +16,9 @@ package com.vaadin.tests.minitutorials.v7a1; -import com.vaadin.terminal.Page.FragmentChangedEvent; -import com.vaadin.terminal.Page.FragmentChangedListener; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.Page.FragmentChangedEvent; +import com.vaadin.server.Page.FragmentChangedListener; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java index 4a689d8c12..dc6c8ce7bf 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a1; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java index 1bde122dbf..8ad3b037b3 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java @@ -1,7 +1,7 @@ package com.vaadin.tests.minitutorials.v7a2; import com.vaadin.annotations.Widgetset; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java index d9091e4287..62088f304d 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a2; import com.vaadin.annotations.Widgetset; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; /** diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java index f906661b51..8c2ee0850a 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a2; -import com.vaadin.terminal.Resource; +import com.vaadin.server.Resource; import com.vaadin.terminal.gwt.server.ResourceReference; import com.vaadin.tests.widgetset.client.minitutorials.v7a2.ResourceInStateState; import com.vaadin.ui.AbstractComponent; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java index 37f4255cdd..35062fbf0c 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java @@ -17,8 +17,8 @@ package com.vaadin.tests.minitutorials.v7a2; import com.vaadin.annotations.Widgetset; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; /** diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java index 8c728548c0..76e332504c 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java @@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a2; import java.util.Random; import com.vaadin.annotations.Widgetset; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java index 6f2be3c7d7..cf355f2145 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a3; import com.vaadin.annotations.JavaScript; -import com.vaadin.terminal.AbstractJavaScriptExtension; +import com.vaadin.server.AbstractJavaScriptExtension; import com.vaadin.terminal.gwt.server.ClientConnector; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java index bae3c4fc9c..95055cd207 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a3; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java index 093f3269e0..b84cb5e599 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a3; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; public class ComplexTypesUI extends UI { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java index 02bd8a7cce..5e519d1b7a 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a3; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java index 9384394870..793ba3dee8 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java @@ -16,7 +16,7 @@ package com.vaadin.tests.minitutorials.v7a3; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; public class RedButtonUI extends UI { diff --git a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java b/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java index 2f5c1177fa..6c3dcafc74 100644 --- a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java +++ b/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java @@ -1,6 +1,6 @@ package com.vaadin.tests.requesthandlers; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.integration.FlagSeResource; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java b/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java index cb8963c3d4..00f1e4d2d6 100644 --- a/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java +++ b/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java @@ -5,7 +5,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import com.vaadin.terminal.FileResource; +import com.vaadin.server.FileResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java b/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java index b6dbcfca97..e0c7b16318 100644 --- a/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java +++ b/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java @@ -2,7 +2,7 @@ package com.vaadin.tests.resources; import java.io.File; -import com.vaadin.terminal.FileResource; +import com.vaadin.server.FileResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java b/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java index 8ab6ce153d..3b4e4b9ff3 100644 --- a/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java +++ b/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java @@ -4,8 +4,8 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; -import com.vaadin.terminal.StreamResource; -import com.vaadin.terminal.StreamResource.StreamSource; +import com.vaadin.server.StreamResource; +import com.vaadin.server.StreamResource.StreamSource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java b/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java index b775c18f8f..3a5dd0a326 100644 --- a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java +++ b/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.serialization; import com.vaadin.annotations.Widgetset; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.DelegateToWidgetComponent; diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java b/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java index 0bb3b6c542..0d939a3d18 100644 --- a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java +++ b/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.serialization; import com.vaadin.annotations.Widgetset; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.DummyLabel; diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java index 6ad6b6d530..cb9d9e997d 100644 --- a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java +++ b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java @@ -27,9 +27,9 @@ import java.util.Map.Entry; import java.util.Set; import com.vaadin.annotations.Widgetset; +import com.vaadin.server.WrappedRequest; import com.vaadin.shared.Connector; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.Log; import com.vaadin.tests.widgetset.client.ComplexTestBean; diff --git a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java index 62160d233a..39b43f3516 100644 --- a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java +++ b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java @@ -2,8 +2,8 @@ package com.vaadin.tests.themes; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java index 92a480c3d2..b1b652381f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java @@ -11,11 +11,11 @@ import java.util.Date; import javax.imageio.ImageIO; import com.vaadin.Application; -import com.vaadin.terminal.DownloadStream; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.DownloadStream; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; import com.vaadin.ui.Link; import com.vaadin.ui.UI.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java index 05fd0c3f1f..2f845a2264 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.Application; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; import com.vaadin.ui.MenuBar.MenuItem; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java index 55d08069ed..57d2ad73e5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java index b07e9df0e5..1ef16afe95 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.terminal.SystemError; +import com.vaadin.server.SystemError; import com.vaadin.ui.UI.LegacyWindow; import com.vaadin.ui.TextField; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java index d3c2437219..c00e2f32eb 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java @@ -5,10 +5,10 @@ import java.util.Iterator; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.MethodProperty; +import com.vaadin.server.SystemError; +import com.vaadin.server.ThemeResource; import com.vaadin.shared.ui.AlignmentInfo.Bits; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.terminal.SystemError; -import com.vaadin.terminal.ThemeResource; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java index 364ad9b6cf..44d4109203 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java @@ -1,9 +1,9 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.ClassResource; -import com.vaadin.terminal.DownloadStream; -import com.vaadin.terminal.Resource; +import com.vaadin.server.ClassResource; +import com.vaadin.server.DownloadStream; +import com.vaadin.server.Resource; import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java index 780215aa2a..a77e6e843a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java @@ -5,8 +5,8 @@ import java.util.LinkedList; import com.vaadin.data.Validator; import com.vaadin.data.util.MethodProperty; +import com.vaadin.server.SystemError; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.SystemError; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java index 1b60d535cf..90a96ba0f1 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java @@ -7,9 +7,9 @@ import java.util.Random; import com.vaadin.Application; import com.vaadin.data.util.BeanItem; import com.vaadin.data.validator.StringLengthValidator; -import com.vaadin.terminal.Resource; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; +import com.vaadin.server.Resource; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java index 3b50804938..92102426ca 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.UserError; +import com.vaadin.server.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.UI.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java index 3d79de5d1d..ac5f990915 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java @@ -4,9 +4,9 @@ import java.io.IOException; import java.util.Map; import com.vaadin.Application; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java index 63634259a3..7258971f50 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Panel; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java index b10ccea992..78c09d8914 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java @@ -1,6 +1,6 @@ package com.vaadin.tests.tickets; -import com.vaadin.terminal.UserError; +import com.vaadin.server.UserError; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java index 0d6a21faac..7b544ec9b0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java @@ -4,7 +4,7 @@ import com.vaadin.Application; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.IndexedContainer; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalSplitPanel; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java index 0342b87e68..fcffbc01bf 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java index ba8936adfa..5900c76706 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java @@ -5,7 +5,7 @@ import java.util.Random; import com.vaadin.Application; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.UserError; +import com.vaadin.server.UserError; import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java index 2efc66556d..8a10067455 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Link; import com.vaadin.ui.UI.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java index 110db06800..5ac0480fe2 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java index 362a763c2f..31973e4c92 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java index 186522db15..87d92ad9f6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java @@ -5,7 +5,7 @@ import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.HierarchicalContainer; -import com.vaadin.terminal.Sizeable; +import com.vaadin.server.Sizeable; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Accordion; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java index e48aae7d9f..2f311b9428 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.terminal.UserError; +import com.vaadin.server.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.UI.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java index aabafadb13..53f2aac79e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.Embedded; import com.vaadin.ui.UI.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java index 4da938351d..0dba639712 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java @@ -6,8 +6,8 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.MethodProperty; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; +import com.vaadin.server.ExternalResource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java index d5b5041060..fb0d62ba85 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; +import com.vaadin.server.ExternalResource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java index 621b744aa8..38cc567295 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; +import com.vaadin.server.ExternalResource; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java index ceba214dc5..b67fad52c0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java @@ -6,8 +6,8 @@ import java.util.Random; import java.util.Set; import com.vaadin.Application; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.UserError; +import com.vaadin.server.ThemeResource; +import com.vaadin.server.UserError; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java index e732ea09e0..c4c600edaa 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java @@ -10,11 +10,11 @@ import java.io.IOException; import javax.imageio.ImageIO; import com.vaadin.Application; -import com.vaadin.terminal.DownloadStream; -import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.RequestHandler; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.WrappedResponse; +import com.vaadin.server.DownloadStream; +import com.vaadin.server.ExternalResource; +import com.vaadin.server.RequestHandler; +import com.vaadin.server.WrappedRequest; +import com.vaadin.server.WrappedResponse; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java index a76f3a711f..8be6a13e9f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.ExternalResource; +import com.vaadin.server.ExternalResource; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Embedded; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java b/tests/testbench/com/vaadin/tests/tickets/Ticket34.java index 67db77a5af..fd5e9c6005 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket34.java @@ -4,8 +4,8 @@ import java.util.HashMap; import java.util.Map; import com.vaadin.Application; -import com.vaadin.terminal.Page; -import com.vaadin.terminal.Page.FragmentChangedEvent; +import com.vaadin.server.Page; +import com.vaadin.server.Page.FragmentChangedEvent; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java index 1176e87bb4..417ee86fac 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java @@ -5,7 +5,7 @@ import com.vaadin.data.Validator; import com.vaadin.data.util.BeanItem; import com.vaadin.data.util.MethodProperty; import com.vaadin.data.validator.IntegerValidator; -import com.vaadin.terminal.ThemeResource; +import com.vaadin.server.ThemeResource; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java b/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java index 24a98d42e3..0280db0693 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java @@ -7,7 +7,7 @@ import java.util.List; import com.vaadin.data.Container.Filter; import com.vaadin.data.Item; import com.vaadin.data.util.BeanItemContainer; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; diff --git a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java b/tests/testbench/com/vaadin/tests/util/SampleDirectory.java index 788415d0fd..ef20da788d 100644 --- a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java +++ b/tests/testbench/com/vaadin/tests/util/SampleDirectory.java @@ -19,8 +19,8 @@ package com.vaadin.tests.util; import java.io.File; import com.vaadin.Application; +import com.vaadin.server.SystemError; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.SystemError; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java b/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java index c197bbde5d..bc3d88e2bb 100644 --- a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java +++ b/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java @@ -16,7 +16,7 @@ package com.vaadin.tests.vaadincontext; -import com.vaadin.terminal.WrappedRequest; +import com.vaadin.server.WrappedRequest; import com.vaadin.tests.components.AbstractTestUI; public class BootstrapModifyUI extends AbstractTestUI { diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java b/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java index 8cdcc0fe3a..978ed80ed5 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java +++ b/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java @@ -16,7 +16,7 @@ package com.vaadin.tests.widgetset.server; -import com.vaadin.terminal.AbstractExtension; +import com.vaadin.server.AbstractExtension; import com.vaadin.tests.widgetset.client.ComplexTestBean; import com.vaadin.tests.widgetset.client.SerializerTestRpc; |