diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java index 01a871599f9..3636a93aaa2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java @@ -90,7 +90,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi private IRSEPersistenceManager _persistenceManager = null; - private ISubSystemConfigurationProxy[] subsystemFactories = null; + private ISubSystemConfigurationProxy[] subsystemConfigurations = null; private Vector viewSuppliers = new Vector(); @@ -1063,12 +1063,12 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi /** * Return an array of SubSystemConfigurationProxy objects. - * These represent all extensions to our subsystemconfiguration extension point. + * These represent all extensions to our subsystemConfiguration extension point. */ public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxies() { - if (subsystemFactories != null) // added by PSC - return subsystemFactories; + if (subsystemConfigurations != null) // added by PSC + return subsystemConfigurations; IConfigurationElement[] factoryPlugins = getSubSystemConfigurationPlugins(); if (factoryPlugins != null) @@ -1083,19 +1083,19 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi } if (v.size() != 0) { - subsystemFactories = new ISubSystemConfigurationProxy[v.size()]; + subsystemConfigurations = new ISubSystemConfigurationProxy[v.size()]; for (int idx=0; idx - * SAME AS: getSystemRegistry().getConnectionsBySubSystemConfiguration(factory) - * @param factory A subsystem factory object. + * SAME AS: getSystemRegistry().getConnectionsBySubSystemConfiguration(subsystemConfiguration) + * @param subsystemConfiguration A subsystem configuration object. * @see org.eclipse.rse.model.ISystemRegistry#getHostsBySubSystemConfiguration(ISubSystemConfiguration) * @see #getConnectionsBySubSystemConfiguration(String) */ - public static IHost[] getConnectionsBySubSystemConfiguration(ISubSystemConfiguration factory) + public static IHost[] getConnectionsBySubSystemConfiguration(ISubSystemConfiguration subsystemConfiguration) { - return getSystemRegistry().getHostsBySubSystemConfiguration(factory); + return getSystemRegistry().getHostsBySubSystemConfiguration(subsystemConfiguration); } /** - * STEP 2d. Get all connections for your subsystem factory, identified by factory Id. + * STEP 2d. Get all connections for your subsystem configuration, identified by subsystemConfigurationId. *

- * SAME AS: getSystemRegistry().getConnectionsBySubSystemConfiguration(getSubSystemConfiguration(factoryId)) - * @param factoryId The id of the subsystem factory as given in its plugin.xml id attribute for the subsystemconfiguration extension point + * SAME AS: getSystemRegistry().getConnectionsBySubSystemConfiguration(getSubSystemConfiguration(subsystemConfigurationId)) + * @param subsystemConfigurationId The id of the subsystem configuration as given in its plugin.xml id attribute for the subsystemConfiguration extension point * @see #getSubSystemConfiguration(String) * @see #getConnectionsBySubSystemConfiguration(ISubSystemConfiguration) */ - public static IHost[] getConnectionsBySubSystemConfiguration(String factoryId) + public static IHost[] getConnectionsBySubSystemConfiguration(String subsystemConfigurationId) { - return getSystemRegistry().getHostsBySubSystemConfiguration(getSubSystemConfiguration(factoryId)); + return getSystemRegistry().getHostsBySubSystemConfiguration(getSubSystemConfiguration(subsystemConfigurationId)); } /** - * STEP 3a. Get all subsystems for all connections for your subsystem factory, identified by factory Id. + * STEP 3a. Get all subsystems for all connections for your subsystem configuration, identified by subsystemConfigurationId. *

- * SAME AS: getSystemRegistry().getSubSystems(factoryId) - * @param factoryId The subsystem factory id as given in its plugin.xml id attribute for the subsystemconfiguration extension point + * SAME AS: getSystemRegistry().getSubSystems(subsystemConfigurationId) + * @param subsystemConfigurationId The subsystem configuration id as given in its plugin.xml id attribute for the subsystemConfiguration extension point * @see org.eclipse.rse.model.ISystemRegistry#getSubSystems(String) * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getId() */ - public static ISubSystem[] getSubSystems(String factoryId) + public static ISubSystem[] getSubSystems(String subsystemConfigurationId) { - return getSystemRegistry().getSubSystems(factoryId); + return getSystemRegistry().getSubSystems(subsystemConfigurationId); } /** - * STEP 3b. Get all subsystems for the given connection for your subsystem factory, identified by factory Id. + * STEP 3b. Get all subsystems for the given connection for your subsystem configuration, identified by subsystemConfigurationId. *

- * SAME AS: getSystemRegistry().getSubSystems(factoryId, connection) - * @param factoryId The subsystem factory id as given in its plugin.xml id attribute for the subsystemconfiguration extension point + * SAME AS: getSystemRegistry().getSubSystems(subsystemConfigurationId, connection) + * @param subsystemConfigurationId The subsystem configuration id as given in its plugin.xml id attribute for the subsystemConfiguration extension point * @param connection The connection object you wish to get the subsystems for. Typically there is only one subsystem per object. * @see org.eclipse.rse.model.ISystemRegistry#getSubSystems(String, IHost) * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getId() */ - public static ISubSystem[] getSubSystems(String factoryId, IHost connection) + public static ISubSystem[] getSubSystems(String subsystemConfigurationId, IHost connection) { - return getSystemRegistry().getSubSystems(factoryId, connection); + return getSystemRegistry().getSubSystems(subsystemConfigurationId, connection); } /** * STEP 3c. Same as {@link #getSubSystems(String,IHost)} by used when you know - * the subsystem factory only supports a single subsystem per connection. - * @param factoryId The subsystem factory id as given in its plugin.xml id attribute for the subsystemconfiguration extension point + * the subsystem configuration only supports a single subsystem per connection. + * @param subsystemConfigurationId The subsystem configuration id as given in its plugin.xml id attribute for the subsystemConfiguration extension point * @param connection The connection object you wish to get the subsystems for. Typically there is only one subsystem per object. * @see #getSubSystems(String, IHost) * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getId() */ - public static ISubSystem getSubSystem(String factoryId, IHost connection) + public static ISubSystem getSubSystem(String subsystemConfigurationId, IHost connection) { - ISubSystem[] subsystems = getSystemRegistry().getSubSystems(factoryId, connection); + ISubSystem[] subsystems = getSystemRegistry().getSubSystems(subsystemConfigurationId, connection); if ((subsystems == null) || (subsystems.length==0)) return null; else @@ -141,14 +141,14 @@ public class SystemStartHere // MISCELLANEOUS: // ---------------------------- /** - * Miscallenous Helper. Return the subsystem factory object for the given subsystem factory Id + * Miscallenous Helper. Return the subsystem configuration object for the given subsystemConfigurationId. *

- * SAME AS: getSystemRegistry().getSubSystemConfiguration(factoryId) - * @param factoryId The id of the subsystem factory as given in its plugin.xml id attribute for the subsystemconfiguration extension point + * SAME AS: getSystemRegistry().getSubSystemConfiguration(subsystemConfigurationId) + * @param subsystemConfigurationId The id of the subsystem configuration as given in its plugin.xml id attribute for the subsystemConfiguration extension point */ - public static ISubSystemConfiguration getSubSystemConfiguration(String factoryId) + public static ISubSystemConfiguration getSubSystemConfiguration(String subsystemConfigurationId) { - return getSystemRegistry().getSubSystemConfiguration(factoryId); + return getSystemRegistry().getSubSystemConfiguration(subsystemConfigurationId); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.properties b/rse/plugins/org.eclipse.rse.ui/plugin.properties index 87feeea44d3..9d75d71b646 100644 --- a/rse/plugins/org.eclipse.rse.ui/plugin.properties +++ b/rse/plugins/org.eclipse.rse.ui/plugin.properties @@ -22,7 +22,7 @@ extPoint.systemtype = Remote System Type extPoint.subsystemConfiguration = Remote Subsystem Configuration extPoint.popupMenus = Remote Object Popup Menu Actions extPoint.propertyPages = RRemote Object Property Pages -extPoint.remoteSystemsViewPreferencesAction = Remote Systems View Preferences Actions +extPoint.remoteSystemsViewPreferencesActions = Remote Systems View Preferences Actions extPoint.compile = Remote Compile Commands extPoint.archivehandlers = Remote Archive Handlers extPoint.mountPathMappers = Mount Path Mappers diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml index a679b9a490e..8fe57c344ed 100644 --- a/rse/plugins/org.eclipse.rse.ui/plugin.xml +++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml @@ -131,7 +131,7 @@ Contributors: - + @@ -210,7 +210,7 @@ Contributors: - + @@ -432,7 +432,7 @@ Contributors: - + diff --git a/rse/plugins/org.eclipse.rse.ui/schema/archivehandlers.exsd b/rse/plugins/org.eclipse.rse.ui/schema/archivehandlers.exsd index 854dc1fb49b..a876fdb3b5f 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/archivehandlers.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/archivehandlers.exsd @@ -11,6 +11,11 @@ + + + (no description available) + + @@ -40,6 +45,11 @@ + + + (no description available) + + @@ -58,10 +68,10 @@ - a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.ui.archiveutils.ISystemArchiveHandler</samp> interface. + a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.services.clientserver.archiveutils.ISystemArchiveHandler</samp> interface. - + @@ -95,9 +105,9 @@ <pre> <extension point="org.eclipse.rse.ui.archivehandlers"> <archivehandler - id="org.eclipse.rse.ui.archiveutils.ziphandler" + id="org.eclipse.rse.services.clientserver.archiveutils.systemziphandler" name="Zip File Handler" - class="org.eclipse.rse.ui.archiveutils.SystemZipHandler"> + class="org.eclipse.rse.services.clientserver.archiveutils.SystemZipHandler"> </archivehandler> </extension> </pre> @@ -110,7 +120,7 @@ - Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.ui.archiveutils.ISystemArchiveHandler</samp> interface. + Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.services.clientserver.archiveutils.ISystemArchiveHandler</samp> interface. @@ -119,7 +129,7 @@ - The Remote Systems Explorer in org.eclipse.rse.ui provides three default implementations of this extension point, for ZIP, JAR, and TAR Archives. + The Remote Systems Explorer in org.eclipse.rse.files.ui provides three default implementations of this extension point, for ZIP, JAR, and TAR Archives. diff --git a/rse/plugins/org.eclipse.rse.ui/schema/dynamicPopupMenuExtensions.exsd b/rse/plugins/org.eclipse.rse.ui/schema/dynamicPopupMenuExtensions.exsd index 07129a8f91f..b6e8554d40f 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/dynamicPopupMenuExtensions.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/dynamicPopupMenuExtensions.exsd @@ -11,6 +11,11 @@ + + + (no description available) + + @@ -40,28 +45,33 @@ + + + (no description available) + + - a unique name that will be used to identify the . + a unique name that will be used to identify this extension. - a translatable name that will be used to identify this Oopup Menu Extension in the UI. + a translatable name that will be used to identify this Popup Menu Extension in the UI. - a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.ui.ui.actions.ISystemViewAdapterMenuExtension</samp> interface. + a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.ui.actions.ISystemDynamicPopupMenuExtension</samp> interface. - + @@ -103,7 +113,7 @@ - Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.ui.ui.actions.ISystemViewAdapterMenuExtension</samp> interface. + Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.ui.actions.ISystemDynamicPopupMenuExtension</samp> interface. diff --git a/rse/plugins/org.eclipse.rse.ui/schema/keystoreProviders.exsd b/rse/plugins/org.eclipse.rse.ui/schema/keystoreProviders.exsd index 6093b2f67f2..bee80baeb7e 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/keystoreProviders.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/keystoreProviders.exsd @@ -11,6 +11,11 @@ + + + (no description available) + + @@ -40,6 +45,11 @@ + + + (no description available) + + @@ -58,10 +68,10 @@ - a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.ui.resources.ISystemMountPathMapper</samp> interface. + a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.core.comm.ISystemKeystoreProvider</samp> interface. - + @@ -103,7 +113,7 @@ - Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.ui.comm.ISystemKeystoreProvider</samp> interface. + Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.core.comm.ISystemKeystoreProvider</samp> interface. @@ -112,7 +122,8 @@ - The Remote Systems Explorer in org.eclipse.rse.ui provides a default implementation of this extension point. + The Remote Systems Explorer provides a default implementation of this extension point +in <samp>org.eclipse.rse.dstore.security.UniversalKeystoreProvider</samp>. diff --git a/rse/plugins/org.eclipse.rse.ui/schema/mountPathMappers.exsd b/rse/plugins/org.eclipse.rse.ui/schema/mountPathMappers.exsd index 3010b290126..597f8e1e060 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/mountPathMappers.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/mountPathMappers.exsd @@ -11,6 +11,11 @@ + + + (no description available) + + @@ -40,6 +45,11 @@ + + + (no description available) + + @@ -58,10 +68,10 @@ - a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.ui.resources.ISystemMountPathMapper</samp> interface. + a fully qualified name of the Java class that implements the <samp>org.eclipse.rse.files.ui.resources.ISystemMountPathMapper</samp> interface. - + @@ -88,9 +98,9 @@ <pre> <extension point="org.eclipse.rse.ui.mountPathMappers"> <mountPathMapper - id="org.eclipse.rse.ui.resources.defaultMountPathMapper" + id="org.eclipse.rse.files.ui.resources.defaultMountPathMapper" name="Default Mount Path Mapper" - class="org.eclipse.rse.ui.resources.DefaultMountPathMapper"> + class="org.eclipse.rse.files.ui.resources.DefaultMountPathMapper"> </mountPathMapper> </extension> </pre> @@ -103,7 +113,7 @@ - Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.ui.resources.ISystemMountPathMapper</samp> interface. + Plug-ins that want to extend this extension point must implement <samp>org.eclipse.rse.files.ui.resources.ISystemMountPathMapper</samp> interface. @@ -112,7 +122,7 @@ - The Remote Systems Explorer in org.eclipse.rse.ui provides a default implementation of this extension point. + The Remote Systems Explorer in org.eclipse.rse.files.ui provides a default implementation of this extension point. diff --git a/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegate.exsd b/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegate.exsd index d03fbfe6152..667c76387c3 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegate.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegate.exsd @@ -11,6 +11,11 @@ + + + (no description available) + + @@ -43,6 +48,11 @@ + + + (no description available) + + @@ -69,7 +79,7 @@ - + 1.0.0 @@ -78,7 +88,17 @@ - + The following is an example of this extension point's usage: + +<p> +<pre> + <extension point="org.eclipse.rse.ui.newConnectionWizardDelegate"> + <newConnectionWizardDelegate + class="com.abc.SerialConnectionWizardDelegate" + systemType="Embedded-Linux-Serial"/> + </extension> +</pre> +</p> @@ -96,7 +116,7 @@ - + By default there are not contributions to this. diff --git a/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd b/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd index f8ef4cdbd53..d2a85caa278 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd @@ -205,7 +205,7 @@ system resources, such as in the iSeries QSYS file system. - + One of the optional filters to scope the remote resources for diff --git a/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd b/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd index 7cb02824e26..bf67fe54be8 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd @@ -78,6 +78,11 @@ You can specify multiple values if you comma-separate them. + + + (no description available) + + @@ -145,20 +150,20 @@ Or better yet, extends one of the IBM-supplied base classes, described in the AP - + One of the optional filters to scope the remote resources for which the property page is to appear. Specify as many of these optional filters like this as needed to explicitly scope this property page element. <p> -This filter specifies a subsystem factory id, such that this -property page will only appear for remote resources returned from subsystems of the given subsystem factory. -This ID can be scalar, or it can be generic to match on multiple subsystem factory IDs. +This filter specifies a subsystem configuration id, such that this +property page will only appear for remote resources returned from subsystems of the given subsystem configuration. +This ID can be scalar, or it can be generic to match on multiple subsystem configuration IDs. - + One of the optional filters to scope the remote resources for @@ -167,16 +172,16 @@ Specify as many of these optional filters like this as needed to explicitly scop this property page element. <p> -This filter specifies a subsystem factory category, such that +This filter specifies a subsystem configuration category, such that this property page will only appear for remote resources returned from subsystems -owned by factories +owned by subsystem configurations declared defined with the specified category. <p> This category can be scalar, or it can be generic to match on -multiple subsystem factory categories. The -categories of the IBM-supplied subsystem factories that display +multiple subsystem configuration categories. The +categories of the Predefined subsystem configurations that display remote resources in the Remote Systems view are: </p> @@ -192,7 +197,7 @@ system resources, such as in the iSeries QSYS file system. - + One of the optional filters to scope the remote resources for @@ -228,7 +233,7 @@ defined within this page element. which the property page is to appear. Specify as many of these optional filters like this as needed to explicitly scope this property page element. <p> -This filter specifies a type category. Normally the subsystemfactoryid +This filter specifies a type category. Normally the subsystemconfigurationid is sufficient, but some subsystems display multiple types of resources, and these are categorized by a type name that can be used to scope property pages. Here are the type categories supported by IBM- @@ -360,7 +365,7 @@ to files, versus folders, and only for local files: name="Remote File Info" typecategoryfilter="files" typefilter="file" - subsystemfactoryid="local.files"> + subsystemconfigurationid="local.files"> </page> </extension> </pre> @@ -378,7 +383,7 @@ to local Java files: name="Remote Java File Info" typecategoryfilter="files" typefilter="file" - subsystemfactoryid="local.files" + subsystemconfigurationid="local.files" namefilter="*.java"> </page> </extension> @@ -402,11 +407,11 @@ multiple property pages within the same extension configuration. Typically, you will subclass one of the supplied base classes for this extension point: <ul> -<li><b>org.eclipse.rse.ui.ui.propertypages.SystemAbstractPropertyPageExtensionAction</b>, +<li><b>org.eclipse.rse.ui.propertypages.SystemAbstractPropertyPageExtensionAction</b>, in plugin org.eclipse.rse.ui. Base class offering generic support for any remote resource property page, for any system type. -<li><b>org.eclipse.rse.ui.ui.propertypages.SystemAbstractRemoteFilePropertyPageExtensionAction</b>, -in plugin org.eclipse.rse.ui. +<li><b>org.eclipse.rse.files.ui.propertypages.SystemAbstractRemoteFilePropertyPageExtensionAction</b>, +in plugin org.eclipse.rse.files.ui. Specialized base class offering specific support for any remote file or folder property page, for any system type. </ul> <br> diff --git a/rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesAction.exsd b/rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesAction.exsd index 2f17c11eedb..15944ea54ba 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesAction.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesAction.exsd @@ -3,7 +3,7 @@ - + This extension point is for contributing an action to the Remote Systems view pulldown menu, to the Preferences cascading menu. This action will launch the Preferences dialog, scoped to the particular page you specify. This will automatically show any child pages as well. This point is easy to extend, no coding required. Just name the preference page by its id from the preferencePages extension that defined the page. Also, if it is not a root page, then you must also name the root page (such as when using Windows-&gt;Preference) by its id from its preferencePages extension. @@ -13,6 +13,11 @@ This would be used by anyone who extends the Remote System Explorer, and offers + + + (no description available) + + @@ -42,6 +47,11 @@ This would be used by anyone who extends the Remote System Explorer, and offers + + + (no description available) + + @@ -102,7 +112,7 @@ Note this page will be shown as the root in the Preferences dialog, but it can b - RSE 1.0 + 1.0.0 @@ -164,7 +174,7 @@ Note this page will be shown as the root in the Preferences dialog, but it can b - This extension point is used by the <code>org.eclipse.rse.ui.actions.SystemCascadingPreferencesAction</code> class, which in turn creates a <code>org.eclipse.rse.ui.ui.actions.SystemShowPreferencesPageAction</code> object for each extension of this point. These are used to populate the Preferences cascading menu of the Remote Systems view pulldown, but could be used elsewhere too, if desired. + This extension point is used by the <code>org.eclipse.rse.ui.actions.SystemCascadingPreferencesAction</code> class, which in turn creates a <code>org.eclipse.rse.ui.actions.SystemShowPreferencesPageAction</code> object for each extension of this point. These are used to populate the Preferences cascading menu of the Remote Systems view pulldown, but could be used elsewhere too, if desired. diff --git a/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfiguration.exsd b/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfiguration.exsd index d8baa3a656b..0b1966ab52a 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfiguration.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfiguration.exsd @@ -194,9 +194,9 @@ Note that ServiceSubSystems that share the same service should always use the sa <p> <pre> <extension - point="org.eclipse.rse.ui.subsystemconfiguration"> + point="org.eclipse.rse.ui.subsystemConfiguration"> <configuration - systemtypes="Unix;Linux;Local" + systemTypes="Unix;Linux;Local" name="Databases" icon="icons/dbsubsys.gif" iconlive="icons/dbsubsyslive.gif" diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java index b8c7523ef89..8f21e9fdf3e 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java @@ -1011,7 +1011,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements * {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}. * However, this method is needed by ISVs that re-use IBM-supplied subsystem factories, * and merely supply their own ISystem object via the "systemClass" attribute of the - * subsystemconfiguration extension point. + * subsystemConfiguration extension point. * * @see org.eclipse.rse.core.subsystems.ServerLaunchType */ diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java index 8a05a80b28c..3a2ed44bfd2 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java @@ -175,7 +175,7 @@ public interface IRemoteServerLauncher extends IServerLauncherProperties{ * {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}. * However, this method is needed by ISVs that re-use IBM-supplied subsystem factories, * and merely supply their own ISystem object via the "systemClass" attribute of the - * subsystemconfiguration extension point. They don't call this method directly actually, but + * subsystemConfiguration extension point. They don't call this method directly actually, but * rather {@link AbstractConnectorService#enableServerLaunchType(SubSystem, ServerLaunchType, boolean)}, * which in turn calls this. * diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java index 4e38c0bc23b..f57e2f41e38 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java @@ -301,14 +301,14 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I public String getUserId(); /** - * @return The value of the FactoryId attribute - * Ties this subsystem to its owning subsystemconfiguration, via the - * id key string of the factory + * @return The value of the ConfigurationId attribute + * Ties this subsystem to its owning subsystem configuration, via the + * id key string of the configuration. */ public String getConfigurationId(); /** - * @param value The new value of the FactoryId attribute + * @param value The new value of the ConfigurationId attribute */ public void setConfigurationId(String value); 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 ea1c9f68574..03d0ebdc32b 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 @@ -146,7 +146,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS protected String _name = null; - protected String _factoryId = null; + protected String _subsystemConfigurationId = null; protected boolean _hidden = false; @@ -3172,23 +3172,23 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS * Private. Do not override. * @generated This field/method will be replaced during code generation * Ties this subsystem to its owning subsystemconfiguration, via the - * id key string of the factory + * id key string of the configuration. */ public String getConfigurationId() { - return _factoryId; + return _subsystemConfigurationId; } /** * Private. Do not override. * @generated This field/method will be replaced during code generation. */ - public void setConfigurationId(String newFactoryId) + public void setConfigurationId(String newConfigurationId) { - String oldFactoryId = _factoryId; - if (oldFactoryId == null || !oldFactoryId.equals(newFactoryId)) + String oldFactoryId = _subsystemConfigurationId; + if (oldFactoryId == null || !oldFactoryId.equals(newConfigurationId)) { - _factoryId = newFactoryId; + _subsystemConfigurationId = newConfigurationId; setDirty(true); } } diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtension.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtension.java index 9410473c241..03cebfb5f64 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtension.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtension.java @@ -42,8 +42,8 @@ import org.osgi.framework.Bundle; *

  • id. Unique identifier *
  • name. Displayable property page name *
  • class. The class which implements IWorkbenchPropertyPage - *
  • subsystemconfigurationid. For scoping to remote objects for a given subsystem factory - *
  • subsystemconfigurationCategory. For scoping to remote objects for a given subsystem factory category + *
  • subsystemconfigurationid. For scoping to remote objects for a given subsystem configuration + *
  • subsystemconfigurationCategory. For scoping to remote objects for a given subsystem configuration category *
  • systemTypes. For scoping to remote objects from systems of a given type, or semicolon-separated types. *
  • namefilter. For scoping to remote objects of a given name *
  • typecategoryfilter. For scoping to remote objects for a given remote object type category diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemRemoteObjectMatcher.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemRemoteObjectMatcher.java index e5df5f5b02d..14d4839464a 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemRemoteObjectMatcher.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemRemoteObjectMatcher.java @@ -27,8 +27,8 @@ import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; * This class encapsulates all the criteria required to identify a match on a remote * system object, and the methods to determine if a given input meets that criteria. *
      - *
    1. subsystemconfigurationid. For scoping to remote objects for a given subsystem factory - *
    2. subsystemconfigurationCategory. For scoping to remote objects for a given subsystem factory category. + *
    3. subsystemconfigurationid. For scoping to remote objects for a given subsystem configuration + *
    4. subsystemconfigurationCategory. For scoping to remote objects for a given subsystem configuration category. *
    5. systemTypes. For scoping to remote objects from systems of a given type, or semicolon-separated types. *
    6. category. For scoping to remote objects of a given type category *
    7. namefilter. For scoping to remote objects of a given name