X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fdialogs%2FDefaultLoginDialog.java;h=208eefea8b1b84a644552b4ad485cf0df7487a7e;hb=041234a54c1b98bcba16e359c4c4905c4eed1768;hp=96f0535d93ee9181396dd950a610242ace68cfce;hpb=2f1c0a952d1bbaafc243da2d5d4caa235f628777;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java
index 96f0535d9..208eefea8 100644
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/DefaultLoginDialog.java
@@ -1,6 +1,7 @@
 package org.argeo.security.ui.dialogs;
 
 import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.TextOutputCallback;
@@ -9,6 +10,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -18,6 +20,7 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+/** Default authentication dialog, to be used as {@link CallbackHandler}. */
 public class DefaultLoginDialog extends AbstractLoginDialog {
 
 	public DefaultLoginDialog() {
@@ -26,20 +29,32 @@ public class DefaultLoginDialog extends AbstractLoginDialog {
 
 	protected DefaultLoginDialog(Shell parentShell) {
 		super(parentShell);
-		// setBlockOnOpen(false);
 	}
 
 	protected Point getInitialSize() {
 		return new Point(300, 180);
 	}
 
+	@Override
+	protected Control createContents(Composite parent) {
+		Control control = super.createContents(parent);
+		parent.pack();
+		// Move the dialog to the center of the top level shell.
+		Rectangle shellBounds = Display.getCurrent().getBounds();
+		Point dialogSize = parent.getSize();
+		int x = shellBounds.x + (shellBounds.width - dialogSize.x) / 2;
+		int y = shellBounds.y + (shellBounds.height - dialogSize.y) / 2;
+		parent.setLocation(x, y);
+		return control;
+	}
+
 	protected Control createDialogArea(Composite parent) {
 		Composite dialogarea = (Composite) super.createDialogArea(parent);
 		Composite composite = new Composite(dialogarea, SWT.NONE);
 		composite.setLayout(new GridLayout(2, false));
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		createCallbackHandlers(composite);
-		parent.pack();
+		// parent.pack();
 		return composite;
 	}
 
@@ -48,7 +63,7 @@ public class DefaultLoginDialog extends AbstractLoginDialog {
 		for (int i = 0; i < callbacks.length; i++) {
 			Callback callback = callbacks[i];
 			if (callback instanceof TextOutputCallback) {
-				createTextoutputHandler(composite,
+				createLabelTextoutputHandler(composite,
 						(TextOutputCallback) callback);
 			} else if (callback instanceof NameCallback) {
 				createNameHandler(composite, (NameCallback) callback);
@@ -69,6 +84,7 @@ public class DefaultLoginDialog extends AbstractLoginDialog {
 		passwordText.addModifyListener(new ModifyListener() {
 
 			public void modifyText(ModifyEvent event) {
+				// FIXME use getTextChars() in Eclipse 3.7
 				callback.setPassword(passwordText.getText().toCharArray());
 			}
 		});
@@ -89,8 +105,13 @@ public class DefaultLoginDialog extends AbstractLoginDialog {
 		});
 	}
 
-	private void createTextoutputHandler(Composite composite,
-			TextOutputCallback callback) {
+	private void createLabelTextoutputHandler(Composite composite,
+			final TextOutputCallback callback) {
+		Label label = new Label(composite, SWT.NONE);
+		label.setText(callback.getMessage());
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		data.horizontalSpan = 2;
+		label.setLayoutData(data);
 		// TODO: find a way to pass this information
 		// int messageType = callback.getMessageType();
 		// int dialogMessageType = IMessageProvider.NONE;
@@ -110,35 +131,4 @@ public class DefaultLoginDialog extends AbstractLoginDialog {
 
 	public void internalHandle() {
 	}
-
-	// hack to simulate modal
-	// see
-	// http://dev.eclipse.org/mhonarc/newsLists/news.eclipse.platform.jface/msg00181.html
-	// protected void setShellStyle(int newShellStyle) {
-	// // turn off APPLICATION_MODAL
-	// int newstyle = newShellStyle & ~SWT.APPLICATION_MODAL;
-	// // turn on MODELESS
-	// newstyle |= SWT.MODELESS;
-	// super.setShellStyle(newstyle);
-	// }
-	//
-	// public int open() {
-	//
-	// int retVal = super.open();
-	// // this will let the caller wait till OK, Cancel is
-	// // pressed, but will let the other GUI responsive
-	// pumpMessages();
-	// return retVal;
-	// }
-	//
-	// protected void pumpMessages() {
-	// Shell sh = getShell();
-	// Display disp = sh.getDisplay();
-	// while (!sh.isDisposed()) {
-	// if (!disp.readAndDispatch())
-	// disp.sleep();
-	// }
-	// disp.update();
-	// }
-
 }