diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-08-27 12:40:41 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-08-27 12:40:41 +0300 |
| commit | a67ca492c18451c0f286e90b3a5fb34bde2d3c47 (patch) | |
| tree | 77f8879242385bfa6f970bfb129531dd32ce242a /server/src/com/vaadin/annotations | |
| parent | c8cee295021dcd33982217e3ad1c374bfca63a29 (diff) | |
| parent | fc3f7f62b05ae69b242d64084f676d7733962c60 (diff) | |
| download | vaadin-framework-a67ca492c18451c0f286e90b3a5fb34bde2d3c47.tar.gz vaadin-framework-a67ca492c18451c0f286e90b3a5fb34bde2d3c47.zip | |
Merge branch 'master' into root-cleanup
Rename Root -> UI in root cleanup code
Conflicts:
client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
server/src/com/vaadin/ui/UI.java
Diffstat (limited to 'server/src/com/vaadin/annotations')
| -rw-r--r-- | server/src/com/vaadin/annotations/EagerInit.java | 6 | ||||
| -rw-r--r-- | server/src/com/vaadin/annotations/Theme.java | 4 | ||||
| -rw-r--r-- | server/src/com/vaadin/annotations/Widgetset.java | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/server/src/com/vaadin/annotations/EagerInit.java b/server/src/com/vaadin/annotations/EagerInit.java index 5131a79576..462c6bb5ac 100644 --- a/server/src/com/vaadin/annotations/EagerInit.java +++ b/server/src/com/vaadin/annotations/EagerInit.java @@ -21,15 +21,15 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** - * Indicates that the init method in a Root class can be called before full + * Indicates that the init method in a UI class can be called before full * browser details ({@link WrappedRequest#getBrowserDetails()}) are available. * This will make the UI appear more quickly, as ensuring the availability of * this information typically requires an additional round trip to the client. * - * @see Root#init(com.vaadin.terminal.WrappedRequest) + * @see UI#init(com.vaadin.terminal.WrappedRequest) * @see WrappedRequest#getBrowserDetails() * * @since 7.0 diff --git a/server/src/com/vaadin/annotations/Theme.java b/server/src/com/vaadin/annotations/Theme.java index e2610d2b3f..052bc245fd 100644 --- a/server/src/com/vaadin/annotations/Theme.java +++ b/server/src/com/vaadin/annotations/Theme.java @@ -21,10 +21,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** - * Defines a specific theme for a {@link Root}. + * Defines a specific theme for a {@link UI}. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/server/src/com/vaadin/annotations/Widgetset.java b/server/src/com/vaadin/annotations/Widgetset.java index e80f887691..69e3e19319 100644 --- a/server/src/com/vaadin/annotations/Widgetset.java +++ b/server/src/com/vaadin/annotations/Widgetset.java @@ -21,10 +21,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; /** - * Defines a specific theme for a {@link Root}. + * Defines a specific theme for a {@link UI}. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) |