summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/com/vaadin/ui')
-rw-r--r--server/src/com/vaadin/ui/AbstractComponent.java12
-rw-r--r--server/src/com/vaadin/ui/ConnectorTracker.java6
-rw-r--r--server/src/com/vaadin/ui/UI.java18
-rw-r--r--server/src/com/vaadin/ui/Window.java8
4 files changed, 17 insertions, 27 deletions
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 0b97e1667d..a52a07f266 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -557,16 +557,6 @@ public abstract class AbstractComponent extends AbstractClientConnector
}
/*
- * Gets the parent window of the component. Don't add a JavaDoc comment
- * here, we use the default documentation from implemented interface.
- */
- @Override
- public UI getUI() {
- // Just make method from implemented Component interface public
- return super.getUI();
- }
-
- /*
* Notify the component that it's attached to a window. Don't add a JavaDoc
* comment here, we use the default documentation from implemented
* interface.
@@ -1304,7 +1294,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
/**
* Set a viewer for the action manager to be the parent sub window (if the
- * component is in a window) or the root (otherwise). This is still a
+ * component is in a window) or the UI (otherwise). This is still a
* simplification of the real case as this should be handled by the parent
* VOverlay (on the client side) if the component is inside an VOverlay
* component.
diff --git a/server/src/com/vaadin/ui/ConnectorTracker.java b/server/src/com/vaadin/ui/ConnectorTracker.java
index c7c7bc9784..ad5990137c 100644
--- a/server/src/com/vaadin/ui/ConnectorTracker.java
+++ b/server/src/com/vaadin/ui/ConnectorTracker.java
@@ -210,7 +210,7 @@ public class ConnectorTracker implements Serializable {
while (iterator.hasNext()) {
String connectorId = iterator.next();
ClientConnector connector = connectorIdToConnector.get(connectorId);
- if (getRootForConnector(connector) != uI) {
+ if (getUIForConnector(connector) != uI) {
// If connector is no longer part of this uI,
// remove it from the map. If it is re-attached to the
// application at some point it will be re-added through
@@ -239,7 +239,7 @@ public class ConnectorTracker implements Serializable {
* @return The uI the connector is attached to or null if it is not
* attached to any uI.
*/
- private UI getRootForConnector(ClientConnector connector) {
+ private UI getUIForConnector(ClientConnector connector) {
if (connector == null) {
return null;
}
@@ -247,7 +247,7 @@ public class ConnectorTracker implements Serializable {
return ((Component) connector).getUI();
}
- return getRootForConnector(connector.getParent());
+ return getUIForConnector(connector.getParent());
}
/**
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index c0b3ed9929..aede1af54b 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -35,9 +35,9 @@ import com.vaadin.event.MouseEvents.ClickListener;
import com.vaadin.shared.EventId;
import com.vaadin.shared.MouseEventDetails;
import com.vaadin.shared.ui.BorderStyle;
-import com.vaadin.shared.ui.root.RootConstants;
-import com.vaadin.shared.ui.root.UIServerRpc;
-import com.vaadin.shared.ui.root.UIState;
+import com.vaadin.shared.ui.ui.UIConstants;
+import com.vaadin.shared.ui.ui.UIServerRpc;
+import com.vaadin.shared.ui.ui.UIState;
import com.vaadin.terminal.Page;
import com.vaadin.terminal.Page.BrowserWindowResizeEvent;
import com.vaadin.terminal.Page.BrowserWindowResizeListener;
@@ -64,7 +64,7 @@ import com.vaadin.ui.Window.CloseListener;
* When a new UI instance is needed, typically because the user opens a URL in a
* browser window which points to {@link AbstractApplicationServlet},
* {@link Application#getUIForRequest(WrappedRequest)} is invoked to get a UI.
- * That method does by default create a root according to the
+ * That method does by default create a UI according to the
* {@value Application#UI_PARAMETER} parameter from web.xml.
* </p>
* <p>
@@ -544,8 +544,8 @@ public abstract class UI extends AbstractComponentContainer implements
if (pendingFocus != null) {
// ensure focused component is still attached to this main window
if (pendingFocus.getUI() == this
- || (pendingFocus.getUI() != null && pendingFocus
- .getUI().getParent() == this)) {
+ || (pendingFocus.getUI() != null && pendingFocus.getUI()
+ .getParent() == this)) {
target.addAttribute("focused", pendingFocus);
}
pendingFocus = null;
@@ -556,7 +556,7 @@ public abstract class UI extends AbstractComponentContainer implements
}
if (isResizeLazy()) {
- target.addAttribute(RootConstants.RESIZE_LAZY, true);
+ target.addAttribute(UIConstants.RESIZE_LAZY, true);
}
}
@@ -585,9 +585,9 @@ public abstract class UI extends AbstractComponentContainer implements
actionManager.handleActions(variables, this);
}
- if (variables.containsKey(RootConstants.FRAGMENT_VARIABLE)) {
+ if (variables.containsKey(UIConstants.FRAGMENT_VARIABLE)) {
String fragment = (String) variables
- .get(RootConstants.FRAGMENT_VARIABLE);
+ .get(UIConstants.FRAGMENT_VARIABLE);
getPage().setFragment(fragment, true);
}
}
diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java
index ad2bbd0576..6102350566 100644
--- a/server/src/com/vaadin/ui/Window.java
+++ b/server/src/com/vaadin/ui/Window.java
@@ -224,11 +224,11 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
public void close() {
UI uI = getUI();
- // Don't do anything if not attached to a root
+ // Don't do anything if not attached to a UI
if (uI != null) {
// focus is restored to the parent window
uI.focus();
- // subwindow is removed from the root
+ // subwindow is removed from the UI
uI.removeWindow(this);
}
}
@@ -470,7 +470,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
* If there are currently several windows visible, calling this method makes
* this window topmost.
* <p>
- * This method can only be called if this window connected a root. Else an
+ * This method can only be called if this window connected a UI. Else an
* illegal state exception is thrown. Also if there are modal windows and
* this window is not modal, and illegal state exception is thrown.
* <p>
@@ -485,7 +485,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
for (Window w : uI.getWindows()) {
if (!isModal() && w.isModal()) {
throw new IllegalStateException(
- "The root contains modal windows, non-modal window cannot be brought to front.");
+ "The UI contains modal windows, non-modal window cannot be brought to front.");
}
if (w.bringToFront != null) {
maxBringToFront = Math.max(maxBringToFront,
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 16:09:40 +0000