diff options
6 files changed, 6 insertions, 6 deletions
diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java index f368257ecd..7af5852512 100644 --- a/server/src/com/vaadin/Application.java +++ b/server/src/com/vaadin/Application.java @@ -1649,7 +1649,7 @@ public class Application implements Terminal.ErrorListener, Serializable { // class continue; } - return uiClass.cast(provider.instantiateUI(this, uiClass, + return uiClass.cast(provider.createInstance(this, uiClass, request)); } } diff --git a/server/src/com/vaadin/server/AbstractUIProvider.java b/server/src/com/vaadin/server/AbstractUIProvider.java index f383368d91..59ce31891d 100644 --- a/server/src/com/vaadin/server/AbstractUIProvider.java +++ b/server/src/com/vaadin/server/AbstractUIProvider.java @@ -22,7 +22,7 @@ import com.vaadin.ui.UI; public abstract class AbstractUIProvider implements UIProvider { @Override - public UI instantiateUI(Application application, Class<? extends UI> type, + public UI createInstance(Application application, Class<? extends UI> type, WrappedRequest request) { try { return type.newInstance(); diff --git a/server/src/com/vaadin/server/UIProvider.java b/server/src/com/vaadin/server/UIProvider.java index 36bb164845..ea73a705ea 100644 --- a/server/src/com/vaadin/server/UIProvider.java +++ b/server/src/com/vaadin/server/UIProvider.java @@ -23,6 +23,6 @@ public interface UIProvider { public Class<? extends UI> getUIClass(Application application, WrappedRequest request); - public UI instantiateUI(Application application, Class<? extends UI> type, + public UI createInstance(Application application, Class<? extends UI> type, WrappedRequest request); } 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(); |