Update JoinGroupWizardPage to have auto login check box

4 files changed, 20 insertions, 22 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/NewWorkbenchAction.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/NewWorkbenchAction.java
index 09c6e3843..3113ce83f 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/NewWorkbenchAction.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/NewWorkbenchAction.java
@@ -23,10 +23,6 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.ActionDelegate;
 
-/**
- * @author slewis
- * 
- */
 public class NewWorkbenchAction extends ActionDelegate implements
 		IWorkbenchWindowActionDelegate {
 
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/URIClientConnectAction.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/URIClientConnectAction.java
index d19f5cb10..c1501d14a 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/URIClientConnectAction.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/URIClientConnectAction.java
@@ -62,7 +62,6 @@ public class URIClientConnectAction implements IWorkbenchWindowActionDelegate {
             try {
                 client.createAndConnectClient(containerType, uri,nickname, password,project);
                 if (autoLogin) saveAutoLoginInfo();
-                else removeAutoLoginInfo();
                 return new Status(IStatus.OK,ClientPlugin.getDefault().getBundle().getSymbolicName(),15000,"Connected",null);
             } catch (ContainerConnectException e) {
             	removeAutoLoginInfo();
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java
index 878a2502b..d1cb06449 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizard.java
@@ -71,24 +71,9 @@ public class JoinGroupWizard extends Wizard {
         String nickName = mainPage.getNicknameText();
         String containerType = mainPage.getContainerType();
         String password = mainPage.getPasswordText();
-		//String namespace = mainPage.getNamespace();
+        boolean autoLogin = mainPage.getAutoLoginFlag();
         try {
-        	/*
-			ID groupID = null;
-			if (namespace != null) {
-				groupID = IDFactory.getDefault().createID(namespace,new Object[] { groupName });
-			} else groupID = IDFactory.getDefault().createStringID(groupName);
-            client = new ClientConnectAction();
-            client.setProject(project);
-            client.setUsername(nickName);
-            client.setTargetID(groupID);
-            client.setContainerType(containerType);
-            client.setData(password);
-            client.run(null);
-            */
-        	//URI uri = new URI(groupName);
-        	//URI fullURI = new URI(namespace+":"+groupName);
-        	client = new URIClientConnectAction(containerType,groupName,nickName,password,project,false);
+        	client = new URIClientConnectAction(containerType,groupName,nickName,password,project,autoLogin);
         	client.run(null);
         } catch (Exception e) {
             String id = ClientPlugin.getDefault().getBundle().getSymbolicName();
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java
index 98a3fe787..b4516aad2 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java
@@ -22,10 +22,12 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
@@ -81,6 +83,13 @@ public class JoinGroupWizardPage extends WizardPage {
 	
 	protected String namespace = null;
 	
+	private Button autoLogin = null;
+	private boolean autoLoginFlag = false;
+
+
+	public boolean getAutoLoginFlag() {
+		return autoLoginFlag;
+	}
     protected void modifyUI(Map props) {
         if (props != null) {
             String usePassword = (String) props.get(USEPASSWORD_PROP_NAME);
@@ -226,6 +235,15 @@ public class JoinGroupWizardPage extends WizardPage {
             password_text.setVisible(false);
             password_label.setVisible(false);
         }
+		autoLogin = new Button(container,SWT.CHECK);
+		autoLogin.setText("Login &automatically at startup");
+		autoLogin.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+		autoLogin.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				autoLoginFlag = autoLogin.getSelection();
+			}});
+		
+
         fillCombo();
         restoreDialogSettings();
     }