From 896ef5f33a0d9ef84c5167672649d2e8ead9e84d Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 7 Jul 2006 08:57:37 +0000 Subject: [PATCH] Fix externalized strings warnings in tracer --- .../org/eclipse/rse/subsystems/files/ssh/Activator.java | 2 +- .../rse/subsystems/files/ssh/SftpFileAdapter.java | 5 ----- .../files/ssh/SftpFileSubSystemConfiguration.java | 9 +-------- .../org/eclipse/rse/subsystems/shells/ssh/Activator.java | 2 +- .../shells/ssh/SshShellSubSystemConfiguration.java | 3 +-- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/Activator.java index a448c31f364..aa6540fa777 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/Activator.java @@ -10,7 +10,7 @@ import org.osgi.framework.BundleContext; public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.rse.subsystems.files.ssh"; + public static final String PLUGIN_ID = "org.eclipse.rse.subsystems.files.ssh"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileAdapter.java b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileAdapter.java index 214fd9d9969..b5ca2ace230 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileAdapter.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileAdapter.java @@ -55,9 +55,4 @@ public class SftpFileAdapter implements IHostFileToRemoteFileAdapter { return file; } - public IRemoteFile convertToRemoteFile(FileServiceSubSystem ss, IRemoteFileContext context, IRemoteFile parent, Object object) { - // TODO Auto-generated method stub - return null; - } - } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileSubSystemConfiguration.java index be7e0669835..0d57e054a71 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/subsystems/files/ssh/SftpFileSubSystemConfiguration.java @@ -23,7 +23,6 @@ import org.eclipse.rse.services.search.IHostSearchResultConfiguration; import org.eclipse.rse.services.search.IHostSearchResultSet; import org.eclipse.rse.services.search.ISearchService; import org.eclipse.rse.services.ssh.ISshService; -import org.eclipse.rse.services.ssh.ISshSessionProvider; import org.eclipse.rse.services.ssh.files.SftpFileService; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem; import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystemConfiguration; @@ -80,13 +79,7 @@ public class SftpFileSubSystemConfiguration extends FileServiceSubSystemConfigur public IFileService createFileService(IHost host) { SshConnectorService connectorService = (SshConnectorService)getConnectorService(host); - //return connectorService.getFileService(); - //TODO We have to get the file service from the connector service in order to make - //sure the connector service can connect it when required. It might be better to - //create a new instance here, and have it connect lazily on demand instead. - //In fact, due to ssh timeouts, it might be necessary that we can re-connect - //on demand on any operation anyway. - return new SftpFileService((ISshSessionProvider)connectorService); + return new SftpFileService(connectorService); } public ISearchService createSearchService(IHost host) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/Activator.java index 69a4091d637..292c13b6a55 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/Activator.java @@ -10,7 +10,7 @@ import org.osgi.framework.BundleContext; public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.rse.subsystems.shells.ssh"; + public static final String PLUGIN_ID = "org.eclipse.rse.subsystems.shells.ssh"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java index 294339b41d7..b99a8838dad 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshShellSubSystemConfiguration.java @@ -24,7 +24,6 @@ import org.eclipse.rse.internal.model.Host; import org.eclipse.rse.model.IHost; import org.eclipse.rse.services.shells.IShellService; import org.eclipse.rse.services.ssh.ISshService; -import org.eclipse.rse.services.ssh.ISshSessionProvider; import org.eclipse.rse.services.ssh.shell.SshShellService; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystemConfiguration; @@ -63,7 +62,7 @@ public class SshShellSubSystemConfiguration extends public IShellService createShellService(IHost host) { SshConnectorService cserv = (SshConnectorService)getConnectorService(host); - return new SshShellService((ISshSessionProvider)cserv); + return new SshShellService(cserv); } public IConnectorService getConnectorService(IHost host) {