mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-09 18:56:02 +02:00
bug 162177 - Rename additional occurrences of ISystem -> IConnectorService
This commit is contained in:
parent
4477ea60b3
commit
58fb2ec9ce
10 changed files with 26 additions and 23 deletions
|
@ -158,9 +158,9 @@ following summarizes the minimum set of classes you will be creating in order to
|
||||||
<OL>
|
<OL>
|
||||||
<li>Creating an interface for your subsystem. It can, and often is, an empty interface.</li>
|
<li>Creating an interface for your subsystem. It can, and often is, an empty interface.</li>
|
||||||
<li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorService.html">AbstractConnectorService</A>.
|
<li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorService.html">AbstractConnectorService</A>.
|
||||||
The code here will interact as necessary with your subsystem to manage the live connection to the remote system.</li>
|
The code here will interact as necessary with your subsystem to manage the connection lifecycle to the remote system.</li>
|
||||||
<li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">AbstractConnectorServiceManager</A>.
|
<li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">AbstractConnectorServiceManager</A>.
|
||||||
The code here will re-use the same system object from step 2 for all subsystems that implement the interface from step 1, within the same connection.</li>
|
The code here will re-use the same IConnectorService object from step 2 for all subsystems that implement the interface from step 1, within the same connection.</li>
|
||||||
<li>Designing the classes to represent the remote resources (your <i>model</i>) that you will show from your subsystem.
|
<li>Designing the classes to represent the remote resources (your <i>model</i>) that you will show from your subsystem.
|
||||||
Each must implement the <samp>org.eclipse.core.runtime.IAdaptable</samp> interface from Eclipse.
|
Each must implement the <samp>org.eclipse.core.runtime.IAdaptable</samp> interface from Eclipse.
|
||||||
It is also very helpful if they also maintain a reference to the subsystem which created them. The base class
|
It is also very helpful if they also maintain a reference to the subsystem which created them. The base class
|
||||||
|
|
|
@ -38,7 +38,7 @@ import org.eclipse.rse.core.model.IHost;
|
||||||
/**
|
/**
|
||||||
* This class manages our DeveloperConnectorService objects, so that if we
|
* This class manages our DeveloperConnectorService objects, so that if we
|
||||||
* ever have multiple subsystem configurations, different subsystems can share
|
* ever have multiple subsystem configurations, different subsystems can share
|
||||||
* the same system object if they share the communication layer.
|
* the same IConnectorService object if they share the communication layer.
|
||||||
*/
|
*/
|
||||||
public class DeveloperConnectorServiceManager extends
|
public class DeveloperConnectorServiceManager extends
|
||||||
AbstractConnectorServiceManager {
|
AbstractConnectorServiceManager {
|
||||||
|
|
|
@ -24,7 +24,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||||
/**
|
/**
|
||||||
* This class manages our DeveloperConnectorService objects, so that if we
|
* This class manages our DeveloperConnectorService objects, so that if we
|
||||||
* ever have multiple subsystem factories, different subsystems can share
|
* ever have multiple subsystem factories, different subsystems can share
|
||||||
* the same system object if they share the communication layer.
|
* the same IConnectorService object if they share the communication layer.
|
||||||
*/
|
*/
|
||||||
public class DeveloperConnectorServiceManager extends
|
public class DeveloperConnectorServiceManager extends
|
||||||
AbstractConnectorServiceManager {
|
AbstractConnectorServiceManager {
|
||||||
|
|
|
@ -75,7 +75,7 @@ public interface ISubSystemConfigurationProxy
|
||||||
*/
|
*/
|
||||||
public ISubSystemConfiguration getSubSystemConfiguration();
|
public ISubSystemConfiguration getSubSystemConfiguration();
|
||||||
// /**
|
// /**
|
||||||
// * Return an instance of the ISystem class identified by the "systemClass" attribute
|
// * Return an instance of the IConnectorService class identified by the "systemClass" attribute
|
||||||
// * of this subsystemFactory extension point. Note each call to this method returns a
|
// * of this subsystemFactory extension point. Note each call to this method returns a
|
||||||
// * new instance of the class, or null if no "systemClass" attribute was specified.
|
// * new instance of the class, or null if no "systemClass" attribute was specified.
|
||||||
// */
|
// */
|
||||||
|
|
|
@ -135,7 +135,8 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
|
||||||
_searchHistory = new ArrayList();
|
_searchHistory = new ArrayList();
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* @return true if this subsystem's properties should take precedence over other subsystems that share the same ISystem
|
* @return true if this subsystem's properties should take precedence
|
||||||
|
* over other subsystems that share the same {@link IConnectorService}
|
||||||
*/
|
*/
|
||||||
public boolean isPrimarySubSystem()
|
public boolean isPrimarySubSystem()
|
||||||
{
|
{
|
||||||
|
|
|
@ -54,13 +54,14 @@ Contributors:
|
||||||
<!-- description => translatable descriptin for subsystems of this configuration -->
|
<!-- description => translatable descriptin for subsystems of this configuration -->
|
||||||
<!-- id => unique id for this extension point. Will be used for a folder name -->
|
<!-- id => unique id for this extension point. Will be used for a folder name -->
|
||||||
<!-- vendor => name of company supplying this configuration -->
|
<!-- vendor => name of company supplying this configuration -->
|
||||||
<!-- systemClass => Optional. Only used when naming a predefined subsystem configuration -->
|
<!-- systemClass => OBSOLETE - Removed in OpenRSE. -->
|
||||||
|
<!-- Was only used when naming a predefined subsystem configuration -->
|
||||||
<!-- in the <samp>class</samp> attribute, when you want to subclass or replace the -->
|
<!-- in the <samp>class</samp> attribute, when you want to subclass or replace the -->
|
||||||
<!-- predefined ISystem object used to manage the live connection with the remote -->
|
<!-- predefined IConnectorService object used to manage the live connection with -->
|
||||||
<!-- system. Name a class that implements -->
|
<!-- the remote system. Name a class that implements -->
|
||||||
<!-- org.eclipse.rse.subsystems.ISystem or extends the appropriate -->
|
<!-- org.eclipse.rse.core.subsystems.IConnectorService or extends the appropriate -->
|
||||||
<!-- predefined class such as org.eclipse.rse.universal.UniversalSystem -->
|
<!-- predefined class such as org.eclipse.rse.universal.UniversalSystem -->
|
||||||
<!-- for unix, windows and system types. (systemClass removed in OpenRSE) -->
|
<!-- for unix, windows and system types. -->
|
||||||
<!-- ================================================================================== -->
|
<!-- ================================================================================== -->
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<!-- For systemTypes, if you specify * for all, you still have a chance at runtime to -->
|
<!-- For systemTypes, if you specify * for all, you still have a chance at runtime to -->
|
||||||
|
|
|
@ -294,7 +294,7 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy
|
||||||
return object;
|
return object;
|
||||||
}
|
}
|
||||||
// /**
|
// /**
|
||||||
// * Return an instance of the ISystem class identified by the "systemClass" attribute
|
// * Return an instance of the IConnectorService class identified by the "systemClass" attribute
|
||||||
// * of this subsystemFactory extension point. Note each call to this method returns a
|
// * of this subsystemFactory extension point. Note each call to this method returns a
|
||||||
// * new instance of the class, or null if no "systemClass" attribute was specified.
|
// * new instance of the class, or null if no "systemClass" attribute was specified.
|
||||||
// */
|
// */
|
||||||
|
@ -308,10 +308,10 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy
|
||||||
// object = (IConnectorService)element.createExecutableExtension("systemClass");
|
// object = (IConnectorService)element.createExecutableExtension("systemClass");
|
||||||
// } catch (Exception exc)
|
// } catch (Exception exc)
|
||||||
// {
|
// {
|
||||||
// SystemBasePlugin.logError("Unable to instantiate ISystem class "+ systemClassName + " for extension point " + id,exc);
|
// SystemBasePlugin.logError("Unable to instantiate IConnectorService class "+ systemClassName + " for extension point " + id,exc);
|
||||||
// org.eclipse.swt.widgets.MessageBox mb = new org.eclipse.swt.widgets.MessageBox(SystemBasePlugin.getActiveWorkbenchShell());
|
// org.eclipse.swt.widgets.MessageBox mb = new org.eclipse.swt.widgets.MessageBox(SystemBasePlugin.getActiveWorkbenchShell());
|
||||||
// mb.setText("Unexpected Error");
|
// mb.setText("Unexpected Error");
|
||||||
// String errmsg = "Unable to instantiate ISystem class " + systemClassName + " for extension point " + id +": " + exc.getClass().getName()+" - " + exc.getMessage();
|
// String errmsg = "Unable to instantiate IConnectorService class " + systemClassName + " for extension point " + id +": " + exc.getClass().getName()+" - " + exc.getMessage();
|
||||||
// mb.setMessage(errmsg);
|
// mb.setMessage(errmsg);
|
||||||
// mb.open();
|
// mb.open();
|
||||||
// }
|
// }
|
||||||
|
|
|
@ -1028,7 +1028,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
|
||||||
// * You normally do not call this! Rather, your subsystem factory class will override
|
// * You normally do not call this! Rather, your subsystem factory class will override
|
||||||
// * {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}.
|
// * {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}.
|
||||||
// * However, this method is needed by ISVs that re-use predefined subsystem factories,
|
// * However, this method is needed by ISVs that re-use predefined subsystem factories,
|
||||||
// * and merely supply their own ISystem object via the "systemClass" attribute of the
|
// * and merely supply their own IConnectorService object via the "systemClass" attribute of the
|
||||||
// * subsystemConfigurations extension point.
|
// * subsystemConfigurations extension point.
|
||||||
// *
|
// *
|
||||||
// * @see org.eclipse.rse.core.subsystems.ServerLaunchType
|
// * @see org.eclipse.rse.core.subsystems.ServerLaunchType
|
||||||
|
|
|
@ -2473,7 +2473,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This gets called after the corresponding ISystem connect method finishes.
|
* This gets called after the corresponding {@link IConnectorService} connect method finishes.
|
||||||
* This method should be overridden if any initialization for the subsystem needs
|
* This method should be overridden if any initialization for the subsystem needs
|
||||||
* to occur at this time
|
* to occur at this time
|
||||||
*/
|
*/
|
||||||
|
@ -2707,15 +2707,15 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
||||||
// ----------------------------------
|
// ----------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the {@link org.eclipse.rse.core.subsystems.IConnectorService ISystem} object that represents the live connection for this system.
|
* 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 ISystem. A good starting point for that
|
* This must return an object that implements {@link IConnectorService}. A good starting point for that
|
||||||
* is the base class {@link AbstractConnectorService}.
|
* is the base class {@link AbstractConnectorService}.
|
||||||
* <p>If you only have a single subsystem class, you may override this method to return the
|
* <p>If you only have a single subsystem class, you may override this method to return the
|
||||||
* ISystem object that manages the connect/disconnect actions. If, on the other hand,
|
* IConnectorService object that manages the connect/disconnect actions. If, on the other hand,
|
||||||
* you have multiple subsystem classes that desire to share a single ISystem connection,
|
* you have multiple subsystem classes that desire to share a single IConnectorService connection,
|
||||||
* (ie, share the same communications pipe) then do not override this. By default, this
|
* (ie, share the same communications pipe) then do not override this. By default, this
|
||||||
* calls getSystemManager() which returns an {@link AbstractConnectorServiceManager} object that manages maintaining a singleton
|
* calls getSystemManager() which returns an {@link AbstractConnectorServiceManager} object that manages maintaining a singleton
|
||||||
* ISystem object per system connection. You should subclass AbstractSystemManager,
|
* IConnectorService object per system connection. You should subclass AbstractSystemManager,
|
||||||
* and override getSystemManager() to return a singleton instance of that subclass.
|
* and override getSystemManager() to return a singleton instance of that subclass.
|
||||||
* <p>Default implementation:</p>
|
* <p>Default implementation:</p>
|
||||||
* <pre><code>
|
* <pre><code>
|
||||||
|
@ -3231,7 +3231,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return true if this subsystem's properties should take precedence over other subsystems that share the same ISystem
|
* @return true if this subsystem's properties should take precedence
|
||||||
|
* over other subsystems that share the same IConnectorService
|
||||||
*/
|
*/
|
||||||
public boolean isPrimarySubSystem()
|
public boolean isPrimarySubSystem()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1503,7 +1503,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
|
||||||
// fire model change event in case any BP code is listening...
|
// fire model change event in case any BP code is listening...
|
||||||
RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_SUBSYSTEM, subsystem, null);
|
RSEUIPlugin.getTheSystemRegistry().fireModelChangeEvent(ISystemModelChangeEvents.SYSTEM_RESOURCE_CHANGED, ISystemModelChangeEvents.SYSTEM_RESOURCETYPE_SUBSYSTEM, subsystem, null);
|
||||||
|
|
||||||
// if the updated subsystem is one of many that share a single ISystem, then
|
// if the updated subsystem is one of many that share a single IConnectorService, then
|
||||||
// update all of them too...
|
// update all of them too...
|
||||||
// DKM - now that ConnectorService is independent of subsystme, this should be unnecessary
|
// DKM - now that ConnectorService is independent of subsystme, this should be unnecessary
|
||||||
/* AbstractConnectorServiceManager systemManager = subsystem.getConnectorService();
|
/* AbstractConnectorServiceManager systemManager = subsystem.getConnectorService();
|
||||||
|
|
Loading…
Add table
Reference in a new issue