Move LegacyWindow back to com.vaadin.ui

There are too many dependencies between Legacy* and the core framework
to be able to easily separate them.

Change-Id: I6888e7a370b5d8da587e421abe3cb4686855c72f

5 files changed, 5 insertions, 10 deletions

diff --git a/server/src/main/java/com/vaadin/server/ClassResource.java b/server/src/main/java/com/vaadin/server/ClassResource.java
index d3114a36ef..83a9371f8f 100644
--- a/server/src/main/java/com/vaadin/server/ClassResource.java
+++ b/server/src/main/java/com/vaadin/server/ClassResource.java
@@ -18,9 +18,9 @@ package com.vaadin.server;
 
 import java.io.Serializable;
 
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
 import com.vaadin.util.FileTypeResolver;
-import com.vaadin.v7.ui.LegacyWindow;
 
 /**
  * <code>ClassResource</code> is a named resource accessed with the class
diff --git a/server/src/main/java/com/vaadin/server/LegacyApplication.java b/server/src/main/java/com/vaadin/server/LegacyApplication.java
index 1e6714fa2a..93f3da3d8f 100644
--- a/server/src/main/java/com/vaadin/server/LegacyApplication.java
+++ b/server/src/main/java/com/vaadin/server/LegacyApplication.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
-import com.vaadin.v7.ui.LegacyWindow;
 
 /**
  * A special application designed to help migrating applications from Vaadin 6
diff --git a/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java
index 18e44add09..4ad7097e3b 100644
--- a/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java
+++ b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java
@@ -21,8 +21,8 @@ import java.net.URL;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
-import com.vaadin.v7.ui.LegacyWindow;
 
 /**
  *
diff --git a/server/src/main/java/com/vaadin/server/Page.java b/server/src/main/java/com/vaadin/server/Page.java
index 4b4984ebb7..7142659fca 100644
--- a/server/src/main/java/com/vaadin/server/Page.java
+++ b/server/src/main/java/com/vaadin/server/Page.java
@@ -34,11 +34,11 @@ import com.vaadin.shared.ui.ui.UIConstants;
 import com.vaadin.shared.ui.ui.UIState;
 import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.ui.JavaScript;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.UI;
 import com.vaadin.util.ReflectTools;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class Page implements Serializable {
 
diff --git a/server/src/main/java/com/vaadin/v7/ui/LegacyWindow.java b/server/src/main/java/com/vaadin/ui/LegacyWindow.java
index c313dcb627..a6771da379 100644
--- a/server/src/main/java/com/vaadin/v7/ui/LegacyWindow.java
+++ b/server/src/main/java/com/vaadin/ui/LegacyWindow.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.ui;
+package com.vaadin.ui;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24,11 +24,6 @@ import com.vaadin.server.Page.BrowserWindowResizeListener;
 import com.vaadin.server.Resource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.BorderStyle;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.ComponentContainer;
-import com.vaadin.ui.Link;
-import com.vaadin.ui.UI;
-import com.vaadin.ui.VerticalLayout;
 
 /**
  * Helper class to emulate the main window from Vaadin 6 using UIs. This class