Removed superfluous code in JoinGroupWizard and JoinGroupWizard page

2 files changed, 4 insertions, 38 deletions

diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/JoinGroupWizard.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/JoinGroupWizard.java
index 2a32c25fe..9e5360f4a 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/JoinGroupWizard.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/JoinGroupWizard.java
@@ -23,8 +23,8 @@ public class JoinGroupWizard extends Wizard {
 	
 	private static final String DIALOG_SETTINGS = JoinGroupWizard.class.getName();
 	
-    JoinGroupWizardPage mainPage;
-    ContainerDescription [] descriptions = null;
+    protected JoinGroupWizardPage mainPage;
+    protected ContainerDescription [] descriptions = null;
     
     public JoinGroupWizard(IWorkbench workbench, String title, ContainerDescription [] descriptions) {
         super();
@@ -44,7 +44,7 @@ public class JoinGroupWizard extends Wizard {
     }
     public void addPages() {
         super.addPages();
-        mainPage = new JoinGroupWizardPage();
+        mainPage = new JoinGroupWizardPage(descriptions);
         addPage(mainPage);
     }
 
@@ -61,40 +61,5 @@ public class JoinGroupWizard extends Wizard {
     protected void finishPage(final IProgressMonitor monitor)
             throws InterruptedException, CoreException {
         
-    	mainPage.saveDialogSettings();
-    	/*
-    	URIClientConnectAction client = null;
-        String groupName = mainPage.getJoinGroupText();
-        String nickName = mainPage.getNicknameText();
-        String containerType = mainPage.getContainerType();
-        String password = mainPage.getPasswordText();
-        */
-		//String namespace = mainPage.getNamespace();
-        try {
-        	/*
-			ID groupID = null;
-			if (namespace != null) {
-				groupID = IDFactory.getDefault().makeID(namespace,new Object[] { groupName });
-			} else groupID = IDFactory.getDefault().makeStringID(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);
-        	client.run(null);
-        	*/
-        } catch (Exception e) {
-        	/*
-            String id = ClientPlugin.PLUGIN_ID;
-            throw new CoreException(new Status(Status.ERROR, id, 100, "Could not connect to "+groupName, e));
-        	*/
-        }
     }
 }
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/JoinGroupWizardPage.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/JoinGroupWizardPage.java
index d437cbc16..edbe0095d 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/JoinGroupWizardPage.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/JoinGroupWizardPage.java
@@ -62,6 +62,7 @@ public class JoinGroupWizardPage extends WizardPage {
         super("wizardPage");
         setTitle(PAGE_TITLE);
         setDescription(PAGE_DESCRIPTION);
+        this.descriptions = descriptions;
     }
 
     public JoinGroupWizardPage() {