Enhancements/contributions from bug 222866. Also updated versions to 2.0.0 for core and filetransfer plugins

9 files changed, 84 insertions, 56 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.msn.ui/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.msn.ui/META-INF/MANIFEST.MF
index d12f491ff..c719a497d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn.ui/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.msn.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ecf.provider.msn.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.ecf.internal.provider.msn.ui.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn.ui/build.properties b/providers/bundles/org.eclipse.ecf.provider.msn.ui/build.properties
index c9b71220b..8f0d48b78 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn.ui/build.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.msn.ui/build.properties
@@ -13,6 +13,7 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               icons/,\
                plugin.xml,\
                about.html,\
                plugin.properties
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn.ui/icons/new_connection.gif b/providers/bundles/org.eclipse.ecf.provider.msn.ui/icons/new_connection.gif
new file mode 100644
index 000000000..4d4c6bb16
--- /dev/null
+++ b/providers/bundles/org.eclipse.ecf.provider.msn.ui/icons/new_connection.gif
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn.ui/plugin.properties b/providers/bundles/org.eclipse.ecf.provider.msn.ui/plugin.properties
index 3f22bbae0..313ccc9de 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn.ui/plugin.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.msn.ui/plugin.properties
@@ -13,3 +13,5 @@ pluginName = ECF MSN Provider UI
 providerName = Eclipse.org
 
 wizardLabel = MSN
+
+MSNConnectWizardPage.description=Create a MSN connection
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn.ui/plugin.xml b/providers/bundles/org.eclipse.ecf.provider.msn.ui/plugin.xml
index 68245df1b..35a709296 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn.ui/plugin.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.msn.ui/plugin.xml
@@ -11,6 +11,25 @@
    </extension>
 
    <extension
+         point="org.eclipse.ui.newWizards">
+      <wizard
+            class="org.eclipse.ecf.internal.provider.msn.ui.MSNConnectWizard"
+            id="org.eclipse.ecf.provider.ui.msn.connectWizard"
+            name="%wizardLabel"
+            icon="icons/new_connection.gif"
+            category="org.eclipse.ecf.ui.newConnection.category"
+            finalPerspective="org.eclipse.ecf.ui.perspective.communications">
+          <description>%MSNConnectWizardPage.description</description>
+      </wizard>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension targetID="org.eclipse.ecf.ui.perspective.communications">
+         <newWizardShortcut id="org.eclipse.ecf.provider.ui.msn.connectWizard"/>
+      </perspectiveExtension>
+   </extension>
+
+   <extension
          point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
       <hyperlinkDetector
             activate="true"
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/MSNConnectWizard.java b/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/MSNConnectWizard.java
index b110a59c9..600c78541 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/MSNConnectWizard.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/MSNConnectWizard.java
@@ -10,6 +10,8 @@
  *****************************************************************************/
 package org.eclipse.ecf.internal.provider.msn.ui;
 
+import org.eclipse.ecf.core.ContainerCreateException;
+import org.eclipse.ecf.core.ContainerFactory;
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.IContainerListener;
 import org.eclipse.ecf.core.events.IContainerConnectedEvent;
@@ -33,14 +35,16 @@ import org.eclipse.ecf.ui.IConnectWizard;
 import org.eclipse.ecf.ui.actions.AsynchContainerConnectAction;
 import org.eclipse.ecf.ui.dialogs.IDCreateErrorDialog;
 import org.eclipse.ecf.ui.util.PasswordCacheHelper;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
 
-public class MSNConnectWizard extends Wizard implements IConnectWizard {
+public class MSNConnectWizard extends Wizard implements IConnectWizard, INewWizard {
 
 	private IWorkbench workbench;
 
@@ -57,16 +61,16 @@ public class MSNConnectWizard extends Wizard implements IConnectWizard {
 	private IConnectContext connectContext;
 
 	private String username;
-	
+
 	public MSNConnectWizard() {
 		super();
 	}
-	
+
 	public MSNConnectWizard(String username) {
 		this();
 		this.username = username;
 	}
-	
+
 	public void addPages() {
 		page = new MSNConnectWizardPage(username);
 		addPage(page);
@@ -75,28 +79,35 @@ public class MSNConnectWizard extends Wizard implements IConnectWizard {
 	public void init(IWorkbench workbench, IContainer container) {
 		this.workbench = workbench;
 		this.container = container;
+
+		setWindowTitle(Messages.MSNConnectWizard_Title);
+	}
+
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.container = null;
+		try {
+			this.container = ContainerFactory.getDefault().createContainer("ecf.msn.msnp");
+		} catch (final ContainerCreateException e) {
+			// None
+		}
+
+		setWindowTitle(Messages.MSNConnectWizard_Title);
 	}
 
 	private void openView() {
 		try {
-			MultiRosterView view = (MultiRosterView) workbench
-					.getActiveWorkbenchWindow().getActivePage().findView(
-							MultiRosterView.VIEW_ID);
+			MultiRosterView view = (MultiRosterView) workbench.getActiveWorkbenchWindow().getActivePage().findView(MultiRosterView.VIEW_ID);
 			if (view == null) {
-				view = (MultiRosterView) workbench.getActiveWorkbenchWindow()
-						.getActivePage().showView(MultiRosterView.VIEW_ID,
-								null, IWorkbenchPage.VIEW_CREATE);
+				view = (MultiRosterView) workbench.getActiveWorkbenchWindow().getActivePage().showView(MultiRosterView.VIEW_ID, null, IWorkbenchPage.VIEW_CREATE);
 			}
 			view.addContainer(container);
-			IWorkbenchPage page = workbench.getActiveWorkbenchWindow()
-					.getActivePage();
+			final IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
 			if (!page.isPartVisible(view)) {
-				IWorkbenchSiteProgressService service = (IWorkbenchSiteProgressService) view
-						.getSite().getAdapter(
-								IWorkbenchSiteProgressService.class);
+				final IWorkbenchSiteProgressService service = (IWorkbenchSiteProgressService) view.getSite().getAdapter(IWorkbenchSiteProgressService.class);
 				service.warnOfContentChange();
 			}
-		} catch (PartInitException e) {
+		} catch (final PartInitException e) {
 			e.printStackTrace();
 		}
 	}
@@ -105,33 +116,23 @@ public class MSNConnectWizard extends Wizard implements IConnectWizard {
 		final IChatMessage message = e.getChatMessage();
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
-				MessagesView view = (MessagesView) workbench
-						.getActiveWorkbenchWindow().getActivePage().findView(
-								MessagesView.VIEW_ID);
+				MessagesView view = (MessagesView) workbench.getActiveWorkbenchWindow().getActivePage().findView(MessagesView.VIEW_ID);
 				if (view != null) {
-					IWorkbenchSiteProgressService service = (IWorkbenchSiteProgressService) view
-							.getSite().getAdapter(
-									IWorkbenchSiteProgressService.class);
+					final IWorkbenchSiteProgressService service = (IWorkbenchSiteProgressService) view.getSite().getAdapter(IWorkbenchSiteProgressService.class);
 					view.openTab(icms, itms, targetID, message.getFromID());
 					view.showMessage(message);
 					service.warnOfContentChange();
 				} else {
 					try {
-						IWorkbenchPage page = workbench
-								.getActiveWorkbenchWindow().getActivePage();
-						view = (MessagesView) page.showView(
-								MessagesView.VIEW_ID, null,
-								IWorkbenchPage.VIEW_CREATE);
+						final IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
+						view = (MessagesView) page.showView(MessagesView.VIEW_ID, null, IWorkbenchPage.VIEW_CREATE);
 						if (!page.isPartVisible(view)) {
-							IWorkbenchSiteProgressService service = (IWorkbenchSiteProgressService) view
-									.getSite()
-									.getAdapter(
-											IWorkbenchSiteProgressService.class);
+							final IWorkbenchSiteProgressService service = (IWorkbenchSiteProgressService) view.getSite().getAdapter(IWorkbenchSiteProgressService.class);
 							service.warnOfContentChange();
 						}
 						view.openTab(icms, itms, targetID, message.getFromID());
 						view.showMessage(message);
-					} catch (PartInitException e) {
+					} catch (final PartInitException e) {
 						e.printStackTrace();
 					}
 				}
@@ -142,9 +143,7 @@ public class MSNConnectWizard extends Wizard implements IConnectWizard {
 	private void displayTypingNotification(final ITypingMessageEvent e) {
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
-				MessagesView view = (MessagesView) workbench
-						.getActiveWorkbenchWindow().getActivePage().findView(
-								MessagesView.VIEW_ID);
+				final MessagesView view = (MessagesView) workbench.getActiveWorkbenchWindow().getActivePage().findView(MessagesView.VIEW_ID);
 				if (view != null) {
 					view.displayTypingNotification(e);
 				}
@@ -153,28 +152,25 @@ public class MSNConnectWizard extends Wizard implements IConnectWizard {
 	}
 
 	public boolean performFinish() {
-		
+
 		final String connectID = page.getEmail();
 		final String password = page.getPassword();
-		
+
 		// Save combo text even if we don't successfully login
 		page.saveComboText();
-		
-		connectContext = ConnectContextFactory
-				.createPasswordConnectContext(password);
+
+		connectContext = ConnectContextFactory.createPasswordConnectContext(password);
 
 		try {
-			targetID = container.getConnectNamespace().createInstance(
-					new Object[] { connectID });
-		} catch (IDCreateException e) {
-			new IDCreateErrorDialog(null,connectID,e).open();
+			targetID = container.getConnectNamespace().createInstance(new Object[] {connectID});
+		} catch (final IDCreateException e) {
+			new IDCreateErrorDialog(null, connectID, e).open();
 			return false;
 		}
-		
+
 		page.saveComboItems();
-		
-		final IPresenceContainerAdapter adapter = (IPresenceContainerAdapter) container
-				.getAdapter(IPresenceContainerAdapter.class);
+
+		final IPresenceContainerAdapter adapter = (IPresenceContainerAdapter) container.getAdapter(IPresenceContainerAdapter.class);
 		container.addListener(new IContainerListener() {
 			public void handleEvent(IContainerEvent event) {
 				if (event instanceof IContainerConnectedEvent) {
@@ -187,7 +183,7 @@ public class MSNConnectWizard extends Wizard implements IConnectWizard {
 			}
 		});
 
-		IChatManager icm = adapter.getChatManager();
+		final IChatManager icm = adapter.getChatManager();
 		icms = icm.getChatMessageSender();
 		itms = icm.getTypingMessageSender();
 
@@ -203,17 +199,18 @@ public class MSNConnectWizard extends Wizard implements IConnectWizard {
 
 		new AsynchContainerConnectAction(container, targetID, connectContext, null, new Runnable() {
 			public void run() {
-				cachePassword(connectID,password);
-			}}).run();
+				cachePassword(connectID, password);
+			}
+		}).run();
 
 		return true;
 	}
-	
+
 	private void cachePassword(final String connectID, String password) {
 		if (password != null && !password.equals("")) {
-			PasswordCacheHelper pwStorage = new PasswordCacheHelper(connectID);
+			final PasswordCacheHelper pwStorage = new PasswordCacheHelper(connectID);
 			pwStorage.savePassword(password);
 		}
 	}
-	
+
 }
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/MSNConnectWizardPage.java b/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/MSNConnectWizardPage.java
index 2f2cbf849..6c5614be1 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/MSNConnectWizardPage.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/MSNConnectWizardPage.java
@@ -107,6 +107,9 @@ final class MSNConnectWizardPage extends WizardPage {
 	}
 
 	public void createControl(Composite parent) {
+		
+		parent = new Composite(parent, SWT.NONE);
+		
 		parent.setLayout(new GridLayout(2, false));
 
 		GridData data = new GridData(SWT.FILL, SWT.CENTER, true, false);
@@ -130,6 +133,8 @@ final class MSNConnectWizardPage extends WizardPage {
 			restorePassword(username);
 			passwordText.setFocus();
 		}
+
+		org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
 		setControl(parent);
 	}
 
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/Messages.java b/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/Messages.java
index f6abd3f6e..917004f12 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/Messages.java
+++ b/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/Messages.java
@@ -27,6 +27,8 @@ public class Messages extends NLS {
 
 	public static String MSNConnectWizardPage_WIZARD_PAGE_DESCRIPTION;
 
+	public static String MSNConnectWizard_Title;
+
 	static {
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
 	}
diff --git a/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/messages.properties b/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/messages.properties
index e72c72db5..c4e616bf4 100644
--- a/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/messages.properties
+++ b/providers/bundles/org.eclipse.ecf.provider.msn.ui/src/org/eclipse/ecf/internal/provider/msn/ui/messages.properties
@@ -17,4 +17,6 @@ MSNConnectWizardPage_WIZARD_PAGE_DESCRIPTION=Specify a user account to connect t
 MSNConnectWizardPage_EmailAddressInvalid = A valid e-mail address must be entered.
 MSNConnectWizardPage_PasswordRequired = A password must be entered.
 MSNConnectWizardPage_EmailAddressLabel = E-mail:
-MSNConnectWizardPage_PasswordLabel = Password:
\ No newline at end of file
+MSNConnectWizardPage_PasswordLabel = Password:
+
+MSNConnectWizard_Title=New MSN Connection