diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-03 14:18:16 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-03 14:18:16 +0300 |
| commit | b6e762dc8408b607568919f518ab2e2f74df7010 (patch) | |
| tree | b6ccf5b5cb1225d6744f20b0292880cd094bbcf1 /server/src/com/vaadin/ui | |
| parent | 1bc93daa34b1094f41cf19f20342c94c4e423244 (diff) | |
| parent | ae2c302f71554f49b3f57b649cec7450c652cf09 (diff) | |
| download | vaadin-framework-b6e762dc8408b607568919f518ab2e2f74df7010.tar.gz vaadin-framework-b6e762dc8408b607568919f518ab2e2f74df7010.zip | |
Merge branch 'master' into layoutgraph
Diffstat (limited to 'server/src/com/vaadin/ui')
| -rw-r--r-- | server/src/com/vaadin/ui/UI.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index d1ccaacde3..0f914d3947 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -33,7 +33,6 @@ import com.vaadin.event.Action.Handler; import com.vaadin.event.ActionManager; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; -import com.vaadin.server.AbstractApplicationServlet; import com.vaadin.server.LegacyComponent; import com.vaadin.server.Page; import com.vaadin.server.Page.BrowserWindowResizeEvent; @@ -41,6 +40,7 @@ import com.vaadin.server.Page.BrowserWindowResizeListener; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; +import com.vaadin.server.VaadinServlet; import com.vaadin.server.WrappedRequest; import com.vaadin.server.WrappedRequest.BrowserDetails; import com.vaadin.shared.EventId; @@ -63,7 +63,7 @@ import com.vaadin.tools.ReflectTools; * </p> * <p> * When a new UI instance is needed, typically because the user opens a URL in a - * browser window which points to {@link AbstractApplicationServlet}, + * browser window which points to {@link VaadinServlet}, * {@link Application#getUIForRequest(WrappedRequest)} is invoked to get a UI. * That method does by default create a UI according to the * {@value Application#UI_PARAMETER} parameter from web.xml. |