Attachment 92895 Details for Bug 222866 – provider.xmpp.ui.patch

[patch] provider.xmpp.ui.patch

provider.xmpp.ui.patch (text/plain), 12.29 KB, created by Hiroyuki

on 2008-03-19 07:59:33 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Hiroyuki

Created: 2008-03-19 07:59:33 EDT

Size: 12.29 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ecf.provider.xmpp.ui
>Index: src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPConnectWizardPage.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPConnectWizardPage.java,v
>retrieving revision 1.8
>diff -u -r1.8 XMPPConnectWizardPage.java
>--- src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPConnectWizardPage.java	5 Mar 2008 18:38:14 -0000	1.8
>+++ src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPConnectWizardPage.java	19 Mar 2008 11:35:48 -0000
>@@ -49,6 +49,7 @@
> 		setTitle(Messages.XMPPConnectWizardPage_WIZARD_TITLE);
> 		setDescription(Messages.XMPPConnectWizardPage_WIZARD_DESCRIPTION);
> 		setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.IMG_CHAT_WIZARD));
>+		setPageComplete(false);
> 	}
> 
> 	XMPPConnectWizardPage(String usernameAtHost) {
>@@ -72,6 +73,9 @@
> 	}
> 
> 	public void createControl(Composite parent) {
>+		
>+		parent = new Composite(parent, SWT.NONE);
>+		
> 		parent.setLayout(new GridLayout());
> 		final GridData fillData = new GridData(SWT.FILL, SWT.CENTER, true, false);
> 		final GridData endData = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
>@@ -119,6 +123,7 @@
> 		} else if (isPageComplete())
> 			passwordText.setFocus();
> 
>+		org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
> 		setControl(parent);
> 	}
> 
>Index: src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPSConnectWizardPage.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPSConnectWizardPage.java,v
>retrieving revision 1.7
>diff -u -r1.7 XMPPSConnectWizardPage.java
>--- src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPSConnectWizardPage.java	5 Mar 2008 18:38:14 -0000	1.7
>+++ src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPSConnectWizardPage.java	19 Mar 2008 11:35:48 -0000
>@@ -55,6 +55,9 @@
> 	}
> 
> 	public void createControl(Composite parent) {
>+		
>+		parent = new Composite(parent, SWT.NONE);
>+		
> 		parent.setLayout(new GridLayout());
> 		final GridData fillData = new GridData(SWT.FILL, SWT.CENTER, true, false);
> 		final GridData endData = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
>@@ -104,6 +107,7 @@
> 		} else if (isPageComplete())
> 			passwordText.setFocus();
> 
>+		org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
> 		setControl(parent);
> 	}
> 
>Index: src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPSConnectWizard.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPSConnectWizard.java,v
>retrieving revision 1.1
>diff -u -r1.1 XMPPSConnectWizard.java
>--- src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPSConnectWizard.java	30 Apr 2007 03:50:09 -0000	1.1
>+++ src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPSConnectWizard.java	19 Mar 2008 11:35:48 -0000
>@@ -10,6 +10,13 @@
>  *****************************************************************************/
> package org.eclipse.ecf.internal.provider.xmpp.ui.wizards;
> 
>+import org.eclipse.ecf.core.ContainerCreateException;
>+import org.eclipse.ecf.core.ContainerFactory;
>+import org.eclipse.ecf.core.IContainer;
>+import org.eclipse.ecf.internal.provider.xmpp.ui.Messages;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.ui.IWorkbench;
>+
> 
> public final class XMPPSConnectWizard extends XMPPConnectWizard {
> 
>@@ -26,4 +33,20 @@
> 		addPage(page);
> 	}
> 
>+	public void init(IWorkbench workbench, IContainer container) {
>+		super.init(workbench, container);
>+
>+		setWindowTitle(Messages.XMPPSConnectWizard_WIZARD_TITLE);
>+	}
>+
>+	public void init(IWorkbench workbench, IStructuredSelection selection) {
>+		super.init(workbench, selection);
>+		try {
>+			this.container = ContainerFactory.getDefault().createContainer("ecf.xmpps.smack");
>+		} catch (ContainerCreateException e) {
>+			// None
>+		}
>+
>+		setWindowTitle(Messages.XMPPSConnectWizard_WIZARD_TITLE);
>+	}
> }
>Index: src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPConnectWizard.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPConnectWizard.java,v
>retrieving revision 1.6
>diff -u -r1.6 XMPPConnectWizard.java
>--- src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPConnectWizard.java	12 Dec 2007 22:11:50 -0000	1.6
>+++ src/org/eclipse/ecf/internal/provider/xmpp/ui/wizards/XMPPConnectWizard.java	19 Mar 2008 11:35:48 -0000
>@@ -14,6 +14,8 @@
> import java.io.FileOutputStream;
> import java.io.IOException;
> 
>+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;
>@@ -30,6 +32,7 @@
> import org.eclipse.ecf.filetransfer.events.IFileTransferEvent;
> import org.eclipse.ecf.filetransfer.events.IFileTransferRequestEvent;
> import org.eclipse.ecf.filetransfer.events.IIncomingFileTransferReceiveDoneEvent;
>+import org.eclipse.ecf.internal.provider.xmpp.ui.Activator;
> import org.eclipse.ecf.internal.provider.xmpp.ui.Messages;
> import org.eclipse.ecf.presence.IIMMessageEvent;
> import org.eclipse.ecf.presence.IIMMessageListener;
>@@ -47,24 +50,30 @@
> import org.eclipse.ecf.ui.dialogs.IDCreateErrorDialog;
> import org.eclipse.ecf.ui.util.PasswordCacheHelper;
> import org.eclipse.jface.dialogs.MessageDialog;
>+import org.eclipse.jface.resource.ImageDescriptor;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.jface.wizard.IWizardPage;
> import org.eclipse.jface.wizard.Wizard;
>+import org.eclipse.jface.wizard.WizardDialog;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.FileDialog;
> import org.eclipse.swt.widgets.Shell;
>+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 XMPPConnectWizard extends Wizard implements IConnectWizard {
>+public class XMPPConnectWizard extends Wizard implements IConnectWizard, INewWizard {
> 
> 	XMPPConnectWizardPage page;
> 
> 	private Shell shell;
> 
>-	private IContainer container;
>+	//private IContainer container;
>+	protected IContainer container;
> 
> 	private ID targetID;
> 
>@@ -167,6 +176,21 @@
> 		shell = workbench.getActiveWorkbenchWindow().getShell();
> 		this.container = container;
> 		this.workbench = workbench;
>+
>+		setWindowTitle(Messages.XMPPConnectWizard_WIZARD_TITLE);
>+	}
>+
>+	public void init(IWorkbench workbench, IStructuredSelection selection) {
>+		shell = workbench.getActiveWorkbenchWindow().getShell();
>+		this.workbench = workbench;
>+		this.container = null;
>+		try {
>+			this.container = ContainerFactory.getDefault().createContainer("ecf.xmpp.smack");
>+		} catch (ContainerCreateException e) {
>+			// None
>+		}
>+
>+		setWindowTitle(Messages.XMPPConnectWizard_WIZARD_TITLE);
> 	}
> 
> 	private IWorkbench workbench;
>Index: src/org/eclipse/ecf/internal/provider/xmpp/ui/Messages.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/Messages.java,v
>retrieving revision 1.6
>diff -u -r1.6 Messages.java
>--- src/org/eclipse/ecf/internal/provider/xmpp/ui/Messages.java	19 May 2007 00:51:59 -0000	1.6
>+++ src/org/eclipse/ecf/internal/provider/xmpp/ui/Messages.java	19 Mar 2008 11:35:47 -0000
>@@ -71,6 +71,9 @@
> 	public static String XMPPCompoundContributionItem_FILE_SEND_REFUSED_TITLE;
> 	public static String XMPPCompoundContributionItem_FILE_SEND_REFUSED_MESSAGE;
> 
>+	public static String XMPPConnectWizard_WIZARD_TITLE;
>+	public static String XMPPSConnectWizard_WIZARD_TITLE;
>+	
> 	private Messages() {
> 	}
> 
>Index: src/org/eclipse/ecf/internal/provider/xmpp/ui/messages.properties
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.xmpp.ui/src/org/eclipse/ecf/internal/provider/xmpp/ui/messages.properties,v
>retrieving revision 1.8
>diff -u -r1.8 messages.properties
>--- src/org/eclipse/ecf/internal/provider/xmpp/ui/messages.properties	19 May 2007 00:51:59 -0000	1.8
>+++ src/org/eclipse/ecf/internal/provider/xmpp/ui/messages.properties	19 Mar 2008 11:35:47 -0000
>@@ -37,3 +37,6 @@
> XMPPHyperlink_MESSAGING_ERROR_TITLE=Messaging Error
> XMPPHyperlink_MESSAGING_ERROR_MESSAGE=You don't want to talk to yourself, do you?
> XMPPHyperlink_CONNECT_ACCOUNT_DIALOG_TITLE=Connect To Account
>+
>+XMPPConnectWizard_WIZARD_TITLE=New XMPP Connection
>+XMPPSConnectWizard_WIZARD_TITLE=New XMPPS Connection
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.xmpp.ui/plugin.properties,v
>retrieving revision 1.4
>diff -u -r1.4 plugin.properties
>--- plugin.properties	6 Mar 2008 17:41:54 -0000	1.4
>+++ plugin.properties	19 Mar 2008 11:35:47 -0000
>@@ -11,3 +11,6 @@
> 
> TextEditorHyperlinkTarget= Textual Editors
> XMPPHyperlinkDetector= XMPP/XMPPS
>+
>+XMPPConnectWizardPage.description=Create a XMPP connection
>+XMPPSConnectWizardPage.description=Create a XMPPS connection
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.xmpp.ui/plugin.xml,v
>retrieving revision 1.6
>diff -u -r1.6 plugin.xml
>--- plugin.xml	4 May 2007 05:19:07 -0000	1.6
>+++ plugin.xml	19 Mar 2008 11:35:47 -0000
>@@ -14,6 +14,36 @@
>             id="org.eclipse.ecf.provider.ui.xmpp.xmppsConnect"
>             name="XMPPS"/>
>    </extension>
>+
>+   <extension
>+         point="org.eclipse.ui.newWizards">
>+      <wizard
>+            class="org.eclipse.ecf.internal.provider.xmpp.ui.wizards.XMPPConnectWizard"
>+            id="org.eclipse.ecf.provider.ui.xmpp.xmppConnect"
>+            name="XMPP"
>+            icon="icons/new_connection.gif"
>+            category="org.eclipse.ecf.ui.newWizards.category"
>+            finalPerspective="org.eclipse.ecf.ui.perspective.communications">
>+          <description>%XMPPConnectWizardPage.description</description>
>+      </wizard>
>+      <wizard
>+            class="org.eclipse.ecf.internal.provider.xmpp.ui.wizards.XMPPSConnectWizard"
>+            id="org.eclipse.ecf.provider.ui.xmpp.xmppsConnect"
>+            name="XMPPS"
>+            icon="icons/new_connection.gif"
>+            category="org.eclipse.ecf.ui.newWizards.category"
>+            finalPerspective="org.eclipse.ecf.ui.perspective.communications">
>+          <description>%XMPPSConnectWizardPage.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.xmpp.xmppConnect"/>
>+         <newWizardShortcut id="org.eclipse.ecf.provider.ui.xmpp.xmppsConnect"/>
>+      </perspectiveExtension>
>+   </extension>
>+
>       <extension
>          point="org.eclipse.ui.menus">
>       <menuContribution
>Index: build.properties
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.provider.xmpp.ui/build.properties,v
>retrieving revision 1.6
>diff -u -r1.6 build.properties
>--- build.properties	16 Oct 2007 06:30:57 -0000	1.6
>+++ build.properties	19 Mar 2008 11:35:47 -0000
>@@ -2,6 +2,7 @@
> output.. = bin/
> bin.includes = META-INF/,\
>                .,\
>+               icons/,\
>                plugin.xml,\
>                plugin.properties,\
>                about.html

Actions: View | Diff

Attachments on bug 222866: 92633 | 92634 | 92887 | 92888 | 92889 | 92890 | 92891 | 92892 | 92893 | 92894 | 92895 | 92896 | 93202