New connection dialog. Load/save dialog state not yet working.

1 files changed, 330 insertions, 48 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ConnectionDialog.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ConnectionDialog.java
index 80e9598dd..8a36ac1e2 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ConnectionDialog.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ConnectionDialog.java
@@ -1,22 +1,29 @@
 package org.eclipse.ecf.example.collab.ui;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.eclipse.ecf.core.ContainerTypeDescription;
+
 import org.eclipse.ecf.core.ContainerFactory;
+import org.eclipse.ecf.core.ContainerTypeDescription;
 import org.eclipse.ecf.example.collab.ClientPlugin;
 import org.eclipse.ecf.example.collab.ClientPluginConstants;
+import org.eclipse.jface.dialogs.DialogSettings;
+import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
@@ -26,21 +33,92 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Text;
 
 public class ConnectionDialog extends TitleAreaDialog {
-	protected static final String CLASSNAME = JoinGroupWizardPage.class.getName();
-	protected static final String ISSERVER_PROP_NAME = CLASSNAME+".isServer";
+	private static final int PROVIDER_TABLE_HEIGHT = 200;
+
+	private static final int PROVIDER_TABLE_WIDTH = 150;
+
+	protected static final String CLASSNAME = JoinGroupWizardPage.class
+			.getName();
+
+	protected static final String USER_NAME_SYSTEM_PROPERTY = "user.name";
+
+	protected static final String ISSERVER_PROP_NAME = CLASSNAME + ".isServer";
+
+	protected static final String DEFAULTGROUPID_PROP_NAME = CLASSNAME
+			+ ".defaultgroupid";
+
+	protected static final String EXAMPLEGROUPID_PROP_NAME = CLASSNAME
+			+ ".examplegroupid";
+
+	protected static final String USEPASSWORD_PROP_NAME = CLASSNAME
+			+ ".usepassword";
+
+	protected static final String USENICKNAME_PROP_NAME = CLASSNAME
+			+ ".usenickname";
+
+	protected static final String URLPREFIX_NAME = CLASSNAME + ".urlprefix";
+
+	protected static final String GROUPIDLABEL_PROP_NAME = CLASSNAME
+			+ ".groupIDLabel";
+
+	protected static final String NAMESPACE_PROP_NAME = CLASSNAME
+			+ ".namespace";
+
+	protected static final String PAGE_DESCRIPTION = "Select protocol provider, complete account info and login";
+
+	protected static final String JOINGROUP_FIELDNAME = "Group ID:";
+
+	protected static final String NICKNAME_FIELDNAME = "Nickname:";
+
+	protected static final String ECF_DEFAULT_URL = "ecftcp://localhost:3282/server";
+
+	protected static final String ECF_TEMPLATE_URL = "<protocol>://<machinename>:<port>/<servicename>";
+
+	protected static final String PAGE_TITLE = "Connect with ECF";
+
 	protected static final String DEFAULT_CLIENT = "ecf.generic.client";
+
+	private static final String DIALOG_SETTINGS = CLASSNAME;
+
+	private Composite paramComp;
+
+	private Text joingroup_text;
+
+	private String joinGroup = "";
+
+	private Text nickname_text;
+
+	private String nickname = "";
+
+	private Text password_text;
+
+	private String password = "";
+
+	private String urlPrefix;
+
+	private String namespace = null;
+
+	private String containerType = "";
+
+	private TableViewer viewer;
+
+	private IDialogSettings dialogSettings;
 	
+	private GlobalModifyListener listener = new GlobalModifyListener();
+
 	public ConnectionDialog(Shell parentShell) {
 		super(parentShell);
 	}
 
 	protected Control createDialogArea(Composite parent) {
-		Composite main = new Composite((Composite) super.createDialogArea(parent), SWT.NONE);
+		Composite main = new Composite((Composite) super
+				.createDialogArea(parent), SWT.NONE);
 		main.setLayout(new GridLayout());
 		main.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
+
 		Label providerLabel = new Label(main, SWT.NONE);
 		providerLabel.setText("Connection Protocol");
 
@@ -50,31 +128,48 @@ public class ConnectionDialog extends TitleAreaDialog {
 		layout.marginWidth = 0;
 		providerComp.setLayout(layout);
 		providerComp.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		TableViewer viewer = new TableViewer(providerComp, SWT.BORDER
-				| SWT.FULL_SELECTION);
+
+		viewer = new TableViewer(providerComp, SWT.BORDER | SWT.FULL_SELECTION);
 		viewer.setContentProvider(new ECFProviderContentProvider());
-		viewer.setLabelProvider(new ECFProviderLabelProvider());		
+		viewer.setLabelProvider(new ECFProviderLabelProvider());
 		viewer.addSelectionChangedListener(new ProviderSelector());
-		
+
 		Table table = viewer.getTable();
 		GridData gData = new GridData(GridData.FILL_VERTICAL);
-		gData.widthHint = 150;
+		gData.widthHint = PROVIDER_TABLE_WIDTH;
+		gData.heightHint = PROVIDER_TABLE_HEIGHT;
 		table.setLayoutData(gData);
-/*		table.setHeaderVisible(true);
-		TableColumn tc = new TableColumn(table, SWT.NONE);
-		tc.setText("Name");
-		tc = new TableColumn(table, SWT.NONE);
-		tc.setText("Classname");*/
+		/*
+		 * table.setHeaderVisible(true); TableColumn tc = new TableColumn(table,
+		 * SWT.NONE); tc.setText("Name"); tc = new TableColumn(table, SWT.NONE);
+		 * tc.setText("Classname");
+		 */
 
 		viewer.setInput(ContainerFactory.getDefault().getDescriptions());
-		
-		Composite paramComp = new Composite(providerComp, SWT.NONE);
-		paramComp.setLayout(new GridLayout());
+
+		paramComp = new Composite(providerComp, SWT.NONE);
+		GridLayout glayout = new GridLayout();
+		glayout.marginTop = 0;
+		glayout.marginBottom = 0;
+		paramComp.setLayout(glayout);
 		paramComp.setLayoutData(new GridData(GridData.FILL_BOTH));
 
+		new Label(main, SWT.NONE);
+		Label sep = new Label(main, SWT.SEPARATOR | SWT.HORIZONTAL);
+		sep.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
 		this.setTitle("ECF Connection");
-		this.setMessage("Please choose a provider and supply connection parameters.");
+		this
+				.setMessage("Please choose a provider and supply connection parameters.");
+
+		this.getShell().setText("Connect");
+		
+/*		try {
+			restoreDialogSettings();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}*/
 
 		return parent;
 	}
@@ -83,51 +178,142 @@ public class ConnectionDialog extends TitleAreaDialog {
 		return new Point(450, 300);
 	}
 
-	private class ECFProviderContentProvider implements IStructuredContentProvider {
+	private class ECFProviderContentProvider implements
+			IStructuredContentProvider {
 
-		public Object[] getElements(Object inputElement) {		
+		public Object[] getElements(Object inputElement) {
 			List rawDescriptions = (List) inputElement;
 			List elements = new ArrayList();
-			
-			for(Iterator i=rawDescriptions.iterator(); i.hasNext(); ) {
-	            final ContainerTypeDescription desc = (ContainerTypeDescription) i.next();
-	            Map props = desc.getProperties();
-	            String isServer = (String) props.get(ISSERVER_PROP_NAME);
-	            if (isServer == null || !isServer.equalsIgnoreCase("true")) {
-	                elements.add(desc);
-	            }
-	        }
-			
+
+			for (Iterator i = rawDescriptions.iterator(); i.hasNext();) {
+				final ContainerTypeDescription desc = (ContainerTypeDescription) i
+						.next();
+				Map props = desc.getProperties();
+				String isServer = (String) props.get(ISSERVER_PROP_NAME);
+				if (isServer == null || !isServer.equalsIgnoreCase("true")) {
+					elements.add(desc);
+				}
+			}
+
 			return elements.toArray();
 		}
 
-		public void dispose() {			
+		public void dispose() {
 		}
 
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}		
+		}
 	}
-	
+
+	public String getJoinGroupText() {
+		String textValue = joinGroup.trim();
+		String namespace = getNamespace();
+		if (namespace != null) {
+			return textValue;
+		} else {
+			if (!urlPrefix.equals("") && !textValue.startsWith(urlPrefix)) {
+				textValue = urlPrefix + textValue;
+			}
+			return textValue;
+		}
+	}
+
+	public String getNicknameText() {
+		return nickname;
+	}
+
+	public String getPasswordText() {
+		return password;
+	}
+
+	public String getContainerType() {
+		return containerType;
+	}
+
+	public String getNamespace() {
+		return namespace;
+	}
+
+	private void restoreDialogSettings() throws IOException {
+		IDialogSettings dialogSettings = getDialogSettings();
+		if (dialogSettings != null) {
+			IDialogSettings pageSettings = dialogSettings.getSection(DIALOG_SETTINGS);
+			pageSettings.load(this.getClass().toString());
+			if (pageSettings != null) {
+				int intVal = pageSettings.getInt("provider");
+				viewer.getTable().setSelection(intVal);
+
+				String strVal = pageSettings.get("url");
+				if (strVal != null)
+					joingroup_text.setText(strVal);
+
+				strVal = pageSettings.get("nickname");
+				if (strVal != null)
+					nickname_text.setText(strVal);
+				
+				listener.modifyText(null);
+			}
+		}
+	}
+
+	private void saveDialogSettings() {		
+		IDialogSettings dialogSettings = this.getDialogSettings();
+		if (dialogSettings != null) {
+			IDialogSettings pageSettings = dialogSettings
+					.getSection(DIALOG_SETTINGS);
+			if (pageSettings == null)
+				pageSettings = dialogSettings.addNewSection(DIALOG_SETTINGS);
+
+			pageSettings.put("url", joinGroup);
+			pageSettings.put("nickname", nickname);
+			int i = viewer.getTable().getSelectionIndex();
+			if (i >= 0)
+				pageSettings.put("provider", i);	
+			
+			try {
+				dialogSettings.save(this.getClass().toString());
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}			
+		}
+	}
+
+	protected void okPressed() {
+		saveDialogSettings();
+		super.okPressed();
+	}
+
+	private IDialogSettings getDialogSettings() {
+		if (dialogSettings == null) {
+			dialogSettings = new DialogSettings(this.getClass().toString());
+		}
+
+		return dialogSettings;
+	}
+
 	private class ECFProviderLabelProvider implements ITableLabelProvider {
 
-		public Image getColumnImage(Object element, int columnIndex) {			
+		public Image getColumnImage(Object element, int columnIndex) {
 			if (columnIndex == 0) {
-				//TODO: If the container description contains an image for the provider, display it here.
-				return ClientPlugin.getDefault().getImageRegistry().get(ClientPluginConstants.DECORATION_DEFAULT_PROVIDER);
+				// TODO: If the container description contains an image for the
+				// provider, display it here.
+				return ClientPlugin.getDefault().getImageRegistry().get(
+						ClientPluginConstants.DECORATION_DEFAULT_PROVIDER);
 			}
-			
+
 			return null;
 		}
 
 		public String getColumnText(Object element, int columnIndex) {
 			ContainerTypeDescription desc = (ContainerTypeDescription) element;
-			switch(columnIndex) {
+			switch (columnIndex) {
 			case 0:
 				return desc.getDescription();
 			case 1:
 				return desc.getName();
 			}
-			
+
 			return "";
 		}
 
@@ -143,17 +329,113 @@ public class ConnectionDialog extends TitleAreaDialog {
 
 		public void removeListener(ILabelProviderListener listener) {
 		}
-		
-	}	
-	
+
+	}
+
 	private class ProviderSelector implements ISelectionChangedListener {
 
 		public void selectionChanged(SelectionChangedEvent event) {
-			//StructuredSelection selection = (StructuredSelection) event.getSelection();
-			//ContainerTypeDescription desc = (ContainerTypeDescription) selection.getFirstElement();
-			
-			//desc.
+			StructuredSelection selection = (StructuredSelection) event
+					.getSelection();
+			ContainerTypeDescription desc = (ContainerTypeDescription) selection
+					.getFirstElement();
+			containerType = desc.getName();
+			createPropertyComposite(paramComp, desc.getProperties());
 		}
+
+		protected void createPropertyComposite(Composite parent, Map properties) {
+			if (properties != null) {
+				String usePassword = (String) properties
+						.get(USEPASSWORD_PROP_NAME);
+				String examplegroupid = (String) properties
+						.get(EXAMPLEGROUPID_PROP_NAME);
+				String defaultgroupid = (String) properties
+						.get(DEFAULTGROUPID_PROP_NAME);
+				String useNickname = (String) properties
+						.get(USENICKNAME_PROP_NAME);
+				urlPrefix = (String) properties.get(URLPREFIX_NAME);
+				namespace = (String) properties.get(NAMESPACE_PROP_NAME);
+
+				if (urlPrefix == null) {
+					urlPrefix = "";
+				}
+
+				removeChildren(parent);
+
+				String groupLabel = (String) properties
+						.get(GROUPIDLABEL_PROP_NAME);
+
+				Label groupIDLabel = new Label(parent, SWT.NONE);
+
+				if (groupLabel != null) {
+					groupIDLabel.setText(groupLabel);
+				} else {
+					groupIDLabel.setText(JOINGROUP_FIELDNAME);
+				}
+
+				joingroup_text = new Text(parent, SWT.BORDER);
+				joingroup_text.setLayoutData(new GridData(
+						GridData.FILL_HORIZONTAL));
+				joingroup_text.addModifyListener(listener);
+
+				if (examplegroupid != null) {
+					Label example_label = new Label(parent, SWT.NONE);
+					// set examplegroupid text
+					example_label
+							.setText((examplegroupid != null) ? examplegroupid
+									: "");
+					example_label.setLayoutData(new GridData(
+							GridData.HORIZONTAL_ALIGN_END));
+					// joingroup_text.setText((defaultgroupid != null) ?
+					// defaultgroupid : "");
+				}
+
+				// turn off password unless used
+				if (usePassword != null) {
+					Label password_label = new Label(parent, SWT.NONE);
+					password_label.setText("Password:");
+					password_text = new Text(parent, SWT.BORDER);
+					password_text.setLayoutData(new GridData(
+							GridData.FILL_HORIZONTAL));
+					password_text.setEchoChar('*');
+					password_text.addModifyListener(listener);
+				}
+
+				// turn off nickname unless used
+				if (useNickname != null) {
+					Label nickname_label = new Label(parent, SWT.NONE);
+					nickname_label.setText(NICKNAME_FIELDNAME);
+
+					nickname_text = new Text(parent, SWT.BORDER);
+					nickname_text.setLayoutData(new GridData(
+							GridData.FILL_HORIZONTAL));
+					nickname_text.addModifyListener(listener);
+				}
+
+				parent.layout();
+			}
+		}
+
+		private void removeChildren(Composite composite) {
+			if (composite != null && composite.getChildren() != null) {
+				while (composite.getChildren().length > 0) {
+					Control child = composite.getChildren()[0];
+					if (child instanceof Composite) {
+						removeChildren((Composite) child);
+					}
+					child.dispose();
+				}
+			}
+		}
+	}
+	
+	private class GlobalModifyListener implements ModifyListener {
+
+		public void modifyText(ModifyEvent e) {
+			password = password_text.getText();
+			nickname = nickname_text.getText();
+		}
+		
 		
 	}
 }