[jbosstools-commits] JBoss Tools SVN: r6799 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: launch and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2008-03-07 18:56:21 -0500 (Fri, 07 Mar 2008)
New Revision: 6799

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java
Log:
incremental fix to the dialog. Saves by default, text boxes start with the text of the saved username and password. 

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java	2008-03-07 23:15:05 UTC (rev 6798)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java	2008-03-07 23:56:21 UTC (rev 6799)
@@ -37,6 +37,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
 import org.jboss.ide.eclipse.as.ui.Messages;
 
 /**
@@ -47,10 +48,12 @@
 
 	private String user, pass;
 	private boolean save;
+	private JBossServer jbs;
 	
-	public RequiredCredentialsDialog(Shell parentShell) {
+	public RequiredCredentialsDialog(Shell parentShell, JBossServer jbs) {
 		super(parentShell);
 		setShellStyle(getShellStyle() | SWT.RESIZE);
+		this.jbs = jbs;
 	}
 
 	protected void configureShell(Shell newShell) {
@@ -106,6 +109,13 @@
 		userText.addModifyListener(listener);
 		passText.addModifyListener(listener);
 		saveCredentials.addSelectionListener(listener2);
+		
+		// defaults
+		userText.setText(jbs.getUsername());
+		userText.setSelection(0, jbs.getUsername() == null ? 0 : jbs.getUsername().length());
+		passText.setText(jbs.getPassword());
+		// save by default
+		saveCredentials.setSelection(true);
 		return c;
 	}
 

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java	2008-03-07 23:15:05 UTC (rev 6798)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java	2008-03-07 23:56:21 UTC (rev 6799)
@@ -33,12 +33,12 @@
 	public void handle(final IServerStatePoller poller, String action, List requiredProperties) {
 		Display.getDefault().asyncExec(new Runnable() { 
 			public void run() {
-				RequiredCredentialsDialog d = new RequiredCredentialsDialog(new Shell());
+				IServer server = poller.getServer();
+				IServerWorkingCopy copy = server.createWorkingCopy();
+				JBossServer jbs = ServerConverter.getJBossServer(copy);
+				RequiredCredentialsDialog d = new RequiredCredentialsDialog(new Shell(), jbs);
 				if( d.open() == Window.OK) {
 					if( d.getSave() ) {
-						IServer server = poller.getServer();
-						IServerWorkingCopy copy = server.createWorkingCopy();
-						JBossServer jbs = ServerConverter.getJBossServer(copy);
 						jbs.setPassword(d.getPass());
 						jbs.setUsername(d.getUser());
 						try {