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 0d57e054a71..4f6345082e8 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 @@ -43,32 +43,12 @@ public class SftpFileSubSystemConfiguration extends FileServiceSubSystemConfigur return isFor; } - public boolean supportsArchiveManagement() { - return false; - } - public ISubSystem createSubSystemInternal(IHost host) { SshConnectorService connectorService = (SshConnectorService)getConnectorService(host); ISubSystem subsys = new FileServiceSubSystem(host, connectorService, getFileService(host), getHostFileAdapter(), getSearchService(host)); return subsys; } - public boolean supportsFileTypes() { - return false; - } - - public boolean supportsSearch() { - return false; - } - - public boolean supportsEnvironmentVariablesPropertyPage() { - return false; - } - - public boolean supportsFilters() { - return true; - } - public IConnectorService getConnectorService(IHost host) { return SshConnectorServiceManager.getInstance().getConnectorService(host, getServiceImplType()); } @@ -94,6 +74,10 @@ public class SftpFileSubSystemConfiguration extends FileServiceSubSystemConfigur return _hostFileAdapter; } + public Class getServiceImplType() { + return ISshService.class; + } + public IHostSearchResultConfiguration createSearchConfiguration(IHost host, IHostSearchResultSet resultSet, Object searchTarget, SystemSearchString searchString) { return null; } @@ -102,8 +86,33 @@ public class SftpFileSubSystemConfiguration extends FileServiceSubSystemConfigur return null; } - public Class getServiceImplType() { - return ISshService.class; + public boolean supportsArchiveManagement() { + return false; + } + + public boolean supportsFileTypes() { + return false; + } + + public boolean supportsSearch() { + return false; + } + + public boolean supportsEnvironmentVariablesPropertyPage() { + return false; + } + + public boolean supportsFilters() { + return true; + } + + /** + * Ssh allows authentification through public key, so the password + * can be empty. + * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#requiresPassword() + */ + public boolean requiresPassword() { + return false; } } 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 ac009632787..22b3db7cd2b 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 @@ -75,9 +75,19 @@ public class SshShellSubSystemConfiguration extends return ISshService.class; } - public IServiceCommandShell createRemoteCommandShell(IRemoteCmdSubSystem cmdSS, IHostShell hostShell) - { + public IServiceCommandShell createRemoteCommandShell(IRemoteCmdSubSystem cmdSS, IHostShell hostShell) { return new SshServiceCommandShell(cmdSS, hostShell); } + /** + * Ssh allows authentification through public key, so the password + * can be empty. + * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#requiresPassword() + */ + public boolean requiresPassword() { + return false; + } + + + }