gui-0.7 - Show username in window title of Feed- and ProfileWindow

ChangeLog

@@ -0,0 +1,3 @@
+2011-07-21  Sven Drieling
+
+	* Show username in window title of Feed- and ProfileWindow (Daniel Renfer, <http://onesocialweb.uservoice.com/forums/102807-general/suggestions/1776833-include-the-authenticated-user-s-name-on-the-web-c>)

src/main/java/org/onesocialweb/gwt/client/OswClient.java

@@ -30,6 +30,8 @@
 import org.onesocialweb.gwt.client.ui.dialog.LoginDialog;
 import org.onesocialweb.gwt.client.ui.menu.MainMenu;
 import org.onesocialweb.gwt.client.ui.menu.MenuCommand;
+import org.onesocialweb.gwt.client.ui.window.AbstractWindow;
+import org.onesocialweb.gwt.client.ui.window.FeedWindow;
 import org.onesocialweb.gwt.client.util.OSWUrlBuilder;
 import org.onesocialweb.gwt.service.OswService;
 import org.onesocialweb.gwt.service.OswServiceFactory;
@@ -181,6 +183,17 @@ public void handleLogin(boolean success) {
 				if (success) {
 					LoginDialog.getInstance().hide();
 					createSession();
+
+					// TODO Use the first or the commented version?
+					AbstractWindow w = currentApplication.getWindow(0);
+					if(null != w) {
+						// Shows window title with login name from LoginDialog.loginJID
+						w.repaint();
+					}
+//					if(null != w && w instanceof FeedWindow) {
+//						// Update window title: Gets loginJID from LoginDialog.loginJID
+//						w.setWindowTitle(uiText.Activities());
+//					}
 				}
 			}
 		});
@@ -270,6 +283,9 @@ private void destroySession() {
 		// clear the local storage
 		Storage.getLocalStorage().clear();
 
+		// clear loginJID
+		LoginDialog.loginJID = null;
+
 		// show login dialog
 		showLogin();
 	}

src/main/java/org/onesocialweb/gwt/client/ui/application/AbstractApplication.java

@@ -145,8 +145,8 @@ public void removeWindow(AbstractWindow window) {
 		}
 	}
 
-	protected AbstractWindow getWindow(int slotId) {
-		return windows.get(slotId);
+	public AbstractWindow getWindow(int slotId) {
+		return windows.get(getSlot(slotId));
 	}
 
 	protected Slot getSlot(int slotId) {

src/main/java/org/onesocialweb/gwt/client/ui/dialog/LoginDialog.java

@@ -58,6 +58,7 @@
 import eu.maydu.gwt.validation.client.validators.strings.EmailValidator;
 
 public class LoginDialog extends AbstractDialog {
+	public static String loginJID = null;
 
 	// internationalization
 	private UserInterfaceText uiText = (UserInterfaceText) GWT.create(UserInterfaceText.class);
@@ -365,6 +366,7 @@ private void processLogin() {
 
 					@Override
 					public void onFailure() {
+						loginJID = null;
 						loginError
 								.setText(uiText.LoginFailure());
 						loginError.setVisible(true);
@@ -384,6 +386,7 @@ public void onSuccess(Object result) {
 									.getValue());
 						}
 
+						loginJID = usernameText.getValue() + "@" + OswClient.getInstance().getPreference("xmpp_domain");
 						complete();
 					}
 

src/main/java/org/onesocialweb/gwt/client/ui/window/FeedWindow.java

@@ -18,11 +18,14 @@
 
 import org.onesocialweb.gwt.client.OswClient;
 import org.onesocialweb.gwt.client.i18n.UserInterfaceText;
+import org.onesocialweb.gwt.client.ui.dialog.LoginDialog;
 import org.onesocialweb.gwt.client.ui.event.ComponentEvent;
 import org.onesocialweb.gwt.client.ui.event.ComponentListener;
 import org.onesocialweb.gwt.client.ui.widget.activity.InboxPanel;
 import org.onesocialweb.gwt.client.ui.widget.compose.NewActivityPanel;
 import org.onesocialweb.gwt.service.OswServiceFactory;
+import org.onesocialweb.gwt.service.RequestCallback;
+import org.onesocialweb.model.vcard4.Profile;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -42,6 +45,8 @@ public class FeedWindow extends AbstractWindow {
 	private NewActivityPanel statusPanel;
 	private StatusPanelListener statusPanelListener;
 
+	private String tmpWindowTitle; // To access window title in callback
+
 	@Override
 	protected void onInit() {
 		composeWindow();
@@ -62,6 +67,40 @@ protected void onDestroy() {
 		statusPanel.removeComponentListener(statusPanelListener);
 	}
 
+
+	public void setWindowTitle(String windowTitle, String name) {
+		super.setWindowTitle(windowTitle + ", " + name + "?"); // TODO Use message {}
+	}
+
+	@Override
+	public void setWindowTitle(String windowTitle) {
+		// Access in callback
+		tmpWindowTitle = windowTitle;
+
+		if(null != LoginDialog.loginJID) {
+			OswServiceFactory.getService().getProfile(LoginDialog.loginJID,
+				new RequestCallback<Profile>() {
+					@Override
+					public void onFailure() {
+						setWindowTitle(tmpWindowTitle, LoginDialog.loginJID);
+					}
+
+					@Override
+					public void onSuccess(Profile result) {
+						// use display name
+						final String fullName = result.getFullName();
+						if (fullName != null && fullName.length() > 0) {
+							setWindowTitle(tmpWindowTitle, fullName);
+						} else {
+							setWindowTitle(tmpWindowTitle, LoginDialog.loginJID);
+						}
+					}
+			});
+		} else {
+			super.setWindowTitle(windowTitle);
+		}
+	}
+
 	private void composeWindow() {
 
 		// Setup window elements

src/main/java/org/onesocialweb/gwt/client/ui/window/ProfileWindow.java

@@ -115,7 +115,7 @@ public void setJID(String jid) {
 
 		// setup window
 		setStyle("profileWindow");
-		setWindowTitle(uiText.Profile());
+		setWindowTitle(uiText.Profile() + " " + jid);
 		enableClose();
 
 		// set profile ID
@@ -151,6 +151,12 @@ public void onFailure() {
 					public void onSuccess(Profile result) {
 						task.complete("", Status.succes);
 						model = result;
+
+						final String fullname = model.getFullName();
+						if(null != fullname && fullname.length() > 0) {
+						    setWindowTitle(uiText.Profile() + " " + fullname);
+						}
+
 						composeWindow();
 						hasProfile = true;
 					}

war/themes/osw/styles/core.css

@@ -533,6 +533,7 @@ img.logo {
 	border-top-left-radius: 5px;
 	-moz-border-radius-topleft: 5px;
 	-webkit-border-top-left-radius: 5px;
+	max-width: 300px;
 	margin: 0;
 	}