3 files changed, 8 insertions, 19 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index bceecaf35a..e2fe5df4c7 100644
--- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -209,20 +209,6 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
         return uris;
     }
 
-    @Override
-    protected Class<? extends Application> getApplicationClass()
-            throws ClassNotFoundException {
-        Class<?> classToRun = getClassToRun();
-        if (UI.class.isAssignableFrom(classToRun)) {
-            return Application.class;
-        } else if (Application.class.isAssignableFrom(classToRun)) {
-            return classToRun.asSubclass(Application.class);
-        } else {
-            throw new ClassCastException(classToRun.getCanonicalName()
-                    + " is not an Application nor a UI");
-        }
-    }
-
     private Class<?> getClassToRun() throws ClassNotFoundException {
         // TODO use getClassLoader() ?
 
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
index 99f213541a..bf95001464 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
@@ -1,6 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.Application;
+import com.vaadin.server.CustomizedSystemMessages;
+import com.vaadin.server.SystemMessages;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI.LegacyWindow;
@@ -22,8 +23,8 @@ public class Ticket1673 extends com.vaadin.Application.LegacyApplication {
 
     }
 
-    public static Application.SystemMessages getSystemMessages() {
-        Application.CustomizedSystemMessages msgs = new Application.CustomizedSystemMessages();
+    public static SystemMessages getSystemMessages() {
+        CustomizedSystemMessages msgs = new CustomizedSystemMessages();
 
         msgs.setSessionExpiredURL("http://www.vaadin.com/");
         msgs.setSessionExpiredCaption("Foo");
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
index 9d6e198f03..a57a20cdc3 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
@@ -3,6 +3,8 @@ package com.vaadin.tests.tickets;
 import java.util.Date;
 
 import com.vaadin.Application;
+import com.vaadin.server.CustomizedSystemMessages;
+import com.vaadin.server.SystemMessages;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
@@ -10,7 +12,7 @@ import com.vaadin.ui.UI.LegacyWindow;
 
 public class Ticket2106 extends Application.LegacyApplication {
 
-    private static CustomizedSystemMessages msgs = new Application.CustomizedSystemMessages();
+    private static CustomizedSystemMessages msgs = new CustomizedSystemMessages();
     static {
         // We will forward the user to www.vaadin.com when the session expires
         msgs.setSessionExpiredURL("http://www.vaadin.com");
@@ -18,7 +20,7 @@ public class Ticket2106 extends Application.LegacyApplication {
         msgs.setSessionExpiredCaption(null);
     }
 
-    public static Application.SystemMessages getSystemMessages() {
+    public static SystemMessages getSystemMessages() {
         return msgs;
     }