diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-09-03 13:57:20 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-09-03 14:05:31 +0300 |
| commit | 6f276f4451cb185919084181b54fb84532a1d984 (patch) | |
| tree | 698b9459b867349aae9de5f26ebefa7dd1f3b81d /server/src/com/vaadin/Application.java | |
| parent | 3dd5a4824cda3dd7842c937a618feebc2b1a0f27 (diff) | |
| download | vaadin-framework-6f276f4451cb185919084181b54fb84532a1d984.tar.gz vaadin-framework-6f276f4451cb185919084181b54fb84532a1d984.zip | |
Combine ApplicationServlet and AAS and rename to VaadinServlet (#9460)
Diffstat (limited to 'server/src/com/vaadin/Application.java')
| -rw-r--r-- | server/src/com/vaadin/Application.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java index 8a043154d7..2af3c6a59f 100644 --- a/server/src/com/vaadin/Application.java +++ b/server/src/com/vaadin/Application.java @@ -48,7 +48,6 @@ 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.ApplicationContext; import com.vaadin.server.BootstrapFragmentResponse; @@ -64,6 +63,7 @@ import com.vaadin.server.RequestHandler; import com.vaadin.server.ServletApplicationContext; import com.vaadin.server.Terminal; import com.vaadin.server.UIProvider; +import com.vaadin.server.VaadinServlet; import com.vaadin.server.VariableOwner; import com.vaadin.server.WrappedRequest; import com.vaadin.server.WrappedRequest.BrowserDetails; @@ -1728,7 +1728,7 @@ public class Application implements Terminal.ErrorListener, Serializable { * Handles a request by passing it to each registered {@link RequestHandler} * in turn until one produces a response. This method is used for requests * that have not been handled by any specific functionality in the terminal - * implementation (e.g. {@link AbstractApplicationServlet}). + * implementation (e.g. {@link VaadinServlet}). * <p> * The request handlers are invoked in the revere order in which they were * added to the application until a response has been produced. This means |