diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index 158025229dd..9f91bab8922 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -67,7 +67,7 @@ import org.eclipse.rse.ui.SystemPropertyResources; import org.eclipse.rse.ui.actions.DisplayHidableSystemMessageAction; import org.eclipse.rse.ui.actions.DisplaySystemMessageAction; import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.subsystems.AbstractConnectorService; +import org.eclipse.rse.ui.subsystems.StandardConnectorService; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.osgi.framework.Bundle; @@ -80,7 +80,7 @@ import org.osgi.framework.Version; * The universal subsystems are based on datastore technology so we use that * to do the connection. */ -public class DStoreConnectorService extends AbstractConnectorService implements IDataStoreProvider +public class DStoreConnectorService extends StandardConnectorService implements IDataStoreProvider { private ClientConnection clientConnection = null; private ConnectionStatusListener _connectionStatusListener = null; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java index fb14076ec20..d52de98a5d4 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java @@ -63,12 +63,12 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.messages.SystemMessageDialog; -import org.eclipse.rse.ui.subsystems.AbstractConnectorService; +import org.eclipse.rse.ui.subsystems.StandardConnectorService; /** * Create SSH connections. */ -public class SshConnectorService extends AbstractConnectorService implements ISshSessionProvider +public class SshConnectorService extends StandardConnectorService implements ISshSessionProvider { private static final int SSH_DEFAULT_PORT = 22; private static final int CONNECT_DEFAULT_TIMEOUT = 60; //seconds diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/SuperAbstractConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorService.java similarity index 98% rename from rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/SuperAbstractConnectorService.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorService.java index e5229d83fec..659b5e68502 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/SuperAbstractConnectorService.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorService.java @@ -54,7 +54,7 @@ import org.eclipse.rse.core.model.RSEModelObject; * * */ -public abstract class SuperAbstractConnectorService extends RSEModelObject implements IConnectorService { +public abstract class AbstractConnectorService extends RSEModelObject implements IConnectorService { private Vector commListeners = new Vector(5); private ISubSystem _primarySubSystem = null; @@ -74,7 +74,7 @@ public abstract class SuperAbstractConnectorService extends RSEModelObject imple */ protected Object connectResult; - public SuperAbstractConnectorService(String name, String description, IHost host, int port) { + public AbstractConnectorService(String name, String description, IHost host, int port) { _name = name; _description = description; _host = host; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java index 8965848c8a4..4095ffb021c 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java @@ -10,7 +10,7 @@ import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.core.model.SystemSignonInformation; -public abstract class AuthenticatingConnectorService extends SuperAbstractConnectorService { +public abstract class AuthenticatingConnectorService extends AbstractConnectorService { protected ICredentialsProvider credentialsProvider = null; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicConnectorService.java index 7bbd56b088a..af1441c5cf6 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicConnectorService.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicConnectorService.java @@ -47,7 +47,7 @@ import org.eclipse.rse.core.model.IHost; * * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager */ -public abstract class BasicConnectorService extends SuperAbstractConnectorService { +public abstract class BasicConnectorService extends AbstractConnectorService { public BasicConnectorService(String name, String description, IHost host, int port) { super(name, description, host, port); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java index c5d31ef8f7b..cff1b97da89 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/connectorservice/FTPConnectorService.java @@ -29,14 +29,14 @@ import org.eclipse.rse.core.model.SystemSignonInformation; import org.eclipse.rse.internal.services.files.ftp.FTPService; import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.subsystems.files.core.SystemFileResources; -import org.eclipse.rse.ui.subsystems.AbstractConnectorService; +import org.eclipse.rse.ui.subsystems.StandardConnectorService; import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsole; import org.eclipse.ui.console.MessageConsole; -public class FTPConnectorService extends AbstractConnectorService +public class FTPConnectorService extends StandardConnectorService { protected FTPService _ftpService; private IPropertySet _propertySet; diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java index 89f23a532a8..35bf93155b9 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java @@ -27,7 +27,7 @@ import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.SubSystemConfiguration; -import org.eclipse.rse.core.subsystems.SuperAbstractConnectorService; +import org.eclipse.rse.core.subsystems.AbstractConnectorService; import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter; import org.eclipse.swt.widgets.Shell; @@ -54,7 +54,7 @@ import org.eclipse.swt.widgets.Shell; * This class is typically used together with:

* @@ -63,7 +63,7 @@ import org.eclipse.swt.widgets.Shell; * this class, and ignore the hundreds in {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration} * * @see org.eclipse.rse.core.servicesubsystem.ServiceSubSystem - * @see SuperAbstractConnectorService + * @see AbstractConnectorService * @see AbstractConnectorServiceManager */ diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index 8921b19b464..7c2e904e6da 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -2531,7 +2531,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS /** * Return the {@link org.eclipse.rse.core.subsystems.IConnectorService IConnectorService} object that represents the live connection for this system. * This must return an object that implements {@link IConnectorService}. A good starting point for that - * is the base class {@link SuperAbstractConnectorService}. + * is the base class {@link AbstractConnectorService}. *

If you only have a single subsystem class, you may override this method to return the * IConnectorService object that manages the connect/disconnect actions. If, on the other hand, * you have multiple subsystem classes that desire to share a single IConnectorService connection, diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardConnectorService.java similarity index 94% rename from rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/AbstractConnectorService.java rename to rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardConnectorService.java index 9793c1978f8..3ed693bef84 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/AbstractConnectorService.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardConnectorService.java @@ -48,9 +48,9 @@ import org.eclipse.rse.core.subsystems.AuthenticatingConnectorService; * * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager */ -public abstract class AbstractConnectorService extends AuthenticatingConnectorService { +public abstract class StandardConnectorService extends AuthenticatingConnectorService { - public AbstractConnectorService(String name, String description, IHost host, int port) { + public StandardConnectorService(String name, String description, IHost host, int port) { super(name, description, host, port); setCredentialsProvider(new StandardCredentialsProvider(this)); } diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java index 2b054cd9186..8ea31a3587d 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java @@ -42,7 +42,7 @@ import org.eclipse.ui.PlatformUI; * It uses a {@link PasswordPersistenceManager} to store the passwords in the * keychain keyed by {@link IHost} and possibly by {@link ISubSystemConfiguration}. *

- * This is suitable for use by subclasses of {@link AbstractConnectorService} + * This is suitable for use by subclasses of {@link StandardConnectorService} * that wish to provide prompting and persistence for userids and passwords when * connecting. *