mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-03 23:25:26 +02:00
[168977][api][refactor] - stage 3.6
- renamed AbstractConnectorService to StandardConnectorService - renamed SuperAbstractConnectorService to AbstractConnectorService This completes the refactoring. Javadoc must now be written.
This commit is contained in:
parent
2c58566c69
commit
6fcfbbd46e
10 changed files with 17 additions and 17 deletions
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -54,7 +54,7 @@ import org.eclipse.rse.core.model.RSEModelObject;
|
|||
* </ul>
|
||||
*
|
||||
*/
|
||||
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;
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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:</p>
|
||||
* <ul>
|
||||
* <li>{@link org.eclipse.rse.core.servicesubsystem.ServiceSubSystem} for the subsystem
|
||||
* <li>{@link SuperAbstractConnectorService} for the connector service
|
||||
* <li>{@link AbstractConnectorService} for the connector service
|
||||
* <li>{@link AbstractConnectorServiceManager} for the connector service manager
|
||||
* <li>{@link org.eclipse.rse.core.subsystems.AbstractResource} for the individual remote resources
|
||||
* </ul>
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
|
|
@ -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}.
|
||||
* <p>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,
|
||||
|
|
|
@ -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));
|
||||
}
|
|
@ -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}.
|
||||
* <p>
|
||||
* 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.
|
||||
* <p>
|
||||
|
|
Loading…
Add table
Reference in a new issue