X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fdialogs%2FDefaultLoginDialog.java;h=19affc85431009fd36fedaf348c50da0fa3e3150;hb=fb4f7c451ea7d9025f7cf7fe032020f229df794a;hp=7a846f7b54564b66ecc9d4cd49a85a5fe81fc8d0;hpb=10c220cf49f5b146bac50ed7fe2578135cd466f1;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 7a846f7b5..19affc854 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
@@ -5,7 +5,6 @@ import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.TextOutputCallback;
 
-import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -22,7 +21,7 @@ import org.eclipse.swt.widgets.Text;
 public class DefaultLoginDialog extends AbstractLoginDialog {
 
 	public DefaultLoginDialog() {
-		this(Display.getDefault().getActiveShell());
+		this(Display.getCurrent().getActiveShell());
 	}
 
 	protected DefaultLoginDialog(Shell parentShell) {
@@ -30,13 +29,11 @@ public class DefaultLoginDialog extends AbstractLoginDialog {
 	}
 
 	protected Point getInitialSize() {
-		return new Point(300, 350);
+		return new Point(300, 180);
 	}
 
 	protected Control createDialogArea(Composite parent) {
 		Composite dialogarea = (Composite) super.createDialogArea(parent);
-		// dialogarea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
-		// true));
 		Composite composite = new Composite(dialogarea, SWT.NONE);
 		composite.setLayout(new GridLayout(2, false));
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
@@ -93,20 +90,21 @@ public class DefaultLoginDialog extends AbstractLoginDialog {
 
 	private void createTextoutputHandler(Composite composite,
 			TextOutputCallback callback) {
-		int messageType = callback.getMessageType();
-		int dialogMessageType = IMessageProvider.NONE;
-		switch (messageType) {
-		case TextOutputCallback.INFORMATION:
-			dialogMessageType = IMessageProvider.INFORMATION;
-			break;
-		case TextOutputCallback.WARNING:
-			dialogMessageType = IMessageProvider.WARNING;
-			break;
-		case TextOutputCallback.ERROR:
-			dialogMessageType = IMessageProvider.ERROR;
-			break;
-		}
-		setMessage(callback.getMessage(), dialogMessageType);
+		// TODO: find a way to pass this information
+		// int messageType = callback.getMessageType();
+		// int dialogMessageType = IMessageProvider.NONE;
+		// switch (messageType) {
+		// case TextOutputCallback.INFORMATION:
+		// dialogMessageType = IMessageProvider.INFORMATION;
+		// break;
+		// case TextOutputCallback.WARNING:
+		// dialogMessageType = IMessageProvider.WARNING;
+		// break;
+		// case TextOutputCallback.ERROR:
+		// dialogMessageType = IMessageProvider.ERROR;
+		// break;
+		// }
+		// setMessage(callback.getMessage(), dialogMessageType);
 	}
 
 	public void internalHandle() {