diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-04 12:10:27 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-04 12:10:27 +0300 |
| commit | f00dec63feef91038a2ba8b4a00c0b7810bb569e (patch) | |
| tree | 8836f9d42a13a3dbae186420e587ffba4dabc13a /uitest/src | |
| parent | ea82c990660756eef940b98af66d8ff89259a518 (diff) | |
| parent | ad7de55aec35414086a500e6f234b17827bd52a3 (diff) | |
| download | vaadin-framework-f00dec63feef91038a2ba8b4a00c0b7810bb569e.tar.gz vaadin-framework-f00dec63feef91038a2ba8b4a00c0b7810bb569e.zip | |
Merge branch 'master' into layoutgraph
Diffstat (limited to 'uitest/src')
3 files changed, 3 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java index 89cbf5d3ff..0f576a0f69 100644 --- a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java +++ b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java @@ -75,7 +75,7 @@ public class ThreadLocalInstances extends AbstractTestApplication { reportCurrentStatus("app init"); addUIProvider(new UIProvider() { @Override - public UI instantiateUI(Application application, + public UI createInstance(Application application, Class<? extends UI> type, WrappedRequest request) { return mainWindow; } diff --git a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java index 18267e90b6..3980cbd4de 100644 --- a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java +++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java @@ -25,7 +25,7 @@ public class LazyInitUIs extends AbstractTestApplication { addUIProvider(new UIProvider() { @Override - public UI instantiateUI(Application application, + public UI createInstance(Application application, Class<? extends UI> type, WrappedRequest request) { return getUI(request); } diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index 54cf8a94e0..9e4c719830 100644 --- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -51,7 +51,7 @@ public class DifferentFeaturesForDifferentClients extends Application { // Must override as default implementation isn't allowed to // instantiate our non-public classes @Override - public UI instantiateUI(Application application, + public UI createInstance(Application application, Class<? extends UI> type, WrappedRequest request) { try { return type.newInstance(); |