Change a few "root" occurrences to "UI" in error messages, javadoc

Change-Id: I3140b91262ca179bed48e2081c6093a21fc834a1

3 files changed, 8 insertions, 7 deletions

diff --git a/client/src/com/vaadin/client/ApplicationConfiguration.java b/client/src/com/vaadin/client/ApplicationConfiguration.java
index 1f35c408ae..22de396fab 100644
--- a/client/src/com/vaadin/client/ApplicationConfiguration.java
+++ b/client/src/com/vaadin/client/ApplicationConfiguration.java
@@ -285,11 +285,12 @@ public class ApplicationConfiguration implements EntryPoint {
     }
 
     /**
-     * Gets the root if of this application instance. The root id should be
-     * included in every request originating from this instance in order to
-     * associate it with the right UI instance on the server.
+     * Gets the UI id of the server-side UI associated with this client-side
+     * instance. The UI id should be included in every request originating from
+     * this instance in order to associate the request with the right UI
+     * instance on the server.
      * 
-     * @return the root id
+     * @return the UI id
      */
     public int getUIId() {
         return uiId;
diff --git a/client/src/com/vaadin/client/ui/VUI.java b/client/src/com/vaadin/client/ui/VUI.java
index a4d1df9423..577af47aae 100644
--- a/client/src/com/vaadin/client/ui/VUI.java
+++ b/client/src/com/vaadin/client/ui/VUI.java
@@ -456,7 +456,7 @@ public class VUI extends SimplePanel implements ResizeHandler,
     }
 
     /**
-     * Ensures the root is scrollable eg. after style name changes.
+     * Ensures the widget is scrollable eg. after style name changes.
      * <p>
      * For internal use only. May be removed or replaced in the future.
      */
diff --git a/server/src/com/vaadin/server/UIProvider.java b/server/src/com/vaadin/server/UIProvider.java
index e9ec25c326..0f5396372b 100644
--- a/server/src/com/vaadin/server/UIProvider.java
+++ b/server/src/com/vaadin/server/UIProvider.java
@@ -32,9 +32,9 @@ public abstract class UIProvider implements Serializable {
         try {
             return event.getUIClass().newInstance();
         } catch (InstantiationException e) {
-            throw new RuntimeException("Could not instantiate root class", e);
+            throw new RuntimeException("Could not instantiate UI class", e);
         } catch (IllegalAccessException e) {
-            throw new RuntimeException("Could not access root class", e);
+            throw new RuntimeException("Could not access UI class", e);
         }
     }