Attachment #92893 for bug #222866

Lines 13-18 Link Here

(-)build.properties (+1 lines)
13	output.. = bin/	13	output.. = bin/
14	bin.includes = META-INF/,\	14	bin.includes = META-INF/,\
15	.,\	15	.,\
		16	icons/,\
16	plugin.xml,\	17	plugin.xml,\
17	about.html,\	18	about.html,\
18	plugin.properties	19	plugin.properties




   </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.newWizards.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"

Lines 13-15 Link Here

(-)plugin.properties (+2 lines)
13	providerName = Eclipse.org	13	providerName = Eclipse.org
14		14
15	wizardLabel = MSN	15	wizardLabel = MSN
		16
		17	MSNConnectWizardPage.description=Create a MSN connection

Lines 10-15 Link Here

(-)src/org/eclipse/ecf/internal/provider/msn/ui/MSNConnectWizard.java (-1 / +20 lines)
10	*****************************************************************************/	10	*****************************************************************************/
11	package org.eclipse.ecf.internal.provider.msn.ui;	11	package org.eclipse.ecf.internal.provider.msn.ui;
12		12
		13	import org.eclipse.ecf.core.ContainerCreateException;
		14	import org.eclipse.ecf.core.ContainerFactory;
13	import org.eclipse.ecf.core.IContainer;	15	import org.eclipse.ecf.core.IContainer;
14	import org.eclipse.ecf.core.IContainerListener;	16	import org.eclipse.ecf.core.IContainerListener;
15	import org.eclipse.ecf.core.events.IContainerConnectedEvent;	17	import org.eclipse.ecf.core.events.IContainerConnectedEvent;
Lines 33-46 Link Here
33	import org.eclipse.ecf.ui.actions.AsynchContainerConnectAction;	35	import org.eclipse.ecf.ui.actions.AsynchContainerConnectAction;
34	import org.eclipse.ecf.ui.dialogs.IDCreateErrorDialog;	36	import org.eclipse.ecf.ui.dialogs.IDCreateErrorDialog;
35	import org.eclipse.ecf.ui.util.PasswordCacheHelper;	37	import org.eclipse.ecf.ui.util.PasswordCacheHelper;
		38	import org.eclipse.jface.resource.ImageDescriptor;
		39	import org.eclipse.jface.viewers.IStructuredSelection;
36	import org.eclipse.jface.wizard.Wizard;	40	import org.eclipse.jface.wizard.Wizard;
37	import org.eclipse.swt.widgets.Display;	41	import org.eclipse.swt.widgets.Display;
		42	import org.eclipse.ui.INewWizard;
38	import org.eclipse.ui.IWorkbench;	43	import org.eclipse.ui.IWorkbench;
39	import org.eclipse.ui.IWorkbenchPage;	44	import org.eclipse.ui.IWorkbenchPage;
40	import org.eclipse.ui.PartInitException;	45	import org.eclipse.ui.PartInitException;
41	import org.eclipse.ui.progress.IWorkbenchSiteProgressService;	46	import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
42		47
43	public class MSNConnectWizard extends Wizard implements IConnectWizard {	48	public class MSNConnectWizard extends Wizard implements IConnectWizard, INewWizard {
44		49
45	private IWorkbench workbench;	50	private IWorkbench workbench;
46		51
Lines 75-80 Link Here
75	public void init(IWorkbench workbench, IContainer container) {	80	public void init(IWorkbench workbench, IContainer container) {
76	this.workbench = workbench;	81	this.workbench = workbench;
77	this.container = container;	82	this.container = container;
		83
		84	setWindowTitle(Messages.MSNConnectWizard_Title);
		85	}
		86
		87	public void init(IWorkbench workbench, IStructuredSelection selection) {
		88	this.workbench = workbench;
		89	this.container = null;
		90	try {
		91	this.container = ContainerFactory.getDefault().createContainer("ecf.msn.msnp");
		92	} catch (ContainerCreateException e) {
		93	// None
		94	}
		95
		96	setWindowTitle(Messages.MSNConnectWizard_Title);
78	}	97	}
79		98
80	private void openView() {	99	private void openView() {

Lines 107-112 Link Here

(-)src/org/eclipse/ecf/internal/provider/msn/ui/MSNConnectWizardPage.java (+5 lines)
107	}	107	}
108		108
109	public void createControl(Composite parent) {	109	public void createControl(Composite parent) {
		110
		111	parent = new Composite(parent, SWT.NONE);
		112
110	parent.setLayout(new GridLayout(2, false));	113	parent.setLayout(new GridLayout(2, false));
111		114
112	GridData data = new GridData(SWT.FILL, SWT.CENTER, true, false);	115	GridData data = new GridData(SWT.FILL, SWT.CENTER, true, false);
Lines 130-135 Link Here
130	restorePassword(username);	133	restorePassword(username);
131	passwordText.setFocus();	134	passwordText.setFocus();
132	}	135	}
		136
		137	org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
133	setControl(parent);	138	setControl(parent);
134	}	139	}
135		140

Lines 17-20 Link Here

(-)src/org/eclipse/ecf/internal/provider/msn/ui/messages.properties (-1 / +3 lines)
17	MSNConnectWizardPage_EmailAddressInvalid = A valid e-mail address must be entered.	17	MSNConnectWizardPage_EmailAddressInvalid = A valid e-mail address must be entered.
18	MSNConnectWizardPage_PasswordRequired = A password must be entered.	18	MSNConnectWizardPage_PasswordRequired = A password must be entered.
19	MSNConnectWizardPage_EmailAddressLabel = E-mail:	19	MSNConnectWizardPage_EmailAddressLabel = E-mail:
20	MSNConnectWizardPage_PasswordLabel = Password:	20	MSNConnectWizardPage_PasswordLabel = Password:
		21
		22	MSNConnectWizard_Title=New MSN Connection

Lines 27-32 Link Here

(-)src/org/eclipse/ecf/internal/provider/msn/ui/Messages.java (+2 lines)
27		27
28	public static String MSNConnectWizardPage_WIZARD_PAGE_DESCRIPTION;	28	public static String MSNConnectWizardPage_WIZARD_PAGE_DESCRIPTION;
29		29
		30	public static String MSNConnectWizard_Title;
		31
30	static {	32	static {
31	NLS.initializeMessages(BUNDLE_NAME, Messages.class);	33	NLS.initializeMessages(BUNDLE_NAME, Messages.class);
32	}	34	}

Return to bug 222866

Lines 11-16 Link Here

(-)plugin.xml (+19 lines)
11	</extension>	11	</extension>
12		12
13	<extension	13	<extension
		14	point="org.eclipse.ui.newWizards">
		15	<wizard
		16	class="org.eclipse.ecf.internal.provider.msn.ui.MSNConnectWizard"
		17	id="org.eclipse.ecf.provider.ui.msn.connectWizard"
		18	name="%wizardLabel"
		19	icon="icons/new_connection.gif"
		20	category="org.eclipse.ecf.ui.newWizards.category"
		21	finalPerspective="org.eclipse.ecf.ui.perspective.communications">
		22	<description>%MSNConnectWizardPage.description</description>
		23	</wizard>
		24	</extension>
		25	<extension
		26	point="org.eclipse.ui.perspectiveExtensions">
		27	<perspectiveExtension targetID="org.eclipse.ecf.ui.perspective.communications">
		28	<newWizardShortcut id="org.eclipse.ecf.provider.ui.msn.connectWizard"/>
		29	</perspectiveExtension>
		30	</extension>
		31
		32	<extension
14	point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">	33	point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
15	<hyperlinkDetector	34	<hyperlinkDetector
16	activate="true"	35	activate="true"