Attachment 151089 Details for Bug 293929 – Patch to enable non-RSE browsing of remote paths

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch to enable non-RSE browsing of remote paths

rdt_remote_path.patch (text/plain), 6.13 KB, created by Greg Watson

on 2009-11-02 11:36:12 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Watson

Created: 2009-11-02 11:36:12 EST

Size: 6.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ptp.rdt.ui
>Index: src/org/eclipse/ptp/internal/rdt/ui/scannerinfo/RemoteIncludeDialog.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/scannerinfo/RemoteIncludeDialog.java,v
>retrieving revision 1.2
>diff -u -r1.2 RemoteIncludeDialog.java
>--- src/org/eclipse/ptp/internal/rdt/ui/scannerinfo/RemoteIncludeDialog.java	18 Jun 2009 15:01:36 -0000	1.2
>+++ src/org/eclipse/ptp/internal/rdt/ui/scannerinfo/RemoteIncludeDialog.java	2 Nov 2009 16:32:30 -0000
>@@ -11,6 +11,11 @@
> package org.eclipse.ptp.internal.rdt.ui.scannerinfo;
> 
> 
>+import org.eclipse.ptp.remote.core.IRemoteConnection;
>+import org.eclipse.ptp.remote.core.IRemoteServices;
>+import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
>+import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;
>+import org.eclipse.rse.core.model.IHost;
> import org.eclipse.rse.files.ui.dialogs.SystemRemoteFolderDialog;
> import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
> import org.eclipse.swt.SWT;
>@@ -67,6 +72,14 @@
> 	
> 	private final boolean isEdit;
> 	
>+	// TODO: should remove IHost and only use IRemoteServices
>+	// and IRemoteConnection
>+	
>+	// fHost used for RSE connections
>+	private IHost fHost = null;
>+	// fRemoteServices and fRemoteConnection used for others
>+	private IRemoteServices fRemoteServices = null;
>+	private IRemoteConnection fRemoteConnection = null;
> 	
> 	public RemoteIncludeDialog(Shell parent, String title, boolean isEdit) {
> 		
>@@ -186,12 +199,28 @@
> 				shell.dispose();
> 			} 
> 			else if(pressed.equals(b_browse)) {
>-				SystemRemoteFolderDialog folderDialog = new SystemRemoteFolderDialog(shell, Messages.RemoteIncludeDialog_select); 
>-				folderDialog.open();
>-				Object remoteObject = folderDialog.getSelectedObject();
>-				if(remoteObject instanceof IRemoteFile) {
>-					IRemoteFile folder = (IRemoteFile)remoteObject;
>-					text.setText(folder.getCanonicalPath());
>+				if (fHost != null) {
>+					SystemRemoteFolderDialog folderDialog = new SystemRemoteFolderDialog(shell, Messages.RemoteIncludeDialog_select); 
>+					folderDialog.open();
>+					Object remoteObject = folderDialog.getSelectedObject();
>+					if(remoteObject instanceof IRemoteFile) {
>+						IRemoteFile folder = (IRemoteFile)remoteObject;
>+						text.setText(folder.getCanonicalPath());
>+					}
>+				} else {
>+					if (!fRemoteConnection.isOpen()) {
>+						PTPRemoteUIPlugin.getDefault().openConnectionWithProgress(shell, fRemoteConnection);
>+					}
>+					if (fRemoteConnection.isOpen()) {
>+						IRemoteUIFileManager fileMgr = getUIFileManager();
>+						if (fileMgr != null) {
>+							fileMgr.setConnection(fRemoteConnection);
>+							String path = fileMgr.browseDirectory(shell, Messages.RemoteIncludeDialog_select, "", 0); //$NON-NLS-1$
>+							if (path != null) {
>+								text.setText(path);
>+							}
>+						}
>+					}
> 				}
> 			}
> 		}
>@@ -212,4 +241,19 @@
> 		return isAllConfigurations;
> 	}
> 
>+	public void setHost(IHost host) {
>+		fHost = host;
>+	}
>+	
>+	public void setConnection(IRemoteServices services, IRemoteConnection connection) {
>+		fRemoteServices = services;
>+		fRemoteConnection = connection;
>+	}
>+	
>+	private IRemoteUIFileManager getUIFileManager() {
>+		if (fRemoteServices != null) {
>+			return PTPRemoteUIPlugin.getDefault().getRemoteUIServices(fRemoteServices).getUIFileManager();
>+		}
>+		return null;
>+	}
> }
>Index: src/org/eclipse/ptp/internal/rdt/ui/scannerinfo/RemoteIncludeTab.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/internal/rdt/ui/scannerinfo/RemoteIncludeTab.java,v
>retrieving revision 1.3
>diff -u -r1.3 RemoteIncludeTab.java
>--- src/org/eclipse/ptp/internal/rdt/ui/scannerinfo/RemoteIncludeTab.java	18 Jun 2009 15:01:36 -0000	1.3
>+++ src/org/eclipse/ptp/internal/rdt/ui/scannerinfo/RemoteIncludeTab.java	2 Nov 2009 16:32:30 -0000
>@@ -14,6 +14,14 @@
> import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
> import org.eclipse.cdt.ui.newui.IncludeTab;
> import org.eclipse.ptp.internal.rdt.ui.RDTHelpContextIds;
>+import org.eclipse.ptp.rdt.core.services.IRDTServiceConstants;
>+import org.eclipse.ptp.rdt.ui.serviceproviders.RemoteCIndexServiceProvider;
>+import org.eclipse.ptp.rdt.ui.serviceproviders.RemoteCIndexServiceProvider2;
>+import org.eclipse.ptp.services.core.IService;
>+import org.eclipse.ptp.services.core.IServiceConfiguration;
>+import org.eclipse.ptp.services.core.IServiceModelManager;
>+import org.eclipse.ptp.services.core.IServiceProvider;
>+import org.eclipse.ptp.services.core.ServiceModelManager;
> 
> 
> /**
>@@ -30,7 +38,7 @@
> 	public ICLanguageSettingEntry doAdd() {
> 		
> 		RemoteIncludeDialog dlg = new RemoteIncludeDialog(usercomp.getShell(), Messages.RemoteIncludeTab_title, false);
>-		
>+		setRemoteConnection(dlg);
> 		if(dlg.open() && dlg.getDirectory().trim().length() > 0 ) {
> 			toAllCfgs = dlg.isAllConfigurations();
> 			toAllLang = dlg.isAllLanguages();
>@@ -46,6 +54,7 @@
> 		
> 		RemoteIncludeDialog dlg = new RemoteIncludeDialog(usercomp.getShell(), Messages.RemoteIncludeTab_title, true);
> 		dlg.setPathText(ent.getValue());
>+		setRemoteConnection(dlg);
> 		
> 		if(dlg.open()) {
> 			int flags = 0;
>@@ -58,4 +67,24 @@
> 	public String getHelpContextId() {
> 		return RDTHelpContextIds.REMOTE_INCLUDE_TAB;
> 	}
>+	
>+	private void setRemoteConnection(RemoteIncludeDialog dlg) {
>+		IServiceModelManager manager = ServiceModelManager.getInstance();
>+		IServiceConfiguration config = manager.getActiveConfiguration(page.getProject());
>+		if (config != null) {
>+			IService service = manager.getService(IRDTServiceConstants.SERVICE_C_INDEX);
>+			if (service != null) {
>+				IServiceProvider provider = config.getServiceProvider(service);
>+				if (provider != null) {
>+					if (provider instanceof RemoteCIndexServiceProvider) {
>+						dlg.setHost(((RemoteCIndexServiceProvider)provider).getHost());
>+					} else if (provider instanceof RemoteCIndexServiceProvider2) {
>+						dlg.setConnection(
>+								((RemoteCIndexServiceProvider2)provider).getRemoteServices(),
>+								((RemoteCIndexServiceProvider2)provider).getRemoteConnection());
>+					}
>+				}
>+			}
>+		}
>+	}
> }

Actions: View | Diff

Attachments on bug 293929: 151073 | 151089