Rename UIProvider.instantiateUI -> createInstance (#8159)

diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java
index f368257ecd5878680aa0f2acd754e130d428720b..7af5852512001d31e969701de94f13d937e4a9dd 100644 (file)
--- 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 f383368d9142e32b60a23d9ec7027eb235b8473d..59ce31891d19b30ce5294834d6fc4a36e1b3a0ac 100644 (file)
--- 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 36bb164845d30a84a682e18c0f5d3e04d0c0792f..ea73a705ea2bebf300e930b010c5cff0a9aafc96 100644 (file)
--- 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 89cbf5d3ffb1ca7a4a6bea6b872bbb8d58a1012f..0f576a0f6941c9e74fa161f019cd78ce6afe267b 100644 (file)
--- 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 18267e90b68df87fc516c34c64b645c2c5919a4b..3980cbd4deec4d50c4f8b466324b60f2bdef713a 100644 (file)
--- 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 54cf8a94e07ccdb0f533ae926f15384852935292..9e4c71983076e8de0e9faadfc7735d4500c18d3f 100644 (file)
--- 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();