Moved classes from com.vaadin to com.vaadin.server (#10145)

Change-Id: Ica48f1d5edbefde0ef8afca0c2774fe122a6c8ad

diff --git a/server/src/com/vaadin/DefaultDeploymentConfiguration.java b/server/src/com/vaadin/DefaultDeploymentConfiguration.java
deleted file mode 100644 (file)
index 1d804c9..0000000
--- a/server/src/com/vaadin/DefaultDeploymentConfiguration.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright 2011 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin;
-
-import java.util.Properties;
-import java.util.logging.Logger;
-
-import com.vaadin.server.Constants;
-import com.vaadin.server.DeploymentConfiguration;
-
-/**
- * The default implementation of {@link DeploymentConfiguration} based on a base
- * class for resolving system properties and a set of init parameters.
- * 
- * @author Vaadin Ltd
- * @since 7.0.0
- */
-public class DefaultDeploymentConfiguration implements DeploymentConfiguration {
-    private final Properties initParameters;
-    private boolean productionMode;
-    private boolean xsrfProtectionEnabled;
-    private int resourceCacheTime;
-    private int heartbeatInterval;
-    private boolean idleRootCleanupEnabled;
-    private final Class<?> systemPropertyBaseClass;
-
-    /**
-     * Create a new deployment configuration instance.
-     * 
-     * @param systemPropertyBaseClass
-     *            the class that should be used as a basis when reading system
-     *            properties
-     * @param initParameters
-     *            the init parameters that should make up the foundation for
-     *            this configuration
-     */
-    public DefaultDeploymentConfiguration(Class<?> systemPropertyBaseClass,
-            Properties initParameters) {
-        this.initParameters = initParameters;
-        this.systemPropertyBaseClass = systemPropertyBaseClass;
-
-        checkProductionMode();
-        checkXsrfProtection();
-        checkResourceCacheTime();
-        checkHeartbeatInterval();
-        checkIdleUICleanup();
-    }
-
-    @Override
-    public String getApplicationOrSystemProperty(String propertyName,
-            String defaultValue) {
-        String val = null;
-
-        // Try application properties
-        val = getApplicationProperty(propertyName);
-        if (val != null) {
-            return val;
-        }
-
-        // Try system properties
-        val = getSystemProperty(propertyName);
-        if (val != null) {
-            return val;
-        }
-
-        return defaultValue;
-    }
-
-    /**
-     * Gets an system property value.
-     * 
-     * @param parameterName
-     *            the Name or the parameter.
-     * @return String value or null if not found
-     */
-    protected String getSystemProperty(String parameterName) {
-        String val = null;
-
-        String pkgName;
-        final Package pkg = systemPropertyBaseClass.getPackage();
-        if (pkg != null) {
-            pkgName = pkg.getName();
-        } else {
-            final String className = systemPropertyBaseClass.getName();
-            pkgName = new String(className.toCharArray(), 0,
-                    className.lastIndexOf('.'));
-        }
-        val = System.getProperty(pkgName + "." + parameterName);
-        if (val != null) {
-            return val;
-        }
-
-        // Try lowercased system properties
-        val = System.getProperty(pkgName + "." + parameterName.toLowerCase());
-        return val;
-    }
-
-    /**
-     * Gets an application property value.
-     * 
-     * @param parameterName
-     *            the Name or the parameter.
-     * @return String value or null if not found
-     */
-    public String getApplicationProperty(String parameterName) {
-
-        String val = initParameters.getProperty(parameterName);
-        if (val != null) {
-            return val;
-        }
-
-        // Try lower case application properties for backward compatibility with
-        // 3.0.2 and earlier
-        val = initParameters.getProperty(parameterName.toLowerCase());
-
-        return val;
-    }
-
-    /**
-     * {@inheritDoc}
-     * 
-     * The default is false.
-     */
-    @Override
-    public boolean isProductionMode() {
-        return productionMode;
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p>
-     * The default is true.
-     */
-    @Override
-    public boolean isXsrfProtectionEnabled() {
-        return xsrfProtectionEnabled;
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p>
-     * The default interval is 3600 seconds (1 hour).
-     */
-    @Override
-    public int getResourceCacheTime() {
-        return resourceCacheTime;
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p>
-     * The default interval is 300 seconds (5 minutes).
-     */
-    @Override
-    public int getHeartbeatInterval() {
-        return heartbeatInterval;
-    }
-
-    @Override
-    public boolean isIdleUICleanupEnabled() {
-        return idleRootCleanupEnabled;
-    }
-
-    /**
-     * Log a warning if Vaadin is not running in production mode.
-     */
-    private void checkProductionMode() {
-        productionMode = getApplicationOrSystemProperty(
-                Constants.SERVLET_PARAMETER_PRODUCTION_MODE, "false").equals(
-                "true");
-        if (!productionMode) {
-            getLogger().warning(Constants.NOT_PRODUCTION_MODE_INFO);
-        }
-    }
-
-    /**
-     * Log a warning if cross-site request forgery protection is disabled.
-     */
-    private void checkXsrfProtection() {
-        xsrfProtectionEnabled = !getApplicationOrSystemProperty(
-                Constants.SERVLET_PARAMETER_DISABLE_XSRF_PROTECTION, "false")
-                .equals("true");
-        if (!xsrfProtectionEnabled) {
-            getLogger().warning(Constants.WARNING_XSRF_PROTECTION_DISABLED);
-        }
-    }
-
-    /**
-     * Log a warning if resource cache time is set but is not an integer.
-     */
-    private void checkResourceCacheTime() {
-        try {
-            resourceCacheTime = Integer
-                    .parseInt(getApplicationOrSystemProperty(
-                            Constants.SERVLET_PARAMETER_RESOURCE_CACHE_TIME,
-                            "3600"));
-        } catch (NumberFormatException e) {
-            getLogger().warning(
-                    Constants.WARNING_RESOURCE_CACHING_TIME_NOT_NUMERIC);
-            resourceCacheTime = 3600;
-        }
-    }
-
-    private void checkHeartbeatInterval() {
-        try {
-            heartbeatInterval = Integer
-                    .parseInt(getApplicationOrSystemProperty(
-                            Constants.SERVLET_PARAMETER_HEARTBEAT_INTERVAL,
-                            "300"));
-        } catch (NumberFormatException e) {
-            getLogger().warning(
-                    Constants.WARNING_HEARTBEAT_INTERVAL_NOT_NUMERIC);
-            heartbeatInterval = 300;
-        }
-    }
-
-    private void checkIdleUICleanup() {
-        idleRootCleanupEnabled = getApplicationOrSystemProperty(
-                Constants.SERVLET_PARAMETER_CLOSE_IDLE_UIS, "false").equals(
-                "true");
-    }
-
-    private Logger getLogger() {
-        return Logger.getLogger(getClass().getName());
-    }
-
-    @Override
-    public Properties getInitParameters() {
-        return initParameters;
-    }
-
-}

diff --git a/server/src/com/vaadin/LegacyApplication.java b/server/src/com/vaadin/LegacyApplication.java
deleted file mode 100644 (file)
index c28482e..0000000
--- a/server/src/com/vaadin/LegacyApplication.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright 2011 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin;
-
-import java.net.URL;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.vaadin.server.DefaultErrorListener;
-import com.vaadin.server.Terminal.ErrorEvent;
-import com.vaadin.server.Terminal.ErrorListener;
-import com.vaadin.server.VaadinServiceSession;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.UI;
-
-/**
- * A special application designed to help migrating applications from Vaadin 6
- * to Vaadin 7. The legacy application supports setting a main window, adding
- * additional browser level windows and defining the theme for the entire
- * application.
- * 
- * @deprecated This class is only intended to ease migration and should not be
- *             used for new projects.
- * 
- * @since 7.0
- */
-@Deprecated
-public abstract class LegacyApplication implements ErrorListener {
-    private LegacyWindow mainWindow;
-    private String theme;
-
-    private Map<String, LegacyWindow> legacyUINames = new HashMap<String, LegacyWindow>();
-
-    private boolean isRunning = true;
-
-    /**
-     * URL where the user is redirected to on application close, or null if
-     * application is just closed without redirection.
-     */
-    private String logoutURL = null;
-    private URL url;
-
-    /**
-     * Sets the main window of this application. Setting window as a main window
-     * of this application also adds the window to this application.
-     * 
-     * @param mainWindow
-     *            the UI to set as the default window
-     */
-    public void setMainWindow(LegacyWindow mainWindow) {
-        if (this.mainWindow != null) {
-            throw new IllegalStateException("mainWindow has already been set");
-        }
-        if (mainWindow.getSession() != null) {
-            throw new IllegalStateException(
-                    "mainWindow is attached to another application");
-        }
-        if (UI.getCurrent() == null) {
-            // Assume setting a main window from Application.init if there's
-            // no current UI -> set the main window as the current UI
-            UI.setCurrent(mainWindow);
-        }
-        addWindow(mainWindow);
-        this.mainWindow = mainWindow;
-    }
-
-    public void doInit(URL url) {
-        this.url = url;
-        VaadinServiceSession.getCurrent().setErrorHandler(this);
-        init();
-    }
-
-    protected abstract void init();
-
-    /**
-     * Gets the mainWindow of the application.
-     * 
-     * <p>
-     * The main window is the window attached to the application URL (
-     * {@link #getURL()}) and thus which is show by default to the user.
-     * </p>
-     * <p>
-     * Note that each application must have at least one main window.
-     * </p>
-     * 
-     * @return the UI used as the default window
-     */
-    public LegacyWindow getMainWindow() {
-        return mainWindow;
-    }
-
-    /**
-     * Sets the application's theme.
-     * <p>
-     * Note that this theme can be overridden for a specific UI with
-     * {@link VaadinServiceSession#getThemeForUI(UI)}. Setting theme to be
-     * <code>null</code> selects the default theme. For the available theme
-     * names, see the contents of the VAADIN/themes directory.
-     * </p>
-     * 
-     * @param theme
-     *            the new theme for this application.
-     */
-    public void setTheme(String theme) {
-        this.theme = theme;
-    }
-
-    /**
-     * Gets the application's theme. The application's theme is the default
-     * theme used by all the uIs for which a theme is not explicitly defined. If
-     * the application theme is not explicitly set, <code>null</code> is
-     * returned.
-     * 
-     * @return the name of the application's theme.
-     */
-    public String getTheme() {
-        return theme;
-    }
-
-    /**
-     * <p>
-     * Gets a UI by name. Returns <code>null</code> if the application is not
-     * running or it does not contain a window corresponding to the name.
-     * </p>
-     * 
-     * @param name
-     *            the name of the requested window
-     * @return a UI corresponding to the name, or <code>null</code> to use the
-     *         default window
-     */
-    public LegacyWindow getWindow(String name) {
-        return legacyUINames.get(name);
-    }
-
-    /**
-     * Counter to get unique names for windows with no explicit name
-     */
-    private int namelessUIIndex = 0;
-
-    /**
-     * Adds a new browser level window to this application. Please note that UI
-     * doesn't have a name that is used in the URL - to add a named window you
-     * should instead use {@link #addWindow(UI, String)}
-     * 
-     * @param uI
-     *            the UI window to add to the application
-     * @return returns the name that has been assigned to the window
-     * 
-     * @see #addWindow(UI, String)
-     */
-    public void addWindow(LegacyWindow uI) {
-        if (uI.getName() == null) {
-            String name = Integer.toString(namelessUIIndex++);
-            uI.setName(name);
-        }
-
-        uI.setApplication(this);
-
-        legacyUINames.put(uI.getName(), uI);
-        uI.setSession(VaadinServiceSession.getCurrent());
-    }
-
-    /**
-     * Removes the specified window from the application. This also removes all
-     * name mappings for the window (see {@link #addWindow(UI, String) and
-     * #getWindowName(UI)}.
-     * 
-     * <p>
-     * Note that removing window from the application does not close the browser
-     * window - the window is only removed from the server-side.
-     * </p>
-     * 
-     * @param uI
-     *            the UI to remove
-     */
-    public void removeWindow(LegacyWindow uI) {
-        for (Entry<String, LegacyWindow> entry : legacyUINames.entrySet()) {
-            if (entry.getValue() == uI) {
-                legacyUINames.remove(entry.getKey());
-            }
-        }
-    }
-
-    /**
-     * Gets the set of windows contained by the application.
-     * 
-     * <p>
-     * Note that the returned set of windows can not be modified.
-     * </p>
-     * 
-     * @return the unmodifiable collection of windows.
-     */
-    public Collection<LegacyWindow> getWindows() {
-        return Collections.unmodifiableCollection(legacyUINames.values());
-    }
-
-    @Override
-    public void terminalError(ErrorEvent event) {
-        DefaultErrorListener.doDefault(event);
-    }
-
-    public VaadinServiceSession getContext() {
-        return VaadinServiceSession.getCurrent();
-    }
-
-    public void close() {
-        isRunning = false;
-        Collection<LegacyWindow> windows = getWindows();
-        for (LegacyWindow legacyWindow : windows) {
-            String logoutUrl = getLogoutURL();
-            if (logoutUrl == null) {
-                URL url = getURL();
-                if (url != null) {
-                    logoutUrl = url.toString();
-                }
-            }
-            if (logoutUrl != null) {
-                legacyWindow.getPage().setLocation(logoutUrl);
-            }
-            legacyWindow.getSession().cleanupUI(legacyWindow);
-        }
-    }
-
-    public boolean isRunning() {
-        return isRunning;
-    }
-
-    public URL getURL() {
-        return url;
-    }
-
-    /**
-     * Returns the URL user is redirected to on application close. If the URL is
-     * <code>null</code>, the application is closed normally as defined by the
-     * application running environment.
-     * <p>
-     * Desktop application just closes the application window and
-     * web-application redirects the browser to application main URL.
-     * </p>
-     * 
-     * @return the URL.
-     * 
-     * @deprecated might be refactored or removed before 7.0.0
-     */
-    @Deprecated
-    public String getLogoutURL() {
-        return logoutURL;
-    }
-
-    /**
-     * Sets the URL user is redirected to on application close. If the URL is
-     * <code>null</code>, the application is closed normally as defined by the
-     * application running environment: Desktop application just closes the
-     * application window and web-application redirects the browser to
-     * application main URL.
-     * 
-     * @param logoutURL
-     *            the logoutURL to set.
-     * 
-     * @deprecated might be refactored or removed before 7.0.0
-     */
-    @Deprecated
-    public void setLogoutURL(String logoutURL) {
-        this.logoutURL = logoutURL;
-    }
-}
\ No newline at end of file

diff --git a/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java b/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java
new file mode 100644 (file)
index 0000000..07a810c
--- /dev/null
+++ b/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2011 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.server;
+
+import java.util.Properties;
+import java.util.logging.Logger;
+
+
+/**
+ * The default implementation of {@link DeploymentConfiguration} based on a base
+ * class for resolving system properties and a set of init parameters.
+ * 
+ * @author Vaadin Ltd
+ * @since 7.0.0
+ */
+public class DefaultDeploymentConfiguration implements DeploymentConfiguration {
+    private final Properties initParameters;
+    private boolean productionMode;
+    private boolean xsrfProtectionEnabled;
+    private int resourceCacheTime;
+    private int heartbeatInterval;
+    private boolean idleRootCleanupEnabled;
+    private final Class<?> systemPropertyBaseClass;
+
+    /**
+     * Create a new deployment configuration instance.
+     * 
+     * @param systemPropertyBaseClass
+     *            the class that should be used as a basis when reading system
+     *            properties
+     * @param initParameters
+     *            the init parameters that should make up the foundation for
+     *            this configuration
+     */
+    public DefaultDeploymentConfiguration(Class<?> systemPropertyBaseClass,
+            Properties initParameters) {
+        this.initParameters = initParameters;
+        this.systemPropertyBaseClass = systemPropertyBaseClass;
+
+        checkProductionMode();
+        checkXsrfProtection();
+        checkResourceCacheTime();
+        checkHeartbeatInterval();
+        checkIdleUICleanup();
+    }
+
+    @Override
+    public String getApplicationOrSystemProperty(String propertyName,
+            String defaultValue) {
+        String val = null;
+
+        // Try application properties
+        val = getApplicationProperty(propertyName);
+        if (val != null) {
+            return val;
+        }
+
+        // Try system properties
+        val = getSystemProperty(propertyName);
+        if (val != null) {
+            return val;
+        }
+
+        return defaultValue;
+    }
+
+    /**
+     * Gets an system property value.
+     * 
+     * @param parameterName
+     *            the Name or the parameter.
+     * @return String value or null if not found
+     */
+    protected String getSystemProperty(String parameterName) {
+        String val = null;
+
+        String pkgName;
+        final Package pkg = systemPropertyBaseClass.getPackage();
+        if (pkg != null) {
+            pkgName = pkg.getName();
+        } else {
+            final String className = systemPropertyBaseClass.getName();
+            pkgName = new String(className.toCharArray(), 0,
+                    className.lastIndexOf('.'));
+        }
+        val = System.getProperty(pkgName + "." + parameterName);
+        if (val != null) {
+            return val;
+        }
+
+        // Try lowercased system properties
+        val = System.getProperty(pkgName + "." + parameterName.toLowerCase());
+        return val;
+    }
+
+    /**
+     * Gets an application property value.
+     * 
+     * @param parameterName
+     *            the Name or the parameter.
+     * @return String value or null if not found
+     */
+    public String getApplicationProperty(String parameterName) {
+
+        String val = initParameters.getProperty(parameterName);
+        if (val != null) {
+            return val;
+        }
+
+        // Try lower case application properties for backward compatibility with
+        // 3.0.2 and earlier
+        val = initParameters.getProperty(parameterName.toLowerCase());
+
+        return val;
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * The default is false.
+     */
+    @Override
+    public boolean isProductionMode() {
+        return productionMode;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * The default is true.
+     */
+    @Override
+    public boolean isXsrfProtectionEnabled() {
+        return xsrfProtectionEnabled;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * The default interval is 3600 seconds (1 hour).
+     */
+    @Override
+    public int getResourceCacheTime() {
+        return resourceCacheTime;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * The default interval is 300 seconds (5 minutes).
+     */
+    @Override
+    public int getHeartbeatInterval() {
+        return heartbeatInterval;
+    }
+
+    @Override
+    public boolean isIdleUICleanupEnabled() {
+        return idleRootCleanupEnabled;
+    }
+
+    /**
+     * Log a warning if Vaadin is not running in production mode.
+     */
+    private void checkProductionMode() {
+        productionMode = getApplicationOrSystemProperty(
+                Constants.SERVLET_PARAMETER_PRODUCTION_MODE, "false").equals(
+                "true");
+        if (!productionMode) {
+            getLogger().warning(Constants.NOT_PRODUCTION_MODE_INFO);
+        }
+    }
+
+    /**
+     * Log a warning if cross-site request forgery protection is disabled.
+     */
+    private void checkXsrfProtection() {
+        xsrfProtectionEnabled = !getApplicationOrSystemProperty(
+                Constants.SERVLET_PARAMETER_DISABLE_XSRF_PROTECTION, "false")
+                .equals("true");
+        if (!xsrfProtectionEnabled) {
+            getLogger().warning(Constants.WARNING_XSRF_PROTECTION_DISABLED);
+        }
+    }
+
+    /**
+     * Log a warning if resource cache time is set but is not an integer.
+     */
+    private void checkResourceCacheTime() {
+        try {
+            resourceCacheTime = Integer
+                    .parseInt(getApplicationOrSystemProperty(
+                            Constants.SERVLET_PARAMETER_RESOURCE_CACHE_TIME,
+                            "3600"));
+        } catch (NumberFormatException e) {
+            getLogger().warning(
+                    Constants.WARNING_RESOURCE_CACHING_TIME_NOT_NUMERIC);
+            resourceCacheTime = 3600;
+        }
+    }
+
+    private void checkHeartbeatInterval() {
+        try {
+            heartbeatInterval = Integer
+                    .parseInt(getApplicationOrSystemProperty(
+                            Constants.SERVLET_PARAMETER_HEARTBEAT_INTERVAL,
+                            "300"));
+        } catch (NumberFormatException e) {
+            getLogger().warning(
+                    Constants.WARNING_HEARTBEAT_INTERVAL_NOT_NUMERIC);
+            heartbeatInterval = 300;
+        }
+    }
+
+    private void checkIdleUICleanup() {
+        idleRootCleanupEnabled = getApplicationOrSystemProperty(
+                Constants.SERVLET_PARAMETER_CLOSE_IDLE_UIS, "false").equals(
+                "true");
+    }
+
+    private Logger getLogger() {
+        return Logger.getLogger(getClass().getName());
+    }
+
+    @Override
+    public Properties getInitParameters() {
+        return initParameters;
+    }
+
+}

diff --git a/server/src/com/vaadin/server/LegacyApplication.java b/server/src/com/vaadin/server/LegacyApplication.java
new file mode 100644 (file)
index 0000000..6ac7ad2
--- /dev/null
+++ b/server/src/com/vaadin/server/LegacyApplication.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2011 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.server;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import com.vaadin.server.Terminal.ErrorEvent;
+import com.vaadin.server.Terminal.ErrorListener;
+import com.vaadin.ui.LegacyWindow;
+import com.vaadin.ui.UI;
+
+/**
+ * A special application designed to help migrating applications from Vaadin 6
+ * to Vaadin 7. The legacy application supports setting a main window, adding
+ * additional browser level windows and defining the theme for the entire
+ * application.
+ * 
+ * @deprecated This class is only intended to ease migration and should not be
+ *             used for new projects.
+ * 
+ * @since 7.0
+ */
+@Deprecated
+public abstract class LegacyApplication implements ErrorListener {
+    private LegacyWindow mainWindow;
+    private String theme;
+
+    private Map<String, LegacyWindow> legacyUINames = new HashMap<String, LegacyWindow>();
+
+    private boolean isRunning = true;
+
+    /**
+     * URL where the user is redirected to on application close, or null if
+     * application is just closed without redirection.
+     */
+    private String logoutURL = null;
+    private URL url;
+
+    /**
+     * Sets the main window of this application. Setting window as a main window
+     * of this application also adds the window to this application.
+     * 
+     * @param mainWindow
+     *            the UI to set as the default window
+     */
+    public void setMainWindow(LegacyWindow mainWindow) {
+        if (this.mainWindow != null) {
+            throw new IllegalStateException("mainWindow has already been set");
+        }
+        if (mainWindow.getSession() != null) {
+            throw new IllegalStateException(
+                    "mainWindow is attached to another application");
+        }
+        if (UI.getCurrent() == null) {
+            // Assume setting a main window from Application.init if there's
+            // no current UI -> set the main window as the current UI
+            UI.setCurrent(mainWindow);
+        }
+        addWindow(mainWindow);
+        this.mainWindow = mainWindow;
+    }
+
+    public void doInit(URL url) {
+        this.url = url;
+        VaadinServiceSession.getCurrent().setErrorHandler(this);
+        init();
+    }
+
+    protected abstract void init();
+
+    /**
+     * Gets the mainWindow of the application.
+     * 
+     * <p>
+     * The main window is the window attached to the application URL (
+     * {@link #getURL()}) and thus which is show by default to the user.
+     * </p>
+     * <p>
+     * Note that each application must have at least one main window.
+     * </p>
+     * 
+     * @return the UI used as the default window
+     */
+    public LegacyWindow getMainWindow() {
+        return mainWindow;
+    }
+
+    /**
+     * Sets the application's theme.
+     * <p>
+     * Note that this theme can be overridden for a specific UI with
+     * {@link VaadinServiceSession#getThemeForUI(UI)}. Setting theme to be
+     * <code>null</code> selects the default theme. For the available theme
+     * names, see the contents of the VAADIN/themes directory.
+     * </p>
+     * 
+     * @param theme
+     *            the new theme for this application.
+     */
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
+
+    /**
+     * Gets the application's theme. The application's theme is the default
+     * theme used by all the uIs for which a theme is not explicitly defined. If
+     * the application theme is not explicitly set, <code>null</code> is
+     * returned.
+     * 
+     * @return the name of the application's theme.
+     */
+    public String getTheme() {
+        return theme;
+    }
+
+    /**
+     * <p>
+     * Gets a UI by name. Returns <code>null</code> if the application is not
+     * running or it does not contain a window corresponding to the name.
+     * </p>
+     * 
+     * @param name
+     *            the name of the requested window
+     * @return a UI corresponding to the name, or <code>null</code> to use the
+     *         default window
+     */
+    public LegacyWindow getWindow(String name) {
+        return legacyUINames.get(name);
+    }
+
+    /**
+     * Counter to get unique names for windows with no explicit name
+     */
+    private int namelessUIIndex = 0;
+
+    /**
+     * Adds a new browser level window to this application. Please note that UI
+     * doesn't have a name that is used in the URL - to add a named window you
+     * should instead use {@link #addWindow(UI, String)}
+     * 
+     * @param uI
+     *            the UI window to add to the application
+     * @return returns the name that has been assigned to the window
+     * 
+     * @see #addWindow(UI, String)
+     */
+    public void addWindow(LegacyWindow uI) {
+        if (uI.getName() == null) {
+            String name = Integer.toString(namelessUIIndex++);
+            uI.setName(name);
+        }
+
+        uI.setApplication(this);
+
+        legacyUINames.put(uI.getName(), uI);
+        uI.setSession(VaadinServiceSession.getCurrent());
+    }
+
+    /**
+     * Removes the specified window from the application. This also removes all
+     * name mappings for the window (see {@link #addWindow(UI, String) and
+     * #getWindowName(UI)}.
+     * 
+     * <p>
+     * Note that removing window from the application does not close the browser
+     * window - the window is only removed from the server-side.
+     * </p>
+     * 
+     * @param uI
+     *            the UI to remove
+     */
+    public void removeWindow(LegacyWindow uI) {
+        for (Entry<String, LegacyWindow> entry : legacyUINames.entrySet()) {
+            if (entry.getValue() == uI) {
+                legacyUINames.remove(entry.getKey());
+            }
+        }
+    }
+
+    /**
+     * Gets the set of windows contained by the application.
+     * 
+     * <p>
+     * Note that the returned set of windows can not be modified.
+     * </p>
+     * 
+     * @return the unmodifiable collection of windows.
+     */
+    public Collection<LegacyWindow> getWindows() {
+        return Collections.unmodifiableCollection(legacyUINames.values());
+    }
+
+    @Override
+    public void terminalError(ErrorEvent event) {
+        DefaultErrorListener.doDefault(event);
+    }
+
+    public VaadinServiceSession getContext() {
+        return VaadinServiceSession.getCurrent();
+    }
+
+    public void close() {
+        isRunning = false;
+        Collection<LegacyWindow> windows = getWindows();
+        for (LegacyWindow legacyWindow : windows) {
+            String logoutUrl = getLogoutURL();
+            if (logoutUrl == null) {
+                URL url = getURL();
+                if (url != null) {
+                    logoutUrl = url.toString();
+                }
+            }
+            if (logoutUrl != null) {
+                legacyWindow.getPage().setLocation(logoutUrl);
+            }
+            legacyWindow.getSession().cleanupUI(legacyWindow);
+        }
+    }
+
+    public boolean isRunning() {
+        return isRunning;
+    }
+
+    public URL getURL() {
+        return url;
+    }
+
+    /**
+     * Returns the URL user is redirected to on application close. If the URL is
+     * <code>null</code>, the application is closed normally as defined by the
+     * application running environment.
+     * <p>
+     * Desktop application just closes the application window and
+     * web-application redirects the browser to application main URL.
+     * </p>
+     * 
+     * @return the URL.
+     * 
+     * @deprecated might be refactored or removed before 7.0.0
+     */
+    @Deprecated
+    public String getLogoutURL() {
+        return logoutURL;
+    }
+
+    /**
+     * Sets the URL user is redirected to on application close. If the URL is
+     * <code>null</code>, the application is closed normally as defined by the
+     * application running environment: Desktop application just closes the
+     * application window and web-application redirects the browser to
+     * application main URL.
+     * 
+     * @param logoutURL
+     *            the logoutURL to set.
+     * 
+     * @deprecated might be refactored or removed before 7.0.0
+     */
+    @Deprecated
+    public void setLogoutURL(String logoutURL) {
+        this.logoutURL = logoutURL;
+    }
+}
\ No newline at end of file

diff --git a/server/src/com/vaadin/server/LegacyApplicationUIProvider.java b/server/src/com/vaadin/server/LegacyApplicationUIProvider.java
index e2a58ba1bc9ef8136614c452d5ec2d3a13ded3ac..467e1c4a5efcbd9de0bdfb1b4486788eaf719d0c 100644 (file)
--- a/server/src/com/vaadin/server/LegacyApplicationUIProvider.java
+++ b/server/src/com/vaadin/server/LegacyApplicationUIProvider.java
@@ -21,7 +21,6 @@ import java.net.URL;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
 

diff --git a/server/src/com/vaadin/server/LegacyVaadinPortlet.java b/server/src/com/vaadin/server/LegacyVaadinPortlet.java
index f186971f7cfb13638a804dfe3111dabc8ac3f4ac..92079653c760c9fb6352e7fbd36e8bea481c456d 100644 (file)
--- a/server/src/com/vaadin/server/LegacyVaadinPortlet.java
+++ b/server/src/com/vaadin/server/LegacyVaadinPortlet.java
@@ -20,7 +20,6 @@ import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
 import javax.portlet.PortletRequest;
 
-import com.vaadin.LegacyApplication;
 
 public class LegacyVaadinPortlet extends VaadinPortlet {
 

diff --git a/server/src/com/vaadin/server/LegacyVaadinServlet.java b/server/src/com/vaadin/server/LegacyVaadinServlet.java
index d2f55211e5781b29df09e28586878d5c3bf11b1a..8ee10f5176c1698e544defa469ec81cd4ac75da5 100644 (file)
--- a/server/src/com/vaadin/server/LegacyVaadinServlet.java
+++ b/server/src/com/vaadin/server/LegacyVaadinServlet.java
@@ -20,7 +20,6 @@ import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
-import com.vaadin.LegacyApplication;
 
 public class LegacyVaadinServlet extends VaadinServlet {
 

diff --git a/server/src/com/vaadin/server/ServletPortletHelper.java b/server/src/com/vaadin/server/ServletPortletHelper.java
index 15c3e1895916a9423d421b5eece57479b32aa4c4..1bcfdf86924630296963185b1f228a1e42f5b03d 100644 (file)
--- a/server/src/com/vaadin/server/ServletPortletHelper.java
+++ b/server/src/com/vaadin/server/ServletPortletHelper.java
@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.Locale;
 import java.util.Properties;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.UI;

diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index b18eff2f0938514c6dde6336ee5cac804626e3be..818cde28793e3c235b052269c5bcb1dd181b1600 100644 (file)
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -50,7 +50,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.liferay.portal.kernel.util.PortalClassInvoker;
 import com.liferay.portal.kernel.util.PropsUtil;
-import com.vaadin.DefaultDeploymentConfiguration;
 import com.vaadin.server.AbstractCommunicationManager.Callback;
 import com.vaadin.ui.UI;
 import com.vaadin.util.CurrentInstance;

diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java
index 05e79500bbaa82f61ae813233e8e653305d444fc..d79210206ba58b87b63cf82b236904bf4d3ca892 100644 (file)
--- a/server/src/com/vaadin/server/VaadinService.java
+++ b/server/src/com/vaadin/server/VaadinService.java
@@ -32,7 +32,6 @@ import javax.portlet.PortletContext;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.annotations.PreserveOnRefresh;
 import com.vaadin.event.EventRouter;
 import com.vaadin.shared.ui.ui.UIConstants;

diff --git a/server/src/com/vaadin/server/VaadinServiceSession.java b/server/src/com/vaadin/server/VaadinServiceSession.java
index de5accbfd08ef268ee58d8152c0658299db592ca..37eebe3a4ccc7740c255ba3a23ffaa1f48a9f99e 100644 (file)
--- a/server/src/com/vaadin/server/VaadinServiceSession.java
+++ b/server/src/com/vaadin/server/VaadinServiceSession.java
@@ -36,7 +36,6 @@ import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.annotations.PreserveOnRefresh;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.ConverterFactory;

diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index 67f369185537d7584efc75d932093749e5ea43a2..eb84e54d85231de3962836a573f9d1ca7ad03ef5 100644 (file)
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -41,7 +41,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.vaadin.DefaultDeploymentConfiguration;
 import com.vaadin.sass.ScssStylesheet;
 import com.vaadin.server.AbstractCommunicationManager.Callback;
 import com.vaadin.shared.ApplicationConstants;

diff --git a/server/src/com/vaadin/ui/LegacyWindow.java b/server/src/com/vaadin/ui/LegacyWindow.java
index 572d3f8490b57af8c66f712bf1a9f065caef7bc1..88559af0b5f2c4c791b71a3378e9ec3934c1121c 100644 (file)
--- a/server/src/com/vaadin/ui/LegacyWindow.java
+++ b/server/src/com/vaadin/ui/LegacyWindow.java
@@ -7,7 +7,7 @@ package com.vaadin.ui;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Page;
 import com.vaadin.server.Resource;
 import com.vaadin.server.VaadinRequest;
@@ -18,7 +18,7 @@ import com.vaadin.shared.ui.BorderStyle;
 /**
  * Helper class to emulate the main window from Vaadin 6 using UIs. This
  * class should be used in the same way as Window used as a browser level
- * window in Vaadin 6 with {@link com.vaadin.LegacyApplication}
+ * window in Vaadin 6 with {@link com.vaadin.server.LegacyApplication}
  */
 @Deprecated
 public class LegacyWindow extends UI {

diff --git a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index cd646223929ba71182316a5938fbbc1e830571ce..5f9269c6e380f1d5e9d1445fadd9746fefd64002 100644 (file)
--- a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -13,7 +13,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import junit.framework.TestCase;
 
-import com.vaadin.DefaultDeploymentConfiguration;
 
 public class TestAbstractApplicationServletStaticFilesLocation extends TestCase {
 

diff --git a/server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoader.java b/server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoader.java
index 82b99443714fd92b5e3e1059e01ee0880504974e..71749ed9641094a5f63d0045b568182266c513ba 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoader.java
+++ b/server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoader.java
@@ -8,7 +8,7 @@ import junit.framework.TestCase;
 
 import org.easymock.EasyMock;
 
-import com.vaadin.DefaultDeploymentConfiguration;
+import com.vaadin.server.DefaultDeploymentConfiguration;
 import com.vaadin.server.DefaultUIProvider;
 import com.vaadin.server.DeploymentConfiguration;
 import com.vaadin.server.UIClassSelectionEvent;

diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
index 0ba1ce0859ac9aa28537e9ee0c607215b211a5ac..031b332ee732bf5f41a4a0021e8edb7fa6920fae 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
@@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.VaadinServiceSession;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;

diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index 37f74471d2dbc9db21a8dcb9cdaf8513d3c7f30b..0634943d09fdc1133de9709d22d7e2907cf1ea65 100644 (file)
--- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -29,7 +29,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.LegacyVaadinServlet;
 import com.vaadin.server.ServiceException;
 import com.vaadin.server.SessionInitEvent;

diff --git a/uitest/src/com/vaadin/tests/Components.java b/uitest/src/com/vaadin/tests/Components.java
index 788c67571f7794fa3dddb5653616b69f4e15dcff..de408104aec4b140587ae3680dd8507422c87b06 100644 (file)
--- a/uitest/src/com/vaadin/tests/Components.java
+++ b/uitest/src/com/vaadin/tests/Components.java
@@ -9,13 +9,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
 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.LegacyApplication;
 import com.vaadin.server.Sizeable;
 import com.vaadin.shared.MouseEventDetails.MouseButton;
 import com.vaadin.shared.ui.label.ContentMode;

diff --git a/uitest/src/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java
index 61d636099ff5e5d6d801c8754723b42023ca0bde..ea4cb9564c2e2ef360089048b59fad14e6f32c9e 100644 (file)
--- a/uitest/src/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java
@@ -43,7 +43,7 @@ import com.vaadin.ui.Tree;
  * @since 4.0.0
  * 
  */
-public class CustomLayoutDemo extends com.vaadin.LegacyApplication implements
+public class CustomLayoutDemo extends com.vaadin.server.LegacyApplication implements
         Listener {
 
     private CustomLayout mainLayout = null;

diff --git a/uitest/src/com/vaadin/tests/LayoutDemo.java b/uitest/src/com/vaadin/tests/LayoutDemo.java
index fbd6fd08214294dfff9cfd87ec76e4dce9025219..b0492c22c159cccaffdeac16858bc65fc1b6588c 100644 (file)
--- a/uitest/src/com/vaadin/tests/LayoutDemo.java
+++ b/uitest/src/com/vaadin/tests/LayoutDemo.java
@@ -37,7 +37,7 @@ import com.vaadin.ui.VerticalLayout;
  * @since 4.0.0
  * 
  */
-public class LayoutDemo extends com.vaadin.LegacyApplication {
+public class LayoutDemo extends com.vaadin.server.LegacyApplication {
 
     /**
      * Initialize Application. Demo components are added to main window.

diff --git a/uitest/src/com/vaadin/tests/ListenerOrder.java b/uitest/src/com/vaadin/tests/ListenerOrder.java
index 39bc25ab29c89659a9e3a103a1f5dc80fa7a0e65..1576a5888fb0d25e2d96571ef8339c6c5ec13613 100644 (file)
--- a/uitest/src/com/vaadin/tests/ListenerOrder.java
+++ b/uitest/src/com/vaadin/tests/ListenerOrder.java
@@ -16,7 +16,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Select;
 
-public class ListenerOrder extends com.vaadin.LegacyApplication implements
+public class ListenerOrder extends com.vaadin.server.LegacyApplication implements
         Button.ClickListener, PropertySetChangeListener, ItemSetChangeListener,
         ValueChangeListener {
 

diff --git a/uitest/src/com/vaadin/tests/ModalWindow.java b/uitest/src/com/vaadin/tests/ModalWindow.java
index 74c408aa879b75ad68d677fe8c0d19d71eaa840e..47db1141c0950ee860a155a21cc78568920ed23e 100644 (file)
--- a/uitest/src/com/vaadin/tests/ModalWindow.java
+++ b/uitest/src/com/vaadin/tests/ModalWindow.java
@@ -34,7 +34,7 @@ import com.vaadin.ui.Window;
  * @see com.vaadin.ui.Window
  * @see com.vaadin.ui.Label
  */
-public class ModalWindow extends com.vaadin.LegacyApplication implements
+public class ModalWindow extends com.vaadin.server.LegacyApplication implements
         ClickListener {
 
     private Window test;

diff --git a/uitest/src/com/vaadin/tests/NativeWindowing.java b/uitest/src/com/vaadin/tests/NativeWindowing.java
index 833e7b3ab5829e0e468e462f45d4ab3262adcf03..ddd72d7beca8494a5f5f4e990bf3b0ad30e34aa7 100644 (file)
--- a/uitest/src/com/vaadin/tests/NativeWindowing.java
+++ b/uitest/src/com/vaadin/tests/NativeWindowing.java
@@ -19,7 +19,7 @@ package com.vaadin.tests;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/Parameters.java b/uitest/src/com/vaadin/tests/Parameters.java
index dd2a2a3759b0ce0da4b3bbbd65e032c1dbf0fc06..4dca5d186050276cd2912833ab9043dbd35818c2 100644 (file)
--- a/uitest/src/com/vaadin/tests/Parameters.java
+++ b/uitest/src/com/vaadin/tests/Parameters.java
@@ -41,7 +41,7 @@ import com.vaadin.ui.VerticalLayout;
  * 
  * @since 3.1.1
  */
-public class Parameters extends com.vaadin.LegacyApplication implements
+public class Parameters extends com.vaadin.server.LegacyApplication implements
         RequestHandler {
 
     private final Label context = new Label();

diff --git a/uitest/src/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/com/vaadin/tests/RandomLayoutStress.java
index db46f49904b3a518445207f67db85fbad50e9e58..bc8ea14fd735038cc000849df3f2d04afd10beaa 100644 (file)
--- a/uitest/src/com/vaadin/tests/RandomLayoutStress.java
+++ b/uitest/src/com/vaadin/tests/RandomLayoutStress.java
@@ -42,7 +42,7 @@ import com.vaadin.ui.VerticalLayout;
  * @author Vaadin Ltd.
  * 
  */
-public class RandomLayoutStress extends com.vaadin.LegacyApplication {
+public class RandomLayoutStress extends com.vaadin.server.LegacyApplication {
 
     private final Random seededRandom = new Random(1);
 

diff --git a/uitest/src/com/vaadin/tests/ScrollbarStressTest.java b/uitest/src/com/vaadin/tests/ScrollbarStressTest.java
index f06e91f177385dd675cd9cd3a2739c29947162e7..c671c5aa71a8592e7a8856808df48ca2d804006c 100644 (file)
--- a/uitest/src/com/vaadin/tests/ScrollbarStressTest.java
+++ b/uitest/src/com/vaadin/tests/ScrollbarStressTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/TestBench.java b/uitest/src/com/vaadin/tests/TestBench.java
index fac98b3b8ba418abd83afc14af607bf3f41d094c..ca343b9e2afb3fc7c645918298ee752eec6cf3e8 100644 (file)
--- a/uitest/src/com/vaadin/tests/TestBench.java
+++ b/uitest/src/com/vaadin/tests/TestBench.java
@@ -24,10 +24,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Page;
 import com.vaadin.server.Page.FragmentChangedEvent;
 import com.vaadin.ui.Component;
@@ -51,7 +51,7 @@ import com.vaadin.ui.VerticalLayout;
  * @author Vaadin Ltd.
  * 
  */
-public class TestBench extends com.vaadin.LegacyApplication implements
+public class TestBench extends com.vaadin.server.LegacyApplication implements
         Property.ValueChangeListener {
 
     // Add here packages which are used for finding testable classes

diff --git a/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index 7436658ef43668b778b55a70da26b79cd7cce92b..ec037465dd4dcebf73dd8986ebae096521dff935 100644 (file)
--- a/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java
index 6ddce101d89f840da9f7cca43ab8a461a17d805a..95ffe8b706b3d87dc3ca69c7b3470a2141fa2032 100644 (file)
--- a/uitest/src/com/vaadin/tests/TestForNativeWindowing.java
+++ b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java
@@ -19,7 +19,7 @@ package com.vaadin.tests;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/com/vaadin/tests/TestForStyledUpload.java
index 6442895d87361f402606111ad4af2afd1722df3a..6532d3acc876258b4549477bec17be94f41536ba 100644 (file)
--- a/uitest/src/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/com/vaadin/tests/TestForStyledUpload.java
@@ -26,7 +26,7 @@ import java.io.OutputStream;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.StreamResource;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java
index c9ada7300d65a2f5167847f96cb530f22e511621..a50eeafb138572a6460a595bb39bf1c9c3e21f05 100644 (file)
--- a/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java
+++ b/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java
@@ -23,7 +23,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 
-public class TestSetVisibleAndCaching extends com.vaadin.LegacyApplication {
+public class TestSetVisibleAndCaching extends com.vaadin.server.LegacyApplication {
 
     Panel panelA = new Panel("Panel A");
     Panel panelB = new Panel("Panel B");

diff --git a/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java
index ce720c27dcdd990bb22b68dc16d2ec35cfd1e2c4..7d9cdd86f2c3852ce5dca833f406cd5532e10b41 100644 (file)
--- a/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java
+++ b/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java
@@ -21,10 +21,10 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.ui.AbstractComponent;

diff --git a/uitest/src/com/vaadin/tests/TestSplitPanel.java b/uitest/src/com/vaadin/tests/TestSplitPanel.java
index 83ab607f85680d368b6f2ffda342211003225c61..11662e98910989420d3b14d37ac80d17074b557e 100644 (file)
--- a/uitest/src/com/vaadin/tests/TestSplitPanel.java
+++ b/uitest/src/com/vaadin/tests/TestSplitPanel.java
@@ -20,7 +20,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalSplitPanel;
 
-public class TestSplitPanel extends com.vaadin.LegacyApplication {
+public class TestSplitPanel extends com.vaadin.server.LegacyApplication {
 
     VerticalSplitPanel verticalSplit = new VerticalSplitPanel();
 

diff --git a/uitest/src/com/vaadin/tests/TreeFilesystem.java b/uitest/src/com/vaadin/tests/TreeFilesystem.java
index 8b85c98f6f48c4adf0972a5c1b58361c675889fb..e67ee28b7570f89996b214f2b4ac94e0e1761946 100644 (file)
--- a/uitest/src/com/vaadin/tests/TreeFilesystem.java
+++ b/uitest/src/com/vaadin/tests/TreeFilesystem.java
@@ -37,7 +37,7 @@ import com.vaadin.ui.Tree.ExpandEvent;
  * @since 4.0.0
  * 
  */
-public class TreeFilesystem extends com.vaadin.LegacyApplication implements
+public class TreeFilesystem extends com.vaadin.server.LegacyApplication implements
         Tree.ExpandListener {
 
     // Filesystem explorer panel and it's components

diff --git a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
index c8c880a72555a9ebe54cd4b476639fc7a7d9c1f5..f7ca6b1ea2a985ee339b8b3abfd43522742fe04f 100644 (file)
--- a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
@@ -41,7 +41,7 @@ import com.vaadin.ui.VerticalLayout;
  * @since 4.0.0
  * 
  */
-public class TreeFilesystemContainer extends com.vaadin.LegacyApplication
+public class TreeFilesystemContainer extends com.vaadin.server.LegacyApplication
         implements Listener {
 
     // Filesystem explorer panel and it's components

diff --git a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
index cc3f020e06790a5d64869a9b9e7c1447d0354706..4d0c7536cba3d599484338f2b112540223736b92 100644 (file)
--- a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
@@ -27,7 +27,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Select;
 
-public class UsingObjectsInSelect extends com.vaadin.LegacyApplication
+public class UsingObjectsInSelect extends com.vaadin.server.LegacyApplication
         implements ValueChangeListener {
 
     private final Select select = new Select();

diff --git a/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java
index 827be38e794cc601ba3f04abbd62632d79b30053..5feb904873f03c78799687cb9038ec1211808356 100644 (file)
--- a/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java
+++ b/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.appengine;
 
 import com.google.apphosting.api.DeadlineExceededException;
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.server.ClassResource;
 import com.vaadin.server.DownloadStream;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Embedded;

diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestCase.java b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
index 67f61944fbb623d950f98a6858a839fe81db7a32..e7423173c7c4bb8302b820c4bef323d0027593a6 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.VaadinServiceSession;
 import com.vaadin.server.WebBrowser;
 

diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
index 1041b1f65680fe9ebdb43d89e7d7e91651a27eed..2187c24e917aeabf304ef5f97c0cab79dc625d0d 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.combobox;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
index ec8630879a83fac498bc29171d78056e534a68b2..44fdcccda8608f76ddfbda81a6c92f8b8e782869 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
+++ b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.form;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Form;

diff --git a/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
index 40e0bfad81d28c793af706502ad5d4df4d636343..3a9ce202c72e13751d3f5ac5c90e2871f0d34e96 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.loginform;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.LoginForm;
 import com.vaadin.ui.LoginForm.LoginEvent;

diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
index 5c3c6fcdc82161142a46cf254538d7a6463e6c59..6235ed96171ec18153abd254f472f76f9638ddbb 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.orderedlayout;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Embedded;

diff --git a/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java
index 1ce29b9f20d847e4a2a38848cded030d5db875ba..1df2ab0ae1b6953c9c4af2b53523fe9e5b18e977 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.ProgressIndicator;

diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
index 9e4cbace32d8b3b4aee266e793350028e7a5e0a1..452384a8e4eae85c1f6a9e51a79a3343ced870b2 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.textfield;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;

diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
index 8144939d1ab0c9f7f027a8d3a4d88b8a4743ad21..49416a73e54401e806c04cd80f9cafbe6f83afa3 100644 (file)
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
@@ -2,12 +2,12 @@ package com.vaadin.tests.containers.sqlcontainer;
 
 import java.sql.SQLException;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Form;

diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
index ee96e8f9f58acce580d701f0e9d2370b276adc0c..2edf7df5f03675e18b8ca715222f3a556757d894 100644 (file)
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.containers.sqlcontainer;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
index 8c3ca52427187be279318248e5e5f044f38fdbfc..8fdc60f293bc4a9637e9095fb60346e4fde7cc5b 100644 (file)
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.containers.sqlcontainer;
 
 import java.sql.SQLException;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.sqlcontainer.SQLContainer;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
index 37c13b1892ca92185ce5318cfe032bf5656a0e86..e49e5279757e1703ddb4d8c09124558a1343badc 100644 (file)
--- a/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.integration;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.server.ClassResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java b/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java
index 9e2294285b666785e16d938002b0deb3cec80417..81b7ebb6536e2a4ee3e79c6378cde94b30dd8052 100644 (file)
--- a/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java
@@ -18,9 +18,9 @@ import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
 import javax.portlet.WindowState;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.annotations.StyleSheet;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.VaadinPortletSession;
 import com.vaadin.server.VaadinPortletSession.PortletListener;
 import com.vaadin.shared.ui.label.ContentMode;

diff --git a/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java
index c0846eade070fc56eaf3be732a78caecfd641176..45a32dd53aacf1c0c293b3df3804cdb469e07045 100644 (file)
--- a/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java
+++ b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java
@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.Locale;
 
-import com.vaadin.LegacyApplication;
 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.LegacyApplication;
 import com.vaadin.server.Page;
 import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;

diff --git a/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
index 74e0de1af46bc5fb918d60af910df0d00d540622..c8fa44817206078846b8d68a3c3e3a8b622bd62d 100644 (file)
--- a/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.integration;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;

diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
index a1552a61a6363136ad9abe99f9eea5c895523581..bdda3480050901dafa39250aa4f301b0f15f1f13 100644 (file)
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;

diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
index ddf79989f19240c3bfba3de11a153445ac965129..69aa1005421fd22a137e357ea033448dae545c47 100644 (file)
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.layouts.layouttester;
 
 import java.util.Date;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.server.SystemError;
 import com.vaadin.server.ThemeResource;

diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
index 9ad7c46b905dcfa1fbc665280390ee0fda46efc9..113106a40b712dba744bad2033f0bc62622275ef 100644 (file)
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.layouts.layouttester;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.server.SystemError;
 import com.vaadin.server.ThemeResource;

diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index 5eb11aea0d870d143e296d94e762af9efc48c8f5..654a282bb453494dfbaba596156d7bb4565dd9c5 100644 (file)
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.layouts.layouttester;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.server.SystemError;
 import com.vaadin.server.ThemeResource;

diff --git a/uitest/src/com/vaadin/tests/themes/ButtonsTest.java b/uitest/src/com/vaadin/tests/themes/ButtonsTest.java
index d713f45a0735376609c5b71b4d63af0f3ee69c37..41d986237c292ca8f76a919fd99eff17b09e916a 100644 (file)
--- a/uitest/src/com/vaadin/tests/themes/ButtonsTest.java
+++ b/uitest/src/com/vaadin/tests/themes/ButtonsTest.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.NativeButton;
 
 @SuppressWarnings("serial")
-public class ButtonsTest extends com.vaadin.LegacyApplication {
+public class ButtonsTest extends com.vaadin.server.LegacyApplication {
 
     final LegacyWindow main = new LegacyWindow("Button states & themes");
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
index 4241b531787370571c9085d5f7e4bdb1bb341938..229ad8ee1f523f5737b89bb97a417dd140d220ee 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.Alignment;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1230.java b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
index 27d51f663ab6294cf5ee69ebed635765e98a9669..3a707934b6b3732b38519bfc99ea731e708a8c67 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket124.java b/uitest/src/com/vaadin/tests/tickets/Ticket124.java
index d9b3586c00594cf5598131bcea400a54b79a6c9f..3c2724e991730b31178e8833a93297414a116395 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket124.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket124.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1245.java b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
index 9adb43dbb85a331a4ec2c2ba8f4752086e04d731..082363a1e59a005f0777398952d9bd2d74d73c79 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.Tree;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
 
-public class Ticket1245 extends com.vaadin.LegacyApplication {
+public class Ticket1245 extends com.vaadin.server.LegacyApplication {
 
     TextField f = new TextField();
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1365.java b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java
index 1d65141834fc0960ed807a35307f55bc16fa3d75..d7f397e488464b4aeb3acbb7e3fd38a0c6710a1e 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1365.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1365 extends com.vaadin.LegacyApplication implements Handler {
+public class Ticket1365 extends com.vaadin.server.LegacyApplication implements Handler {
 
     TextField f = new TextField();
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1368.java b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java
index e4a1767a96b10549176f60de0672f574dd70bcf9..75441d9ae9968d6a462a95742f15396dfdf2b5c6 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1368.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
index 5516f9c3b08bf0cab421c40e61906cca8b34641a..49bdc51b0d2a4ae725f3f053ff6a2397ad768522 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.tickets;
 
 import java.util.Date;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.InlineDateField;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1435.java b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
index e84ce5652baa5b03da2f28ef5aaf0975cdfafe95..42b6b90c490d9e0d3d76f2f3d8c9f196fa99cf1f 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
index ac7e332ca4a6196d03b1d4aafbb19ba22ddb9fcf..2fd9de17525d8ce69f924591c835665594af850b 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
index 0cbe4855cf950c6453386a2b8f2dfb1d9cfc624b..f129f01c63cc2592e23711487c12dbc8acd193e3 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1519.java b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
index aa792d3dd7ac0bcd0522778383c8946fe6dc5dcd..776a4aefff78e672d908e1e78f2d97a523e4e61b 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TabSheet;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1572.java b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
index 4b9a0709f49d98edd4b39c46e090a66f23575488..bce5891afa9b6b9aeae6c7da946d925ffbf21a8c 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 
-public class Ticket1572 extends com.vaadin.LegacyApplication {
+public class Ticket1572 extends com.vaadin.server.LegacyApplication {
 
     private Label state;
     private GridLayout gl;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1581.java b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java
index 2f9481992b13da415a88cf7955f1a77cea8d3ab3..76673021bb2c29b375e531e93a2bc6c6d6636adb 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1581.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.ProgressIndicator;
 
-public class Ticket1581 extends com.vaadin.LegacyApplication {
+public class Ticket1581 extends com.vaadin.server.LegacyApplication {
 
     private Label time;
     private ProgressIndicator poller;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
index facf3c6133ad59ab8380ab9a37dd3af8b127b84d..67b5e3e347ad305e6ad49483787f7872ade116fc 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
@@ -10,9 +10,9 @@ import java.util.Date;
 
 import javax.imageio.ImageIO;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.DownloadStream;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.RequestHandler;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1598.java b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
index fb041d19960860e02ec42038d41a722ed8e9290a..7c574afcc90b9b82183391dc7234389ed0cc96ee 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.MenuBar;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket161.java b/uitest/src/com/vaadin/tests/tickets/Ticket161.java
index 1149b19867f6fe3003668234429f0d5a42025cd0..dda769d2d4f7a72fa0e64a20be2399cbd1393638 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket161.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket161.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1632.java b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
index 88bf1f9f62a644b7899b726071439f84d9089c06..b111bab2ee87fba122221c4fb808e9bbf0e03ce8 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1659.java b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
index edaaddc4999e39019f6469d4e8a601b8df0a8261..826a5539d82062c5ca9bd31a83c5c9f37114591f 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1663.java b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
index 27c61eba49d1da93bafc3c28981d829514796795..684e14ed2a10563b871fc39ce1d703e9aebe915c 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
@@ -4,7 +4,7 @@ import com.vaadin.server.SystemError;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1663 extends com.vaadin.LegacyApplication {
+public class Ticket1663 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
index 543719c13237681427edbce4ca3957f2c238fb11..7d2e7b727133908e30ac2ce2286017b5c9a3ee67 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;
 
-public class Ticket1673 extends com.vaadin.LegacyApplication {
+public class Ticket1673 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1710.java b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java
index f0eb56910b5a727138256880d85634db4a2a12f1..7115a1c80e2681d6263b31bde3e77ac48f795b9d 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1710.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java
@@ -28,7 +28,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1710 extends com.vaadin.LegacyApplication {
+public class Ticket1710 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1737.java b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java
index 80a00722313895a1f90fa7447ca70771a3c34c99..4e346d03f369260f7a0f9ef599f11e0e5edd5c4a 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1737.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.ClassResource;
 import com.vaadin.server.DownloadStream;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1767.java b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
index 08cc595572684a23870602c49abc679d8f8a84ed..85e0758b731a8e126b72ca274643046ed8aaa6cf 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.LegacyWindow;
 
-public class Ticket1767 extends com.vaadin.LegacyApplication {
+public class Ticket1767 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1772.java b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java
index eb584adfb8ad2eec222b87795f6095887fcf84af..7dfc608dcc9bc180f33fdd0640e3675613cedb8c 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1772.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1772 extends com.vaadin.LegacyApplication {
+public class Ticket1772 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1775.java b/uitest/src/com/vaadin/tests/tickets/Ticket1775.java
index f0bfff71330e79e0e07c0817f8204de39e4e7427..c6f3e56af4755058f8fc9d42f84339b95822e417 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1775.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1775.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 
-public class Ticket1775 extends com.vaadin.LegacyApplication {
+public class Ticket1775 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java
index e20e0e1ec50888b1cf92e48fddc6bbd246f2fdac..f4516f767afe5475051c58d52f8ec758faf4fca5 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java
@@ -15,7 +15,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Select;
 import com.vaadin.ui.Window;
 
-public class Ticket1804 extends com.vaadin.LegacyApplication {
+public class Ticket1804 extends com.vaadin.server.LegacyApplication {
 
     LinkedList<Select> listOfAllFields = new LinkedList<Select>();
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1805.java b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java
index b8165fe19504317758187a072274306053bdd378..e07310487f75d853c441f241d202368935f36147 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1805.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Layout.MarginHandler;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1805 extends com.vaadin.LegacyApplication {
+public class Ticket1805 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1806.java b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java
index aad81bbe6a21391e2bcd9410acd7a7e39f24c759..2c6018eb1c6ef70d864da93f0c15031d80fe6b4b 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1806.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1806 extends com.vaadin.LegacyApplication {
+public class Ticket1806 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java
index b244d55b068cb9bbd1769fa631507290a150f5d5..1cb122a23e146a00381d603ef3d4551d84f0d560 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Window;
 
-public class Ticket1811 extends com.vaadin.LegacyApplication {
+public class Ticket1811 extends com.vaadin.server.LegacyApplication {
 
     LinkedList<TextField> listOfAllFields = new LinkedList<TextField>();
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java
index c9bd0404d04123fae28898f05d84bc672b78da82..b24eec115edbaf0135aa9be8ff68cb11d700de3c 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java
@@ -12,7 +12,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Select;
 import com.vaadin.ui.Window;
 
-public class Ticket1819 extends com.vaadin.LegacyApplication {
+public class Ticket1819 extends com.vaadin.server.LegacyApplication {
 
     LinkedList<Select> listOfAllFields = new LinkedList<Select>();
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
index aed5fc8a7ebd8a294f5228d9ae8a33b9bf1ef485..7d37eac5a2af8a4c705954dce08c0dba4b99fcc7 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 
-public class Ticket1834PanelScrolling extends com.vaadin.LegacyApplication {
+public class Ticket1834PanelScrolling extends com.vaadin.server.LegacyApplication {
 
     private static final int ROWS = 50;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
index b18da069b34f998cf9b3a923c373c2ea6353df1d..3e4a7e2267ed32358432308874c0ba4de3ec1492 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1868.java b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
index 010e090a2d4e4ab20da0a67364f93e879b545ee4..20e63d4c7ce11836db571613e138d378ca3f304f 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 
-public class Ticket1868 extends com.vaadin.LegacyApplication {
+public class Ticket1868 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1869.java b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java
index 54d95a14cb391d2a3e291c1b2e258546e0eddb80..8f5c1ce6331ac85e4d0f321cda92621bb91e86d5 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1869.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1869 extends com.vaadin.LegacyApplication {
+public class Ticket1869 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1878.java b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java
index 649a510ef24e2c9c153a85bfc7742bd2387cd3ce..4a7ef18049ea1c46312cc1d313bbf23360877cb9 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1878.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java
@@ -4,9 +4,9 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.Random;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1900.java b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
index 59d433af28c5465f1d09b807fcaa6ebd054431f1..35b7adc7b3060a3a01dfa5bed47618c5f44b3d53 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Validator;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1904.java b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
index 30ce5a0fc6498791eb70a1c1ac523f2a1b756eaf..677d88057ca99eab6b2320f9174817a31201fb51 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1916.java b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
index 0827768539525ff99f2b94df088c42c329b13ee3..16e930b75412e088856d09f73e34e88d17850b77 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.HorizontalLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1919.java b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
index e372bd0a02a546c9d604ceedf7b4dda10bb6a020..31e0422ca172a37b21981b261a040bf867981032 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 
-public class Ticket1919 extends com.vaadin.LegacyApplication {
+public class Ticket1919 extends com.vaadin.server.LegacyApplication {
 
     private GridLayout lo;
     private boolean on = true;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
index e94bf25108cc2b0fc661425c314c4695c3ee7b93..cde90ff3d67f361c6e805f9665a46aaab2d03d85 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import java.io.IOException;
 import java.util.Map;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.RequestHandler;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1923.java b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
index 3d4b995741285e6b616de4b4a2b7e8718158cad8..949acb628101f28716e07bae67c8703588fb0129 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1923 extends com.vaadin.LegacyApplication {
+public class Ticket1923 extends com.vaadin.server.LegacyApplication {
 
     private static final int ROWS = 50;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1925.java b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java
index 770c350933b500a561795ca5f7436a88ddfeab16..c00404ba988404fefa3b7704dbad016a0f45f2b9 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1925.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 
 public class Ticket1925 extends LegacyApplication {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1939.java b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
index e43f15121a6fd33f43f5b7e6010e86b62dcc3390..9b360d1da796afee484a9018c28b09c965359511 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1940.java b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
index 3c229d7bb4d67b2d519bf15e392bfc97f757549c..79790f441402b7223125ffd582607071851e5ccb 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1953.java b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
index 8f4e25f19cb47d02747e99ef164b5677a6de2a66..2a510cb7d1500ed650aac9c1bca1ac68cd126bd6 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
index 0f0ddf93314623a8b1dfaaefccbf7bbd293111d3..00d37d1a51d1aa8738ea514ac142e10d3114f74e 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
index 4f5d738aad427c35778061bd438f4a57176dcd9e..0ac7e9e5c5393214bb79c75fe7cd9c3ae62f7b8e 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
index eb3f078569b5d5ba1a1928ba2c1d52b047609960..6b2103542448093f5331f09b5d9aace4dff79afb 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1969.java b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
index c1ecc0610a734e8522cbe3e844532fa7fc720efa..0548feafe0f0c6471744e45d5feaa832b3899cbc 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1969 extends com.vaadin.LegacyApplication {
+public class Ticket1969 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java
index 6b1cb4ee83c6f71a7bc234887183e43c35ac0bfa..eb98153be015fb0b223ffd06d5cc01379c0f94cb 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.tickets;
 
 import java.util.Iterator;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1972.java b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
index 90cc834ebfeea430474bafb940829b5b2ee64f37..3d0adb6588580abb2cf7cd4bdd78ab52d0489e66 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1973.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
index e03f01fc93ab3e9924ce144f54696504a30344cf..427d6355470c39c604a93d17007dd69d0f72bcf2 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1973 extends com.vaadin.LegacyApplication {
+public class Ticket1973 extends com.vaadin.server.LegacyApplication {
 
     LegacyWindow main = new LegacyWindow();
     Table table = new Table();

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java
index 6651b43f9218aa43aaa93e15853dcc57065d4c14..301d9931ad7901ce8ccf1a9ce1aca0760be46530 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
index 10942d308e304278e386b70bc236ad07a8436a48..18caac808bee915a7bfbd93cd52beddd62ec3231 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
@@ -4,7 +4,7 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.VaadinService;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1982.java b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
index 5d6a692075f1b4fc25f8affafa11ddbb50fe092d..d8ec0f63fb85e30aa1e9a788579115e18f310a19 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1983.java b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
index d8076e1f8eb4dc5da0873b9fbf1f7be989f27654..789e8c3a450c8aad1a516eac48debbef075d1fa0 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Sizeable;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1986.java b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
index 9c9a0c2adf1398cd7a25995c89756fe316f6033c..f58a54ec9aa51d68ce54b19cd395a8cdc89e3baf 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.DateField;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1991.java b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
index 375427a50f065956f5e66ff35debd3c0db603e60..e1a9a47948f0adaf94fe52b933a3e6ea3d7ff073 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
@@ -4,7 +4,7 @@ import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;
 
-public class Ticket1991 extends com.vaadin.LegacyApplication {
+public class Ticket1991 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1995.java b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java
index 28d99cbfdeb472b1b2483aa1ac2393db8488b796..402baa1d345e8a80533e737b09882b63e4df8b03 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1995.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
 import com.vaadin.data.Container.Filterable;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.filter.SimpleStringFilter;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket20.java b/uitest/src/com/vaadin/tests/tickets/Ticket20.java
index 030b94bf793a5a62862f79664440a75bacc88cf7..34ff1274edff45c53d2a3330e8bef0a13a01d12c 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket20.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket20.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Validator;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.data.validator.CompositeValidator;
 import com.vaadin.data.validator.CompositeValidator.CombinationMode;
 import com.vaadin.data.validator.IntegerValidator;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2001.java b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
index fd9acc9ae17b98bf0de3ff76490bf3962a79906d..cf442e2218a0d2d893a5ab64fc7ae1c328b31f9e 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2002.java b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
index 1385873cc9628d4c80efd15ad60a2461f611a6ce..5424c31e8afd1e026458f9a9a219d3d3fd6e635e 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.MethodProperty;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2007.java b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
index 93edc6a94d9bb969f78ffe6c86fe9faca315727c..7d157c663c150084f72ee2650d8999e67eafa620 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2009.java b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
index 559112cdb40f1e7e53f0a214243b9d5dbdfb1242..3efc1d1e1c0a045569234dec7f40dbf3be032b10 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
@@ -15,7 +15,7 @@ import com.vaadin.ui.Tree;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
-public class Ticket2009 extends com.vaadin.LegacyApplication {
+public class Ticket2009 extends com.vaadin.server.LegacyApplication {
 
     TextField f = new TextField();
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2011.java b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java
index a2720404353ba3acd7c47f12c3530f4b76a87897..3ca09a2d80cb894acc29c1af349158f124c97be6 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2011.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Select;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2014.java b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
index 1b0b595335f5e2e32d3171b483c086db9a592b2b..c5f7db21cf477833dc7fbd1f1088d5e4b8f3ae20 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.tickets;
 
 import java.util.UUID;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2021.java b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
index 137c33beb278d3e6da4de30a070ccbe765ab8405..3f798a3e19fc763a95a633ecc7038e931cdfc3b2 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2022.java b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
index ccfb79d980b9428817bf33101c000c7edacb1f59..8631f8ea935557b123485284cbc85506239f3365 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.LegacyWindow;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2023.java b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
index 5699b4e6a4186072106beb5fbe53f03f17f343db..7c79f86fb2acc28e66425f3716bf7841eaf88ab9 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 
-public class Ticket2023 extends com.vaadin.LegacyApplication implements
+public class Ticket2023 extends com.vaadin.server.LegacyApplication implements
         Button.ClickListener {
 
     AbstractComponent c = new Button();

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2024.java b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java
index 7150b1810fd00b567670e90661ab2e3be030e3f4..c38ba7822aa5211df94eaca1f4a6779cc867b619 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2024.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2026.java b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
index f511bc71c706f58e8cb1b3fd48a7664840a938f3..59efa74df808357ff1b771a471dc9fb9bbd48144 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2029.java b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
index b4e6644c912473a49a2fb90de7d6b9b33d7721f3..8031041e5be9481863ba82e3aa86ca7b9653e1ee 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.tickets;
 
 import java.util.Random;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Component;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2037.java b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
index a2ef63bfece43a4d5a42601bce094f40f2520a4a..c7c705df1283c1b0d20cdc3e02b0b13835645573 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.Layout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket2037 extends com.vaadin.LegacyApplication {
+public class Ticket2037 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2038.java b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java
index ff009c3e578c544748fa4b28c12007b446d55694..12866da5703c6401eb542641feb34627de366d8b 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2038.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Notification;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2040.java b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
index a999b96bec75296184baa63dd2e809c7525e2429..45268e894752bdf2d6773f08179ed8a8a7f4d486 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
 
-public class Ticket2040 extends com.vaadin.LegacyApplication {
+public class Ticket2040 extends com.vaadin.server.LegacyApplication {
 
     TextField f = new TextField();
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2042.java b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java
index 029a9d6c69d095ff923a0871bf0c12e16c958ccf..56431258c00472297a6cfcd64fa6df789b9c532a 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2042.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2043.java b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
index ddfaa315c8e89785fce4497f7036f8969c286a1f..2ebcae1d33a11ce9537ec087d9b3633d37f972ac 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.BorderStyle;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2048.java b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
index d56f427f7b516cf95b6c0d35e8c1ef56a35f921e..cb6fba3ab899c9dbf29799eb1c38a5e97a37cf69 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2051.java b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
index 75b0dae036991b0d1c4ceb6a1a7dbb2bc2516b64..172ced73cc089a1671634a598b588921a26d07a7 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DateField;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2053.java b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
index 0bde0074a9f0e12f83760ca41fed1044d5af9f8f..14c8273c0da051b95b10cc14ffd3d342e45bbf0f 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2060.java b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
index 0fdbc039edb768f3726fef30311a36378368acaf..89966392263e30ae908beb8761c26b8edbd49611 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
index 0c861879f6524fc62ec835c5a6bb107d4f62de76..3838986bfa49ed8f9ce5a54c800821a1f003f057 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 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.server.LegacyApplication;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomComponent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
index 7727dff814cee8600bfc4ead6fd0d8a0561ea2b0..2246ebec2e77489b5d371de675ba21537861ff38 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 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.server.LegacyApplication;
 import com.vaadin.server.Sizeable;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Accordion;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
index 0173de050fe4a0464a67dc746d87a9755d95d0c8..d4728862446f3a7e9370eaa20e744475526554f9 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 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.server.LegacyApplication;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomComponent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2062.java b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
index ae3a08ff70a14c321c5f1837884698dc3d66330b..1c20d945d30fe04d527c444bfc24055dec17323b 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TabSheet;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2083.java b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
index 901ca313250954fed01da173f7b107ba7540d033..7d82dcab56a36b8e632f1691c439655ba8fdb77e 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2090.java b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
index fb01bf23dea308dcf5f18be83010056e50ca3c87..ed79a6079453d69c800d8b9499d4d50bb9eeb78a 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2095.java b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
index 4c15a5aa9ba942fefc0a18d0cee740079eb5f5f5..270da9dc3fe2c9cee956bfd5234d0bc638fc0072 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.LegacyWindow;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2098.java b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
index 24619a090e6d27660faf96f25f2d2861c1074776..983824daa9e69e2109069f817eb1a185693f86b8 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TabSheet;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2099.java b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
index 48ead759acc5a1a366aa479b7dd322cb54ff3c66..8b5d329977ad255a6804e09d548a88dbd99c5c95 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2101.java b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
index 62c11e6509a3ffe14de6ce60a533c5af4b43b694..d3e6202542927aa7f7c080653b954b61c199ad20 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.LegacyWindow;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2103.java b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
index a42075b1e2b25e8f325da577b9b176881506bda5..a21864a67dcf8a55e98c4c88288e3301e44a3f7f 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2104.java b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
index 17b3e9732cd0b500562e1a1eae47914e4e0932d3..da9f7fecc808ad9857a8afe705194ff90a8b9635 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property.ValueChangeEvent;
 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.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
index 395f8da7e78c5dda759c196cd5e068d13cf12027..08b7a738a7ea14bbd51fa78838f0b1731bb40567 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.tickets;
 
 import java.util.Date;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.CustomizedSystemMessages;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.SystemMessages;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2107.java b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
index 9f36347a99e48e1dcdc0b1136d2cacea7b6be709..7de0e2da2414ace1e7f7b3f95cccf9e29119f46d 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Validator;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Notification;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
index 5218f12f6c891ac495d28a664120fd416c1f2279..9cfa63b29e073890161a151e057057990511c9a6 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2119.java b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
index 229ad5385772a55ca529f0a1b445b6692c7bb3c8..c8002ff2cb976832f8662d515c40ed39c068d4b5 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
index b55fdff5139a87d4ee5e542fc0c1ccff6cb7f0d8..ba94bd394d634327da085b203b19a93894e424d2 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.MethodProperty;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2126.java b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
index acdf04c0d52697cb05cd76bf3c039fc963a79e6e..272470d5b601b35f280bc80b3796384b9b08b139 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
@@ -14,7 +14,7 @@ import com.vaadin.ui.Table;
  * client.
  * 
  */
-public class Ticket2126 extends com.vaadin.LegacyApplication {
+public class Ticket2126 extends com.vaadin.server.LegacyApplication {
 
     LegacyWindow main = new LegacyWindow();
     Table table = new Table();

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2151.java b/uitest/src/com/vaadin/tests/tickets/Ticket2151.java
index 50285ce7ca10e62f570dbe98c359d01a36d8a7fc..b48a327523c2b8c08475ff00ace88692c984ed8f 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2151.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2151.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.AbstractOrderedLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2157.java b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
index e41b8a9ad2843e282ee24213ee043d68cc18eb64..6b2cae773bd1ad634d905290cb42901b805e67f0 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2178.java b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
index b0989aa6d305adcab47d01a21b26404a515d8c3b..21bb4244caff1b7a1f23ac18bfea9ac2e4e978b7 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2179.java b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
index ac9f5f6df7740c4ff3820c2fc7104801e87eb829..06fb162f59a067879ee0fa139c49c8256c917d36 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Validator;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2180.java b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
index 86bcf31df5849d13231a06579851e7338197102e..dafebf06f25975551907599d9aae4be3ad3b1c07 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
index faa84dcd46104e851a18518cdcf64b3cda4e24a4..beefb9b719dc211be5efb2ae713264fca2cf64ec 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
@@ -5,7 +5,7 @@ import java.util.Date;
 import java.util.Random;
 import java.util.Set;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2186.java b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
index 7e09fb7eba6b60416aa560e7c6e261b3be98a53a..0f06711a834ff078fdc4b6bf7166cf3bcc631500 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2204.java b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
index db13cffbd20692a6f1113f1f71f5773386a39980..6ccb2d8494eab8b73b0ae7b655c6671f6b0ce5d9 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
@@ -5,9 +5,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItem;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.AbstractSplitPanel;
 import com.vaadin.ui.Accordion;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
index 86e0a9d6657f1af2761f41f16d2b79fbf85a8c6b..5589f242f11af213f4e97178d26f685832c36d8b 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
index bb388a072c4fbb85d40fc0044a42831a77f91c02..95666f93152f19d41931dfdaffe1a8752e23fcb3 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
index c2df9e16bf699ce81faea6e52bfc7e20dd6db2ad..b4832dc2d4a991cce8b794f49b45881b99bcf4d4 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
index 9fda647752f5d46aef3c892eb66b9b98c14c4739..58abbf51f51d1b297b28e14f5c5632296a5aabd5 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2215.java b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
index 57063f4666f6942c99949913400be7d65cdcb4e4..387f9465cc89112e288122aa09e2c3dd51078415 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2221.java b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
index 2323f4d5141f5d7ba5fffce73ba522257bf3070d..692b5ad86bd95546d0abd1fef6039d0a245f59b6 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2222.java b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
index 390b856beda16ebdc7d33072e5cab6cefbc87943..e86072d055e9a6abb6dd5b7f07e0a7d586760aeb 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
index 18ecd1262cab5963a56d3e47442b256740249b6a..eb7a08eafad2b60ba45886e3075acf10cfeb2a81 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2231.java b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
index 50a60050e579b48ac672586cda7d1cf2e4e6ac2f..5bc49e5c293f069ab96bd548955da07ae0e80756 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2232.java b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
index d806bf00465f7cc336c2dddb76e272ffee21f9b3..16fec93c441b17cd5ccd0d3a21a8b25bb3a7b74d 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2234.java b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
index c1a52eb00d778ebd30b7e3f12d5a8c159546453f..c7ccf118fa41e2f33392595f3ff564ec64716a47 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2235.java b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
index 3144ba3a6c396df9d8d04b6f25e41862f5e20fb7..ced57a26ce3a5b9c64e2d41f2df03ac0ac843206 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextArea;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
index 226a725e7f963bba2e9384e87f0d286073b05da4..1bec778b752d76768334d9d0c13836c3ed8b9bee 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
index c51785d0435260977d88bac2e566c9afb8a3e235..d100f61e307a123f1d3eddc3b8c3f06081707bc7 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 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.data.util.ObjectProperty;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2244.java b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
index e6087009bcd0f7c63e16d777b9f86d491a5a339f..fcb1c55f33f731ee5581dd6dc99a3e712f2b7012 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.BeanItem;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Form;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2245.java b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
index 1fb95df0a5835c86c45cd5bbce58a738d256acc2..493ec8f9f38f9333bd2ba3887f2777faa51beee5 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.LegacyWindow;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2267.java b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
index 701c38e6aa5326110bb9a9485c73b89f9792414e..74f2d77d6762015e533e478ea2e45e37128e54d6 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2271.java b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
index 08c1461ab3fbefbfaf8d8fc3b91bb22fff319bcf..f10f0df76ec809467adf0c06b0ec990425460b9e 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.ComboBox;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2282.java b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
index 7de2416374ee67ced280eeeadba91a33a4123426..b5d4990e215d0ed34a5b993e1e95d4f54973840c 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.FormLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2283.java b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
index a9abb5377f1ca2e9c9d9edaed5372f25799c68ea..ffe419293d83626e6c9a0f4dadfd7b5e1095230a 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2289.java b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
index 68e29df55db86d1d1052b69c8dff3b71f65fd49c..90bf5b1ae8bb7fc8e994178fabdcc8b210c62b9d 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
index 20376a9df6f9542a20ca24ee88a11f78597dd32b..f6ec542ad255f52d3b9e807a0b9aa6253f3c8803 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
@@ -21,7 +21,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Link;
 
-public class Ticket2292 extends com.vaadin.LegacyApplication implements
+public class Ticket2292 extends com.vaadin.server.LegacyApplication implements
         RequestHandler {
 
     @Override

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2294.java b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
index 5a5f3ca36a21d0b981377ebb888c8f69dad8bbce..ad8642ccf3e3fa08d1f10a639a470f849b9c90d0 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2296.java b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
index 5905164982bcbf29d9642b2d199c5125fadc2c87..13fd7cf557bfb2b11e8d0ce11b5a8bb9921dfe4f 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2303.java b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
index 2b844302c84b820364f4a9618500a9495d90eae6..be85f2d4819d2367376de52285d894a4d27b55e1 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2304.java b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
index 069b58fd883f362be3b3ac4c47036df97339b139..9ddca3d8c836cd16234c81aeb1f8304549f561e8 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2310.java b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
index 4cfe6244e2caefece191ad7130437e8198dfa9a6..2a526b9d0c62ccc733c005ec821d9239787f60e7 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2319.java b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
index f060f44fe2ec21e358c7973730ce7b88dad4845d..6534ffe37d0327dd4f94e74f73daf6aa2479d649 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.HorizontalSplitPanel;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2323.java b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
index 768eb9e0fe73853bed3847c0d77be989956030da..f2ea5146d2ffc3d5ba6364de4678b5a1547a1920 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.RichTextArea;
 import com.vaadin.ui.Window;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2325.java b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
index 826956049a061f10040870bcc2e696de40d09e7c..d18bef89191a791917d74c76d18b604701803249 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2329.java b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
index 8ce9b65e6b67daa7e9365ec4caf4ce32de80f60f..29101986e6a1d460ee9050890b4102fea9a0d6b7 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2337.java b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
index 64b0c260b50dd28d6d3b45ed249507f73066e2b7..71034f7e3d2da7e87231c0c2b60a3566b2f91d26 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.GridLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2339.java b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
index 884e8e895a3009ccce4b48de8250ae893e415a55..8683711bdcaca534e4dcd6888cf643a90b074a8a 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2341.java b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
index e062a8ee50a550deac44d211b0a4cc263ddd04d4..594e603c4375bc96e21373d63244810421baf7ce 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Layout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;
 
-public class Ticket2341 extends com.vaadin.LegacyApplication {
+public class Ticket2341 extends com.vaadin.server.LegacyApplication {
     @Override
     public void init() {
         LegacyWindow main = new LegacyWindow();

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2344.java b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java
index 967a9fb8b382276014dd1e47961a232e3276884b..a24351c3aa93526f38389224e661eaaa62db5072 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2344.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.tickets;
 
 import java.util.Random;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2347.java b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
index feea712798a03997304eb600e4814bafe8f9276e..8cf70894b1d862510f576ac6079647d078186f34 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2364.java b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
index 070095c379c4e0e6cdbce2c21adbf87e6f940c01..50a2a4329f2e694f6d4b38d8bb4798b41943065c 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Form;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Select;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2365.java b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
index 508a03c98a336722923a43afe89d5114bd59e110..6a9d9e6b1a2eec52ce4a91b0ce74cb89548be64c 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2398.java b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
index 15ae20ab87930946027bb67fc4be8ecbbb92c71a..baa2d001b594fc445cf9e7c5d4c899661445d764 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2404.java b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
index 4418cd00eca06d34e4e4a290c318c2868026ea9c..7cf3ecd26f5ed6ff82c86b3972e2f6914d9fb295 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2405.java b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
index d02e84ad1d92ec3b869bcb40d75495db133ec0fc..dc288e2d4adc3698d07d384457d79494387c2790 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Embedded;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2406.java b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
index c464019432e7278f4338a60240b415c4f46bdada..265b9884188d852a1c3046e02d4f41aadb5dc38f 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2407.java b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
index 9c8e106727c2ba605dfd45a247bc266f723b37f4..06824859156c12a72434d3b9dde5bc0bb02cc0c0 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket2407 extends com.vaadin.LegacyApplication {
+public class Ticket2407 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2411.java b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java
index 177f62857a7be822a2ee3050257fc1e65091b831..6437a1f514187a6a4547a219948302854f17e90a 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2411.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2415.java b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
index 051dc6696aa5c8e4516536e6746f552f98d672bb..7019ae69530687d61e906a16fac41a42bec79e9d 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2420.java b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
index 5bf7f6c0bc9bfd764463c3c175a89e134ba4f2d5..2dcfb6a34bd5d3b25bd3416e34450a9d01660afc 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.ProgressIndicator;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2425.java b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
index 040e807fb002ab8d1fad1bd1a939758b52295c59..73dee813e286a370c6267230e0d4cf5a44b81d0a 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
index f39209f58fe77add8e2f190f9a55364d6c062026..a80a8464b62b410029f5efb2be29cb77f9eb66d2 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2431.java b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
index 5654a062ddd97b09b1c9511ffefd307183e0f52c..3228dc87edf0aac5437a0bbfb26c11ddf2315d31 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.event.ShortcutAction.ModifierKey;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2432.java b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
index ea1f42b37369b19577e28f934d4ab4beda31e1a5..d4c8c31d7ff52dc5ea95ebccdb89cb4e32efe8db 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2434.java b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
index a4507113f3889261633488e463bdde1212a49e64..e489e0b02dead24540495e360dfd57fbe41acb32 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2436.java b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
index 1df3363dbfde60368d7abb20f7b696ed93eebec2..ac968db926527cfce6ec4eecfd3c08ff930bfef5 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2526.java b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
index c2a27df491bc0cf282cdf20bdd7467455b618d83..60fa42c2ceceb9d8422c5ef0cd150bfbf539bc04 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2742.java b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
index 5333bf8bfaadb62dab21ab670e2b4f80d8bb0daf..de3659540eb7725046ec4ad42410126df92e3607 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
@@ -3,7 +3,7 @@
  */
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.NativeSelect;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2901.java b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
index db0c8d5ae27401701d4f3c9a469849a25f86d892..d93194aee9f1080736656848db112c1c11670469 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
index 0e4ccb1176c9dc9352efff18917f19336477280f..818a70318ef331a2882171dad12c93ce4ce2141e 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
@@ -8,10 +8,10 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
 import com.vaadin.data.Validator;
 import com.vaadin.data.util.BeanItemContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DateField;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket3146.java b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
index e6e318de37d11df3576c9b1d7763a9f325c51386..b894e6827d7cf603be3f9312635df199118c3937 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import java.util.Collection;
 import java.util.HashSet;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket34.java b/uitest/src/com/vaadin/tests/tickets/Ticket34.java
index 08dd2ea450394a5f151064afce88c821663b7f5e..18863273d1fd0f6c987ec4c4e83f3e1f7aa5ceeb 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket34.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket34.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Page;
 import com.vaadin.server.Page.FragmentChangedEvent;
 import com.vaadin.ui.Button;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5053.java b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
index b84bad2bddeefa46c87b22a9a806afa7d8a0aa5a..1aae57ebd79c86953a13737fc961f610d332fb13 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.LegacyWindow;
 

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5157.java b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
index d32ddac7ad902b5151324aa9593f48f0c315f953..19f367846eebb4665f557884c481be32e836c46b 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.event.ShortcutListener;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5952.java b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
index a22abdae86f4199cf908bc233bcc208563aaae9f..f09fb955a1060dcb02775eee558250114008f08e 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket677.java b/uitest/src/com/vaadin/tests/tickets/Ticket677.java
index 3d04d2b8e11121f5921b78c73a3c57d0669a797e..e32c25ff480ca7e90332d0d7d41748f40a675bbc 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket677.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket677.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.BeanItem;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket695.java b/uitest/src/com/vaadin/tests/tickets/Ticket695.java
index 4aa9cb501b2d8a821de1fe5ebcd329d59ff9e673..d5ae9bb09fc783f3cebf37181b22bcb47f34b41a 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket695.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket695.java
@@ -4,7 +4,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket736.java b/uitest/src/com/vaadin/tests/tickets/Ticket736.java
index b1a3a3fdd8321b32512c14be8ce2db407d7753a4..0c64133f839cd4b20d539600bde05761f9c80be8 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket736.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket736.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 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.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Alignment;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket846.java b/uitest/src/com/vaadin/tests/tickets/Ticket846.java
index 1bd1ea71930646cf8f17c558ef0087cbc4e9432c..1450db2f6eb2401dfbe9f54177a6887edaa4dd33 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket846.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket846.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.data.validator.IntegerValidator;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.LegacyWindow;

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket932.java b/uitest/src/com/vaadin/tests/tickets/Ticket932.java
index 8e89a3fe4480328e88208be5dcc63299eb3c8d82..59c663e6181b8f73affc171df7a094e12be561b0 100644 (file)
--- a/uitest/src/com/vaadin/tests/tickets/Ticket932.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket932.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;