diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-29 12:22:31 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-29 12:22:31 +0300 |
| commit | 63595217a224b9fbc6de4b8bdc2e6b317e0558d5 (patch) | |
| tree | 9d7bcafc23ef5f4c6aad8bca6555fc04396aa1c6 /server/src/com/vaadin/Application.java | |
| parent | e18177bac62e8367829dfc5ec3083a09973e621e (diff) | |
| download | vaadin-framework-63595217a224b9fbc6de4b8bdc2e6b317e0558d5.tar.gz vaadin-framework-63595217a224b9fbc6de4b8bdc2e6b317e0558d5.zip | |
Merged com.vaadin.terminal.gwt.server into com.vaadin.server (#9431)
Diffstat (limited to 'server/src/com/vaadin/Application.java')
| -rw-r--r-- | server/src/com/vaadin/Application.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java index a406617288..ef3c805bb1 100644 --- a/server/src/com/vaadin/Application.java +++ b/server/src/com/vaadin/Application.java @@ -51,27 +51,27 @@ import com.vaadin.data.util.converter.Converter; import com.vaadin.data.util.converter.ConverterFactory; import com.vaadin.data.util.converter.DefaultConverterFactory; import com.vaadin.event.EventRouter; +import com.vaadin.server.AbstractApplicationServlet; import com.vaadin.server.AbstractErrorMessage; import com.vaadin.server.ApplicationResource; +import com.vaadin.server.BootstrapFragmentResponse; +import com.vaadin.server.BootstrapListener; +import com.vaadin.server.BootstrapPageResponse; +import com.vaadin.server.BootstrapResponse; +import com.vaadin.server.ChangeVariablesErrorEvent; +import com.vaadin.server.ClientConnector; import com.vaadin.server.CombinedRequest; import com.vaadin.server.DeploymentConfiguration; import com.vaadin.server.RequestHandler; import com.vaadin.server.Terminal; import com.vaadin.server.UIProvider; import com.vaadin.server.VariableOwner; +import com.vaadin.server.WebApplicationContext; import com.vaadin.server.WrappedRequest; import com.vaadin.server.WrappedResponse; import com.vaadin.server.WrappedRequest.BrowserDetails; import com.vaadin.service.ApplicationContext; import com.vaadin.shared.ui.ui.UIConstants; -import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; -import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse; -import com.vaadin.terminal.gwt.server.BootstrapListener; -import com.vaadin.terminal.gwt.server.BootstrapPageResponse; -import com.vaadin.terminal.gwt.server.BootstrapResponse; -import com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent; -import com.vaadin.terminal.gwt.server.ClientConnector; -import com.vaadin.terminal.gwt.server.WebApplicationContext; import com.vaadin.tools.ReflectTools; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; |