From df5769d3a234eac05df4d089f5498e9d19da9e19 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Wed, 16 Dec 2009 08:51:36 +0000 Subject: [PATCH] fixes #3807, LoginForm now works if getWindow() returns windows for each uri (also urihandlers) svn changeset:10342/svn branch:6.2 --- src/com/vaadin/ui/LoginForm.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/com/vaadin/ui/LoginForm.java b/src/com/vaadin/ui/LoginForm.java index 81587f9e6a..9d1de60505 100644 --- a/src/com/vaadin/ui/LoginForm.java +++ b/src/com/vaadin/ui/LoginForm.java @@ -37,6 +37,8 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection; */ public class LoginForm extends CustomComponent { + private static final long serialVersionUID = 4081792750778351702L; + private Embedded iframe = new Embedded(); private ApplicationResource loginPage = new ApplicationResource() { @@ -79,15 +81,16 @@ public class LoginForm extends CustomComponent { */ private static final long serialVersionUID = 1L; - public void handleParameters(Map parameters) { + public void handleParameters(Map parameters) { if (parameters.containsKey("username")) { getWindow().addURIHandler(uriHandler); HashMap params = new HashMap(); // expecting single params - for (Iterator it = parameters.keySet().iterator(); it.hasNext();) { - String key = (String) it.next(); - String value = ((String[]) parameters.get(key))[0]; + for (Iterator it = parameters.keySet().iterator(); it + .hasNext();) { + String key = it.next(); + String value = (parameters.get(key))[0]; params.put(key, value); } LoginEvent event = new LoginEvent(params); @@ -139,7 +142,8 @@ public class LoginForm extends CustomComponent { */ protected byte[] getLoginHTML() { - String appUri = getApplication().getURL().toString(); + String appUri = getApplication().getURL().toString() + + getWindow().getName() + "/"; return ("