diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-09-05 19:35:55 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-09-05 19:35:55 +0300 |
| commit | d344148d038498aeb8ef04511d0a44d95ebff32b (patch) | |
| tree | 1ab0e8fef98bdfe48fa4b7055d8434a16d424fa4 /server/src/com/vaadin/ui/LoginForm.java | |
| parent | 4a69dcbca783a0fd0ed353a7a218c31d8d814c34 (diff) | |
| parent | 4019f7d03a1d8437a24ccadc562c30f99da5efe0 (diff) | |
| download | vaadin-framework-d344148d038498aeb8ef04511d0a44d95ebff32b.tar.gz vaadin-framework-d344148d038498aeb8ef04511d0a44d95ebff32b.zip | |
Merge branch 'removeApplication'
Diffstat (limited to 'server/src/com/vaadin/ui/LoginForm.java')
| -rw-r--r-- | server/src/com/vaadin/ui/LoginForm.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/src/com/vaadin/ui/LoginForm.java b/server/src/com/vaadin/ui/LoginForm.java index 18927077d8..f597908b8c 100644 --- a/server/src/com/vaadin/ui/LoginForm.java +++ b/server/src/com/vaadin/ui/LoginForm.java @@ -24,10 +24,10 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import com.vaadin.Application; import com.vaadin.server.ConnectorResource; import com.vaadin.server.DownloadStream; import com.vaadin.server.RequestHandler; +import com.vaadin.server.VaadinSession; import com.vaadin.server.WrappedRequest; import com.vaadin.server.WrappedResponse; import com.vaadin.shared.ApplicationConstants; @@ -83,7 +83,7 @@ public class LoginForm extends CustomComponent { private final RequestHandler requestHandler = new RequestHandler() { @Override - public boolean handleRequest(Application application, + public boolean handleRequest(VaadinSession application, WrappedRequest request, WrappedResponse response) throws IOException { String requestPathInfo = request.getRequestPathInfo(); @@ -132,7 +132,7 @@ public class LoginForm extends CustomComponent { * @return byte array containing login page html */ protected byte[] getLoginHTML() { - String appUri = getApplication().getURL().toString(); + String appUri = getSession().getURL().toString(); try { return ("<!DOCTYPE html PUBLIC \"-//W3C//DTD " @@ -186,13 +186,13 @@ public class LoginForm extends CustomComponent { @Override public void attach() { super.attach(); - getApplication().addRequestHandler(requestHandler); + getSession().addRequestHandler(requestHandler); iframe.setSource(loginPage); } @Override public void detach() { - getApplication().removeRequestHandler(requestHandler); + getSession().removeRequestHandler(requestHandler); super.detach(); } |