summaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/tests/tickets
diff options
context:
space:
mode:
Diffstat (limited to 'uitest/src/com/vaadin/tests/tickets')
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1225.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1230.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket124.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1245.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1365.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1368.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1397.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1435.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1444.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1519.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1572.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1581.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1589.java7
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1598.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket161.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1632.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1659.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1663.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1673.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1710.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1737.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1767.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1772.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1775.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1804.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1805.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1806.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1811.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1819.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1857.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1868.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1869.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1878.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1900.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1904.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1916.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1919.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1921.java7
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1923.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1925.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1939.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1940.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1953.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1966.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1969.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1970.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1972.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1973.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1975.java12
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1982.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1983.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1986.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1991.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket1995.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket20.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2001.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2002.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2007.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2009.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2011.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2014.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2021.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2022.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2023.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2024.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2026.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2029.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2037.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2038.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2040.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2042.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2043.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2048.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2051.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2053.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2060.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2061.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2061b.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2061c.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2062.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2083.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2090.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2095.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2098.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2099.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2101.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2103.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2104.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2106.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2107.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2117.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2119.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2125.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2126.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2151.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2157.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2178.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2179.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2180.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2181.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2186.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2204.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2208.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2209.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2215.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2221.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2222.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2231.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2232.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2234.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2235.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2240.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2242.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2244.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2245.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2267.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2271.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2282.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2283.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2289.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2292.java7
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2294.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2296.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2303.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2304.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2310.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2319.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2323.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2325.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2329.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2337.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2339.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2341.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2344.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2347.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2364.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2365.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2398.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2404.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2405.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2406.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2407.java3
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2411.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2415.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2420.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2425.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2426.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2431.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2432.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2434.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2436.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2526.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2742.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2901.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket2998.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket3146.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket34.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket5053.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket5157.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket5952.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket677.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket695.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket736.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket846.java2
-rw-r--r--uitest/src/com/vaadin/tests/tickets/Ticket932.java2
173 files changed, 218 insertions, 183 deletions
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
index 8c99fe6ebb..5ea26c882e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
@@ -16,7 +16,7 @@ import com.vaadin.ui.VerticalSplitPanel;
* properly. Scrollbars will disappear if "shaking" content a bit, like
* selecting tests in area.
*/
-public class Ticket1225 extends Application.LegacyApplication {
+public class Ticket1225 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1230.java b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
index e11d6ea024..69a1e7d20d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Select;
-public class Ticket1230 extends Application.LegacyApplication {
+public class Ticket1230 extends Application {
private static final Object PROPERTY_ID = new Object();
private static final Object NULL_ITEM_ID = new Object();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket124.java b/uitest/src/com/vaadin/tests/tickets/Ticket124.java
index 4bcf31a366..6fc67af975 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket124.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket124.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket124 extends Application.LegacyApplication {
+public class Ticket124 extends Application {
private TextField tf;
private GridLayout gl;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1245.java b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
index 6aa1c1752a..0c72d8ecaa 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.data.Item;
import com.vaadin.data.Property;
import com.vaadin.ui.AbstractSelect;
@@ -11,7 +12,7 @@ import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
-public class Ticket1245 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1245 extends com.vaadin.Application {
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 c617b07248..80b29fff17 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1365.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.event.ShortcutAction;
@@ -7,7 +8,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket1365 extends com.vaadin.Application.LegacyApplication
+public class Ticket1365 extends com.vaadin.Application
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 16b47a1f31..27410af474 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1368.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Table;
/**
*/
-public class Ticket1368 extends Application.LegacyApplication {
+public class Ticket1368 extends Application {
private Table t;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
index e162e96bfa..7cbe2cfd3b 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
@@ -14,7 +14,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
-public class Ticket1397 extends Application.LegacyApplication {
+public class Ticket1397 extends Application {
LegacyWindow main;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1435.java b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
index d46a56f73a..fa6a4d42f7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
@@ -16,7 +16,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1435 extends Application.LegacyApplication {
+public class Ticket1435 extends Application {
private static final boolean useWorkaround = true;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
index 1da3b5c290..256b519371 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1444 extends Application.LegacyApplication {
+public class Ticket1444 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
index 3c766ef985..c13b6968ed 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Notification;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Window;
-public class Ticket1465ModalNotification extends Application.LegacyApplication {
+public class Ticket1465ModalNotification extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1519.java b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
index 8b1736637b..cd3bc86677 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TabSheet;
-public class Ticket1519 extends Application.LegacyApplication {
+public class Ticket1519 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1572.java b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
index a511bae6d9..adeb4c7a87 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.shared.ui.MarginInfo;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
@@ -9,7 +10,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1572 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1572 extends com.vaadin.Application {
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 5025605413..8766e1135a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1581.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java
@@ -2,6 +2,7 @@ package com.vaadin.tests.tickets;
import java.util.Date;
+import com.vaadin.Application;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
@@ -9,7 +10,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.ProgressIndicator;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1581 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1581 extends com.vaadin.Application {
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 37f9197285..82cfa2b3ec 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
@@ -14,12 +14,13 @@ import com.vaadin.Application;
import com.vaadin.server.DownloadStream;
import com.vaadin.server.ExternalResource;
import com.vaadin.server.RequestHandler;
+import com.vaadin.server.VaadinSession;
import com.vaadin.server.WrappedRequest;
import com.vaadin.server.WrappedResponse;
import com.vaadin.ui.Link;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1589 extends Application.LegacyApplication {
+public class Ticket1589 extends Application {
@Override
public void init() {
@@ -28,7 +29,7 @@ public class Ticket1589 extends Application.LegacyApplication {
MyDynamicResource res = new MyDynamicResource();
- addRequestHandler(res);
+ VaadinSession.getCurrent().addRequestHandler(res);
w.addComponent(new Link(
"Test (without Content-Disposition, should suggest generatedFile.png when saving, browser default for actual disposition)",
@@ -51,7 +52,7 @@ class MyDynamicResource implements RequestHandler {
* stream that contains the response from the server.
*/
@Override
- public boolean handleRequest(Application application,
+ public boolean handleRequest(VaadinSession application,
WrappedRequest request, WrappedResponse response)
throws IOException {
String relativeUri = request.getRequestPathInfo();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1598.java b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
index 2f845a2264..e1f04cbf8e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.MenuBar.Command;
import com.vaadin.ui.MenuBar.MenuItem;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1598 extends Application.LegacyApplication {
+public class Ticket1598 extends Application {
LegacyWindow main = new LegacyWindow("MenuBar test");
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket161.java b/uitest/src/com/vaadin/tests/tickets/Ticket161.java
index 4da1b3a6b4..94eba29551 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket161.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket161.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Table;
/**
*/
-public class Ticket161 extends Application.LegacyApplication {
+public class Ticket161 extends Application {
private Table t;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1632.java b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
index bca902a73f..ff50380c42 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Table;
/**
*/
-public class Ticket1632 extends Application.LegacyApplication {
+public class Ticket1632 extends Application {
private Table t;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1659.java b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
index 57d2ad73e5..cd96ac56c7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1659 extends Application.LegacyApplication {
+public class Ticket1659 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1663.java b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
index 1ef16afe95..7a5c1163b5 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
@@ -1,10 +1,11 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.server.SystemError;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket1663 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1663 extends com.vaadin.Application {
@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 bf95001464..c2b7b38435 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
@@ -1,12 +1,13 @@
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;
-public class Ticket1673 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1673 extends com.vaadin.Application {
@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 c00e2f32eb..641bd43f70 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1710.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java
@@ -2,6 +2,7 @@ package com.vaadin.tests.tickets;
import java.util.Iterator;
+import com.vaadin.Application;
import com.vaadin.data.Property;
import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.data.util.MethodProperty;
@@ -28,7 +29,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1710 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1710 extends com.vaadin.Application {
@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 caf44865f9..8bb244545a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1737.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1737 extends Application.LegacyApplication {
+public class Ticket1737 extends Application {
Resource slowRes = new ClassResource(Ticket1737.class, "m-bullet-blue.gif") {
@Override
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1767.java b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
index eca0c0f833..42706a1428 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
@@ -1,9 +1,10 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.ComboBox;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1767 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1767 extends com.vaadin.Application {
@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 a269acc1e0..a2ddbebad8 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1772.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java
@@ -1,12 +1,13 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket1772 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1772 extends com.vaadin.Application {
@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 ec28a957bb..80a19720bb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1775.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1775.java
@@ -1,12 +1,13 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1775 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1775 extends com.vaadin.Application {
@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 a77e6e843a..d7c9a45992 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java
@@ -3,6 +3,7 @@ package com.vaadin.tests.tickets;
import java.util.Iterator;
import java.util.LinkedList;
+import com.vaadin.Application;
import com.vaadin.data.Validator;
import com.vaadin.data.util.MethodProperty;
import com.vaadin.server.SystemError;
@@ -15,7 +16,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Select;
import com.vaadin.ui.Window;
-public class Ticket1804 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1804 extends com.vaadin.Application {
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 7f5c684479..376173ebf2 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1805.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.ui.Alignment;
@@ -10,7 +11,7 @@ import com.vaadin.ui.Layout.MarginHandler;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket1805 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1805 extends com.vaadin.Application {
@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 8359b024aa..31746b455d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1806.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java
@@ -1,12 +1,13 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.data.util.ObjectProperty;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket1806 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1806 extends com.vaadin.Application {
@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 824c58436f..d68fc8be3d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java
@@ -3,6 +3,7 @@ package com.vaadin.tests.tickets;
import java.util.Iterator;
import java.util.LinkedList;
+import com.vaadin.Application;
import com.vaadin.data.Validator;
import com.vaadin.data.validator.StringLengthValidator;
import com.vaadin.shared.ui.label.ContentMode;
@@ -13,7 +14,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-public class Ticket1811 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1811 extends com.vaadin.Application {
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 e16b2c2774..162bfbad2d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java
@@ -3,6 +3,7 @@ package com.vaadin.tests.tickets;
import java.util.Iterator;
import java.util.LinkedList;
+import com.vaadin.Application;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.AbstractField;
import com.vaadin.ui.Button;
@@ -12,7 +13,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Select;
import com.vaadin.ui.Window;
-public class Ticket1819 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1819 extends com.vaadin.Application {
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 f7329037cc..a929b3a60b 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
@@ -9,7 +10,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
public class Ticket1834PanelScrolling extends
- com.vaadin.Application.LegacyApplication {
+ com.vaadin.Application {
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 be0158e0fb..1b74d3c142 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.Table;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1857 extends Application.LegacyApplication implements
+public class Ticket1857 extends Application implements
Handler {
@Override
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1868.java b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
index 8bd4a77204..b301eb1ea9 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
@@ -1,9 +1,10 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1868 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1868 extends com.vaadin.Application {
@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 741adecae4..f704235178 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1869.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.Button;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
@@ -7,7 +8,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1869 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1869 extends com.vaadin.Application {
@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 90a96ba0f1..3b53023084 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1878.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java
@@ -27,7 +27,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1878 extends Application.LegacyApplication {
+public class Ticket1878 extends Application {
private Layout orderedLayout;
private Layout gridLayout;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1900.java b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
index 136af23474..d1bd127500 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
@@ -7,7 +7,7 @@ import com.vaadin.data.Validator;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket1900 extends Application.LegacyApplication {
+public class Ticket1900 extends Application {
TextField f[] = new TextField[5];
LegacyWindow main = new LegacyWindow("#1900 test");
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1904.java b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
index f35463f6a8..5891831038 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1904 extends Application.LegacyApplication {
+public class Ticket1904 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1916.java b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
index 92102426ca..422b6e57d0 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket1916 extends Application.LegacyApplication {
+public class Ticket1916 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1919.java b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
index 8e9e0cb0ba..ae7f44dc19 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
@@ -7,7 +8,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1919 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1919 extends com.vaadin.Application {
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 ac5f990915..33be859fec 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
@@ -5,6 +5,7 @@ import java.util.Map;
import com.vaadin.Application;
import com.vaadin.server.RequestHandler;
+import com.vaadin.server.VaadinSession;
import com.vaadin.server.WrappedRequest;
import com.vaadin.server.WrappedResponse;
import com.vaadin.ui.Button;
@@ -13,7 +14,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1921 extends Application.LegacyApplication implements
+public class Ticket1921 extends Application implements
RequestHandler {
int state = -1;
@@ -42,7 +43,7 @@ public class Ticket1921 extends Application.LegacyApplication implements
newState();
- addRequestHandler(this);
+ VaadinSession.getCurrent().addRequestHandler(this);
}
public void newState() {
@@ -94,7 +95,7 @@ public class Ticket1921 extends Application.LegacyApplication implements
}
@Override
- public boolean handleRequest(Application application,
+ public boolean handleRequest(VaadinSession application,
WrappedRequest request, WrappedResponse response)
throws IOException {
Map<String, String[]> parameters = request.getParameterMap();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1923.java b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
index 2bde4c95ec..32c4adeff9 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
@@ -1,11 +1,12 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1923 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1923 extends com.vaadin.Application {
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 b5d938dbed..8e0b65bb6e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1925.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
import com.vaadin.Application;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1925 extends Application.LegacyApplication {
+public class Ticket1925 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1939.java b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
index f65fbf9852..ee349c79e1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1939 extends Application.LegacyApplication {
+public class Ticket1939 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1940.java b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
index 1a27e1ad28..5d5b9c4918 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1940 extends Application.LegacyApplication {
+public class Ticket1940 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1953.java b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
index 9bf4ddee51..8fd62b8a2b 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1953 extends Application.LegacyApplication {
+public class Ticket1953 extends Application {
public static final String cellStyle = "test-cell";
public static final String colHeadStyle = "test-col-head";
public static final String headingStyle = "test-heading";
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
index 9440855bbe..ebd04a8857 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
@@ -12,7 +12,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1966 extends Application.LegacyApplication {
+public class Ticket1966 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
index c5442e6473..12b17a4601 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
@@ -12,7 +12,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1966_2 extends Application.LegacyApplication {
+public class Ticket1966_2 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
index 7258971f50..577ca463bc 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1966_3 extends Application.LegacyApplication {
+public class Ticket1966_3 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1969.java b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
index 78c09d8914..04cd11ce72 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.server.UserError;
import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
import com.vaadin.ui.Button;
@@ -10,7 +11,7 @@ import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1969 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1969 extends com.vaadin.Application {
@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 b07a997f8f..839e9e683c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1970 extends Application.LegacyApplication {
+public class Ticket1970 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1972.java b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
index 6b406a2f89..0de827bfd2 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1972 extends Application.LegacyApplication {
+public class Ticket1972 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1973.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
index a3365bedcb..b91d8dfee3 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.data.Item;
import com.vaadin.data.util.IndexedContainer;
import com.vaadin.ui.Button;
@@ -8,7 +9,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1973 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1973 extends com.vaadin.Application {
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 27c3d4a8a7..9ea740b546 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-public class Ticket1973_2 extends Application.LegacyApplication {
+public class Ticket1973_2 extends Application {
LegacyWindow main = new LegacyWindow();
Table table = new Table();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
index e85fe294f2..93ecf4b6eb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
@@ -5,15 +5,16 @@ import java.io.File;
import java.io.FileInputStream;
import com.vaadin.Application;
-import com.vaadin.server.ServletApplicationContext;
+import com.vaadin.server.WrappedRequest;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI.LegacyWindow;
+import com.vaadin.util.CurrentInstance;
-public class Ticket1975 extends Application.LegacyApplication {
+public class Ticket1975 extends Application {
private CustomLayout cl1;
private CustomLayout cl2;
@@ -33,7 +34,6 @@ public class Ticket1975 extends Application.LegacyApplication {
try {
cl1 = new CustomLayout(new ByteArrayInputStream(s.getBytes()));
layout.addComponent(cl1);
- ServletApplicationContext wc = ((ServletApplicationContext) getContext());
layout.addComponent(new Button("Disable/Enable",
new ClickListener() {
@@ -47,8 +47,10 @@ public class Ticket1975 extends Application.LegacyApplication {
}
}));
- File f = new File(wc.getBaseDirectory().getAbsoluteFile()
- + "/VAADIN/themes/" + getTheme()
+ File baseDir = CurrentInstance.get(WrappedRequest.class)
+ .getDeploymentConfiguration().getBaseDirectory()
+ .getAbsoluteFile();
+ File f = new File(baseDir + "/VAADIN/themes/" + getTheme()
+ "/layouts/Ticket1975.html");
cl2 = new CustomLayout(new FileInputStream(f));
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1982.java b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
index a5953d22af..433dce1bfb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
@@ -12,7 +12,7 @@ import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket1982 extends Application.LegacyApplication {
+public class Ticket1982 extends Application {
private List<TitleBar> components = new ArrayList<TitleBar>();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1983.java b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
index 7b544ec9b0..2e38c7c1b1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
@@ -16,7 +16,7 @@ import com.vaadin.ui.VerticalLayout;
/**
* Test class for ticket 1983
*/
-public class Ticket1983 extends Application.LegacyApplication {
+public class Ticket1983 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1986.java b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
index fd6665b2fe..dc452e1664 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
@@ -12,7 +12,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.TwinColSelect;
-public class Ticket1986 extends Application.LegacyApplication {
+public class Ticket1986 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1991.java b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
index ed60c89c16..ef3b4c73e8 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
@@ -1,10 +1,11 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
-public class Ticket1991 extends com.vaadin.Application.LegacyApplication {
+public class Ticket1991 extends com.vaadin.Application {
@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 04ce9c712d..cf628ad806 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1995.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
-public class Ticket1995 extends Application.LegacyApplication {
+public class Ticket1995 extends Application {
private static final Object PROPERTY_1 = "Test";
private Table table;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket20.java b/uitest/src/com/vaadin/tests/tickets/Ticket20.java
index ea610a3db8..e8ea84c96d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket20.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket20.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket20 extends Application.LegacyApplication {
+public class Ticket20 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2001.java b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
index 8ff3d952c4..447d0e671c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2001 extends Application.LegacyApplication {
+public class Ticket2001 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2002.java b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
index aeaf3bfb33..148d7e67ef 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket2002 extends Application.LegacyApplication {
+public class Ticket2002 extends Application {
private Long long1 = new Long(1L);
private Long long2 = new Long(2L);
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2007.java b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
index fcffbc01bf..4b64cc33d2 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2007 extends Application.LegacyApplication {
+public class Ticket2007 extends Application {
int childs = 0;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2009.java b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
index e79ec8905e..a3517fdf76 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.data.Container;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
@@ -15,7 +16,7 @@ import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-public class Ticket2009 extends com.vaadin.Application.LegacyApplication {
+public class Ticket2009 extends com.vaadin.Application {
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 754036cd5b..65634de549 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2011.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Select;
-public class Ticket2011 extends Application.LegacyApplication {
+public class Ticket2011 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2014.java b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
index bf909acb35..bf05b8bb14 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2014 extends Application.LegacyApplication {
+public class Ticket2014 extends Application {
private HorizontalLayout innerLayout1;
private Button b1;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2021.java b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
index c23f031a91..8ebf41bbe4 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
@@ -15,7 +15,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2021 extends Application.LegacyApplication {
+public class Ticket2021 extends Application {
private TextArea tf1, tf2, tf3;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2022.java b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
index ea142b7e9e..523e1b7f7d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
@@ -4,7 +4,7 @@ import com.vaadin.Application;
import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2022 extends Application.LegacyApplication {
+public class Ticket2022 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2023.java b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
index c6b2c0f28a..a336f18428 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
@@ -1,12 +1,13 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2023 extends com.vaadin.Application.LegacyApplication
+public class Ticket2023 extends com.vaadin.Application
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 b1a8b64931..4ef8c2fa89 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2024.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2024 extends Application.LegacyApplication {
+public class Ticket2024 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2026.java b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
index 0b72073bec..9528f2c56b 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket2026 extends Application.LegacyApplication {
+public class Ticket2026 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2029.java b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
index 5900c76706..bf11aa312a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
@@ -16,7 +16,7 @@ import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2029 extends Application.LegacyApplication {
+public class Ticket2029 extends Application {
int COMPONENTS;
int DIM1, DIM2;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2037.java b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
index da47f796a5..f39e6a2845 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
@@ -7,7 +8,7 @@ import com.vaadin.ui.Layout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2037 extends com.vaadin.Application.LegacyApplication {
+public class Ticket2037 extends com.vaadin.Application {
@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 c4714783a0..db01fae34f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2038.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Notification;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket2038 extends Application.LegacyApplication {
+public class Ticket2038 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2040.java b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
index a7ca7b179f..2c30f666dc 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.Accordion;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout.MarginHandler;
@@ -7,7 +8,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
-public class Ticket2040 extends com.vaadin.Application.LegacyApplication {
+public class Ticket2040 extends com.vaadin.Application {
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 49e999a601..2cb9e103d6 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2042.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2042 extends Application.LegacyApplication {
+public class Ticket2042 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2043.java b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
index 8a10067455..84e7167164 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Link;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2043 extends Application.LegacyApplication {
+public class Ticket2043 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2048.java b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
index 5ac0480fe2..4d9454341a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2048 extends Application.LegacyApplication {
+public class Ticket2048 extends Application {
private Embedded embedded;
private Panel p;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2051.java b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
index 1660f00d88..b1c2666808 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
-public class Ticket2051 extends Application.LegacyApplication {
+public class Ticket2051 extends Application {
private static final Object P1 = new Object();
private static final Object P2 = new Object();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2053.java b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
index 31973e4c92..33c1313e20 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket2053 extends Application.LegacyApplication {
+public class Ticket2053 extends Application {
int childs = 0;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2060.java b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
index c9e91930bf..de5f44d0e8 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2060 extends Application.LegacyApplication {
+public class Ticket2060 extends Application {
private Button button1;
private Button button2;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
index 4d6549bfbf..54f1d22a45 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2061 extends Application.LegacyApplication {
+public class Ticket2061 extends Application {
private LegacyWindow mainWindow;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
index 87d92ad9f6..402b1c195c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
@@ -21,7 +21,7 @@ import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
-public class Ticket2061b extends Application.LegacyApplication implements
+public class Ticket2061b extends Application implements
SelectedTabChangeListener {
private LegacyWindow mainWindow;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
index 5cb041788b..14f1a3b6ea 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
@@ -17,7 +17,7 @@ import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2061c extends Application.LegacyApplication implements
+public class Ticket2061c extends Application implements
SelectedTabChangeListener {
private LegacyWindow mainWindow;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2062.java b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
index 9b2fe05514..24122b7dee 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
-public class Ticket2062 extends Application.LegacyApplication {
+public class Ticket2062 extends Application {
private static final Object P1 = new Object();
@Override
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2083.java b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
index 87bea00023..69583ce367 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2083 extends Application.LegacyApplication {
+public class Ticket2083 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2090.java b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
index 2f311b9428..786d922973 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket2090 extends Application.LegacyApplication {
+public class Ticket2090 extends Application {
Label label = new Label();
Button target = new Button();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2095.java b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
index 53f2aac79e..c0152a1fc9 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
@@ -5,7 +5,7 @@ import com.vaadin.server.ExternalResource;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2095 extends Application.LegacyApplication {
+public class Ticket2095 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2098.java b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
index a8a3e22d2b..a4ba5b0595 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TabSheet;
-public class Ticket2098 extends Application.LegacyApplication {
+public class Ticket2098 extends Application {
private static final String info = "First tab hidden, second should initially be selected";
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2099.java b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
index 2bba0504a5..f5e36a1650 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-public class Ticket2099 extends Application.LegacyApplication {
+public class Ticket2099 extends Application {
private Label l1, l2, l3;
private VerticalLayout ol1, ol2, ol3;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2101.java b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
index c29eaaf453..c38e4b6ed2 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
@@ -4,7 +4,7 @@ import com.vaadin.Application;
import com.vaadin.ui.Button;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2101 extends Application.LegacyApplication {
+public class Ticket2101 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2103.java b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
index 576fe03d87..7dc7d7bf95 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2103 extends Application.LegacyApplication {
+public class Ticket2103 extends Application {
private LegacyWindow mainWindow;
@Override
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2104.java b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
index 0dba639712..f3fb936c9a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
@@ -15,7 +15,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
import com.vaadin.ui.Tree;
-public class Ticket2104 extends Application.LegacyApplication {
+public class Ticket2104 extends Application {
private static final Label info = new Label(
"Click event should _always_ come trough. Switching features on/off should immediatly affect the tree (verify w/ debug window)",
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
index a57a20cdc3..f509a082e1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2106 extends Application.LegacyApplication {
+public class Ticket2106 extends Application {
private static CustomizedSystemMessages msgs = new CustomizedSystemMessages();
static {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2107.java b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
index 37d570546b..c6dd33fdd9 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Notification;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket2107 extends Application.LegacyApplication {
+public class Ticket2107 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
index fb0d62ba85..e4365c3edb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2117 extends Application.LegacyApplication {
+public class Ticket2117 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2119.java b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
index 38cc567295..9c02eef318 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
@@ -15,7 +15,7 @@ import com.vaadin.ui.VerticalLayout;
/**
* Test case for Ticket 2119.
*/
-public class Ticket2119 extends Application.LegacyApplication {
+public class Ticket2119 extends Application {
private ObjectProperty<String> globalValue;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
index defd7f4a22..8b65bc6b0d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Table.CellStyleGenerator;
import com.vaadin.ui.Table.ColumnGenerator;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2125 extends Application.LegacyApplication {
+public class Ticket2125 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2126.java b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
index d49c73ea5f..02644d8a67 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
@@ -1,5 +1,6 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.data.Item;
import com.vaadin.data.util.IndexedContainer;
import com.vaadin.ui.Button;
@@ -14,7 +15,7 @@ import com.vaadin.ui.Table;
* client.
*
*/
-public class Ticket2126 extends com.vaadin.Application.LegacyApplication {
+public class Ticket2126 extends com.vaadin.Application {
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 721bdf3c9f..13611bf16c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2151.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2151.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2151 extends Application.LegacyApplication {
+public class Ticket2151 extends Application {
private Label status;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2157.java b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
index b8f75fc279..423183bddf 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2157 extends Application.LegacyApplication {
+public class Ticket2157 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2178.java b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
index e64db69ced..33b5177935 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2178 extends Application.LegacyApplication {
+public class Ticket2178 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2179.java b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
index 622488dc0f..9894baa00b 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
@@ -7,7 +7,7 @@ import com.vaadin.data.Validator;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket2179 extends Application.LegacyApplication {
+public class Ticket2179 extends Application {
TextField f = new TextField("Test fiel ( must contain 1 & 2 )");
LegacyWindow main = new LegacyWindow("Dual validator test");
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2180.java b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
index fb9332d100..4de46eff3a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TabSheet;
-public class Ticket2180 extends Application.LegacyApplication {
+public class Ticket2180 extends Application {
private LegacyWindow mainWindow;
private TabSheet tabSheet;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
index b67fad52c0..cc9fa442c9 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
@@ -16,7 +16,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2181 extends Application.LegacyApplication implements
+public class Ticket2181 extends Application implements
Button.ClickListener {
// private static final Object PROPERTY_VALUE = new Object();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2186.java b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
index 50b8a1f113..ed1873b9f8 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2186 extends Application.LegacyApplication {
+public class Ticket2186 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2204.java b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
index 24c4d6e8b9..f7116348fd 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
@@ -31,7 +31,7 @@ import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
-public class Ticket2204 extends Application.LegacyApplication {
+public class Ticket2204 extends Application {
private final List<RichTextArea> textAreas = new ArrayList<RichTextArea>();
private TabSheet ts;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
index 98cd6724d4..c8c1eba9d7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Table.CellStyleGenerator;
import com.vaadin.ui.Table.ColumnGenerator;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2208 extends Application.LegacyApplication {
+public class Ticket2208 extends Application {
private Table t;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
index ecad9a950a..9e84b82a0f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2209 extends Application.LegacyApplication {
+public class Ticket2209 extends Application {
private GridLayout gl;
private ComboBox combo;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
index 6eec0a7704..76ce659370 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2209OL extends Application.LegacyApplication {
+public class Ticket2209OL extends Application {
private VerticalLayout gl;
private ComboBox combo;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
index 7f4082d0f8..63947d91fb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2209OL2 extends Application.LegacyApplication {
+public class Ticket2209OL2 extends Application {
private VerticalLayout gl;
private ComboBox combo;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2215.java b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
index f7099d88f4..1a9e4382d7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
-public class Ticket2215 extends Application.LegacyApplication {
+public class Ticket2215 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2221.java b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
index e3f1516fb8..4677995119 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2221 extends Application.LegacyApplication {
+public class Ticket2221 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2222.java b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
index 14024fda8b..c0b56f14c2 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2222 extends Application.LegacyApplication {
+public class Ticket2222 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
index f9c670708e..56bdc7782d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
public class Ticket2227OrderedlayoutInTable extends
- Application.LegacyApplication {
+ Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2231.java b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
index 21994bff60..c26c08c0bd 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.AbstractOrderedLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2231 extends Application.LegacyApplication {
+public class Ticket2231 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2232.java b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
index d71134696f..48b4765c0a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Layout.SpacingHandler;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2232 extends Application.LegacyApplication {
+public class Ticket2232 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2234.java b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
index ccda59bb6a..a66164043a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.AbstractOrderedLayout;
import com.vaadin.ui.ComboBox;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2234 extends Application.LegacyApplication {
+public class Ticket2234 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2235.java b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
index fba82956e0..9126b9916b 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.AbstractOrderedLayout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextArea;
-public class Ticket2235 extends Application.LegacyApplication {
+public class Ticket2235 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
index bb16a40cd7..5f9a005af0 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket2240 extends Application.LegacyApplication {
+public class Ticket2240 extends Application {
public static final String txt = "<p>There are two main types of windows: application-level windows, and "
+ "\"sub windows\".</p><p>A sub window is rendered as a \"inline\" popup window"
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
index 77fbfefe1a..e49920a4d1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
-public class Ticket2242 extends Application.LegacyApplication implements
+public class Ticket2242 extends Application implements
ValueChangeListener {
private Object tableValue = null;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2244.java b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
index 495e3de26a..e65e826a53 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2244 extends Application.LegacyApplication {
+public class Ticket2244 extends Application {
Form form;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2245.java b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
index ab474fe6f7..c62ccd0395 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
@@ -4,7 +4,7 @@ import com.vaadin.Application;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2245 extends Application.LegacyApplication {
+public class Ticket2245 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2267.java b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
index 41843a9742..0cedac4490 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2267 extends Application.LegacyApplication {
+public class Ticket2267 extends Application {
Label l = new Label("0");
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2271.java b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
index 91fb51034b..c784385e93 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.ComboBox;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2271 extends Application.LegacyApplication {
+public class Ticket2271 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2282.java b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
index 976b06fe32..b805f2403c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.FormLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2282 extends Application.LegacyApplication {
+public class Ticket2282 extends Application {
private FormLayout layout1;
private FormLayout layout2;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2283.java b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
index 5576e48fba..3a174bf9cf 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2283 extends Application.LegacyApplication {
+public class Ticket2283 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2289.java b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
index c715fafd74..fc7e5feadf 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2289 extends Application.LegacyApplication {
+public class Ticket2289 extends Application {
TabSheet ts = null;
Accordion acc = null;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
index ce7960a169..adafa93a75 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
@@ -13,6 +13,7 @@ import com.vaadin.Application;
import com.vaadin.server.DownloadStream;
import com.vaadin.server.ExternalResource;
import com.vaadin.server.RequestHandler;
+import com.vaadin.server.VaadinSession;
import com.vaadin.server.WrappedRequest;
import com.vaadin.server.WrappedResponse;
import com.vaadin.ui.Button;
@@ -21,7 +22,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.Link;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2292 extends com.vaadin.Application.LegacyApplication
+public class Ticket2292 extends com.vaadin.Application
implements RequestHandler {
@Override
@@ -44,11 +45,11 @@ public class Ticket2292 extends com.vaadin.Application.LegacyApplication
Link l = new Link("l", icon);
main.addComponent(l);
- addRequestHandler(this);
+ VaadinSession.getCurrent().addRequestHandler(this);
}
@Override
- public boolean handleRequest(Application application,
+ public boolean handleRequest(VaadinSession application,
WrappedRequest request, WrappedResponse response)
throws IOException {
String relativeUri = request.getRequestPathInfo();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2294.java b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
index 053534191b..e8b36596fc 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Alignment;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2294 extends Application.LegacyApplication {
+public class Ticket2294 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2296.java b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
index d059b96953..d274151b63 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2296 extends Application.LegacyApplication {
+public class Ticket2296 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2303.java b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
index fb1c5440ad..b32828abfb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2303 extends Application.LegacyApplication {
+public class Ticket2303 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2304.java b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
index ccef7a9a92..6d404643aa 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.themes.Reindeer;
-public class Ticket2304 extends Application.LegacyApplication {
+public class Ticket2304 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2310.java b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
index 24fbd7a968..f66b5dcc18 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.themes.Reindeer;
-public class Ticket2310 extends Application.LegacyApplication {
+public class Ticket2310 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2319.java b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
index 438d2ff286..bb0ceb5629 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
-public class Ticket2319 extends Application.LegacyApplication {
+public class Ticket2319 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2323.java b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
index d7b8db86bd..db33c6f6a6 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Window;
-public class Ticket2323 extends Application.LegacyApplication {
+public class Ticket2323 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2325.java b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
index ecc897d4ba..cd8239d542 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-public class Ticket2325 extends Application.LegacyApplication {
+public class Ticket2325 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2329.java b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
index 2ce42376f9..c575aebb32 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Table;
import com.vaadin.ui.Table.ColumnGenerator;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2329 extends Application.LegacyApplication {
+public class Ticket2329 extends Application {
private Table table;
private VerticalLayout mainLo;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2337.java b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
index 3ac381b2d1..cc99796588 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2337 extends Application.LegacyApplication {
+public class Ticket2337 extends Application {
GridLayout gl = new GridLayout(3, 1);
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2339.java b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
index ce884bada7..fb535cbce7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2339 extends Application.LegacyApplication {
+public class Ticket2339 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2341.java b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
index aa2eefcb7e..3e4d739413 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
@@ -1,12 +1,13 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.data.Item;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
-public class Ticket2341 extends com.vaadin.Application.LegacyApplication {
+public class Ticket2341 extends com.vaadin.Application {
@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 befad78a73..ffc91c60d7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2344.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.BaseTheme;
-public class Ticket2344 extends Application.LegacyApplication {
+public class Ticket2344 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2347.java b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
index 582b9a95ee..2aa3eccc32 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2347 extends Application.LegacyApplication {
+public class Ticket2347 extends Application {
private Button b1;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2364.java b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
index f7d6f61110..e37ed6e782 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Select;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2364 extends Application.LegacyApplication {
+public class Ticket2364 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2365.java b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
index b191901356..b2737ed3aa 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2365 extends Application.LegacyApplication {
+public class Ticket2365 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2398.java b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
index f5b68800e6..276006ef5b 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
-public class Ticket2398 extends Application.LegacyApplication {
+public class Ticket2398 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2404.java b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
index 30f9d04d3b..8b86c6b0b5 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2404 extends Application.LegacyApplication {
+public class Ticket2404 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2405.java b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
index 8be6a13e9f..e36d3e24a4 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
@@ -13,7 +13,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2405 extends Application.LegacyApplication {
+public class Ticket2405 extends Application {
private Label label;
private HorizontalSplitPanel split;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2406.java b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
index dd42727591..c14c655cd1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-public class Ticket2406 extends Application.LegacyApplication {
+public class Ticket2406 extends Application {
private Window w;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2407.java b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
index df2ae47acd..6f9c3c9ac8 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
@@ -1,11 +1,12 @@
package com.vaadin.tests.tickets;
+import com.vaadin.Application;
import com.vaadin.ui.Form;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket2407 extends com.vaadin.Application.LegacyApplication {
+public class Ticket2407 extends com.vaadin.Application {
@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 2c59493e0c..a73b7fab95 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2411.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2411 extends Application.LegacyApplication {
+public class Ticket2411 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2415.java b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
index f52c1b1ccc..f58fa51b6d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
@@ -6,7 +6,7 @@ import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket2415 extends Application.LegacyApplication {
+public class Ticket2415 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2420.java b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
index 5d15107053..bc14a7291f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
@@ -4,7 +4,7 @@ import com.vaadin.Application;
import com.vaadin.ui.ProgressIndicator;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2420 extends Application.LegacyApplication {
+public class Ticket2420 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2425.java b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
index 140fa6f2b6..47127c4b55 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TabSheet;
-public class Ticket2425 extends Application.LegacyApplication {
+public class Ticket2425 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
index fee74b73f7..b48d8164c9 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
@@ -5,7 +5,7 @@ import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2426 extends Application.LegacyApplication {
+public class Ticket2426 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2431.java b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
index cb9eb449bf..4bf17c9668 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
@@ -9,7 +9,7 @@ import com.vaadin.event.ShortcutAction.ModifierKey;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2431 extends Application.LegacyApplication {
+public class Ticket2431 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2432.java b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
index f21e6a6752..d741902619 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Layout.AlignmentHandler;
import com.vaadin.ui.Layout.SpacingHandler;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2432 extends Application.LegacyApplication {
+public class Ticket2432 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2434.java b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
index 6401a98763..2c7a26f44f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
@@ -5,7 +5,7 @@ import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
-public class Ticket2434 extends Application.LegacyApplication {
+public class Ticket2434 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2436.java b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
index 5367c24b01..bbda394f65 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.PopupView;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket2436 extends Application.LegacyApplication {
+public class Ticket2436 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2526.java b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
index 998fe75f8c..a61d012f43 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Window;
-public class Ticket2526 extends Application.LegacyApplication {
+public class Ticket2526 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2742.java b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
index 733f6ac6f6..0947d68c9c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
@@ -12,7 +12,7 @@ import com.vaadin.ui.UI.LegacyWindow;
* @author Risto Yrjänä / Vaadin Ltd.
*
*/
-public class Ticket2742 extends Application.LegacyApplication {
+public class Ticket2742 extends Application {
/*
* (non-Javadoc)
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2901.java b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
index c4352abefe..63464617da 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.VerticalSplitPanel;
* properly. Scrollbars will disappear if "shaking" content a bit, like
* selecting tests in area.
*/
-public class Ticket2901 extends Application.LegacyApplication {
+public class Ticket2901 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
index 0cd43533fd..0646d1bed3 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
@@ -38,7 +38,7 @@ import com.vaadin.ui.themes.Reindeer;
*
* Other browsers are much faster.
*/
-public class Ticket2998 extends Application.LegacyApplication {
+public class Ticket2998 extends Application {
private Table table;
private VerticalLayout mainLayout;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket3146.java b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
index 7973ffa496..f82400a3b7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
-public class Ticket3146 extends Application.LegacyApplication {
+public class Ticket3146 extends Application {
Table table;
TextField result;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket34.java b/uitest/src/com/vaadin/tests/tickets/Ticket34.java
index fd5e9c6005..da4cf3ce5c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket34.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket34.java
@@ -15,7 +15,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-public class Ticket34 extends Application.LegacyApplication {
+public class Ticket34 extends Application {
private Map<String, Component> views = new HashMap<String, Component>();
private VerticalLayout mainLayout;
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5053.java b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
index 6f8ade15c4..e263bf66fd 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.UI.LegacyWindow;
/**
* #5053: Last ComboBox item may not be shown if null selection enabled
*/
-public class Ticket5053 extends Application.LegacyApplication {
+public class Ticket5053 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5157.java b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
index 3102a0a56c..f169431341 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
@@ -14,7 +14,7 @@ import com.vaadin.ui.TextField;
* Therefore, registering e.g. F8 as a key code resulted in "w" being used as
* the trigger and F8 being ignored.
*/
-public class Ticket5157 extends Application.LegacyApplication {
+public class Ticket5157 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5952.java b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
index 92cd0290d6..7af3da6990 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
@@ -5,7 +5,7 @@ import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket5952 extends Application.LegacyApplication {
+public class Ticket5952 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket677.java b/uitest/src/com/vaadin/tests/tickets/Ticket677.java
index 1c66f67ca1..1d95f3945f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket677.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket677.java
@@ -21,7 +21,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
-public class Ticket677 extends Application.LegacyApplication {
+public class Ticket677 extends Application {
private static final Label info = new Label(
"<li> keep debug window open to see variable changes"
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket695.java b/uitest/src/com/vaadin/tests/tickets/Ticket695.java
index e539f999b3..68031b1fbd 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket695.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket695.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.UI.LegacyWindow;
@SuppressWarnings("serial")
-public class Ticket695 extends Application.LegacyApplication {
+public class Ticket695 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket736.java b/uitest/src/com/vaadin/tests/tickets/Ticket736.java
index 417ee86fac..72137500dd 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket736.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket736.java
@@ -17,7 +17,7 @@ import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.UI.LegacyWindow;
-public class Ticket736 extends Application.LegacyApplication {
+public class Ticket736 extends Application {
Address address = new Address();
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket846.java b/uitest/src/com/vaadin/tests/tickets/Ticket846.java
index 407663c6c6..a8170148a2 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket846.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket846.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextField;
-public class Ticket846 extends Application.LegacyApplication {
+public class Ticket846 extends Application {
@Override
public void init() {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket932.java b/uitest/src/com/vaadin/tests/tickets/Ticket932.java
index c12e2fcad3..3c5332ff01 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket932.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket932.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.UI.LegacyWindow;
import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
-public class Ticket932 extends Application.LegacyApplication {
+public class Ticket932 extends Application {
@Override
public void init() {