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 f6a68e7cd30..1933b0a2156 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 @@ -384,32 +384,32 @@ public class DStoreConnectorService extends AbstractConnectorService implements return dstorePath.getAbsolutePath(); } - /** - * Specify if you support connecting to a running daemon - * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} - * or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} - */ - public void setDaemonLaunchEnabled(SubSystem subsystemImpl, boolean enable) { - enableServerLaunchType(subsystemImpl, ServerLaunchType.DAEMON_LITERAL, enable); - } +// /** +// * Specify if you support connecting to a running daemon +// * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} +// * or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} +// */ +// public void setDaemonLaunchEnabled(SubSystem subsystemImpl, boolean enable) { +// enableServerLaunchType(subsystemImpl, ServerLaunchType.DAEMON_LITERAL, enable); +// } - /** - * Return if you support connecting to a running daemon - * @deprecated Use instead {@link #isEnabledServerLaunchType(ISubSystem, ServerLaunchType)} - * or {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} - */ - public boolean getDaemonLaunchEnabled(SubSystem subsystemImpl) { - return isEnabledServerLaunchType(subsystemImpl, ServerLaunchType.DAEMON_LITERAL); - } +// /** +// * Return if you support connecting to a running daemon +// * @deprecated Use instead {@link #isEnabledServerLaunchType(ISubSystem, ServerLaunchType)} +// * or {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} +// */ +// public boolean getDaemonLaunchEnabled(SubSystem subsystemImpl) { +// return isEnabledServerLaunchType(subsystemImpl, ServerLaunchType.DAEMON_LITERAL); +// } - /** - * Specify if you support remotely launching a server script - * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} - * or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} - */ - public void setRexecLaunchEnabled(SubSystem subsystemImpl, boolean enable) { - enableServerLaunchType(subsystemImpl, ServerLaunchType.REXEC_LITERAL, enable); - } +// /** +// * Specify if you support remotely launching a server script +// * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} +// * or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} +// */ +// public void setRexecLaunchEnabled(SubSystem subsystemImpl, boolean enable) { +// enableServerLaunchType(subsystemImpl, ServerLaunchType.REXEC_LITERAL, enable); +// } /** * Return if you support remotely launching a server script @@ -420,14 +420,14 @@ public class DStoreConnectorService extends AbstractConnectorService implements return isEnabledServerLaunchType(subsystemImpl, ServerLaunchType.REXEC_LITERAL); } - /** - * Specify if you support connecting to a server already running - * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} - * or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} - */ - public void setNoLaunchEnabled(SubSystem subsystemImpl, boolean enable) { - enableServerLaunchType(subsystemImpl, ServerLaunchType.RUNNING_LITERAL, enable); - } +// /** +// * Specify if you support connecting to a server already running +// * @deprecated use {@link #enableServerLaunchType(ISubSystem, ServerLaunchType, boolean)} +// * or your subsystem factory should override {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)} +// */ +// public void setNoLaunchEnabled(SubSystem subsystemImpl, boolean enable) { +// enableServerLaunchType(subsystemImpl, ServerLaunchType.RUNNING_LITERAL, enable); +// } /** * Return if you support connecting to a server already running diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java index c4b60b81e1c..078b3b3f6fa 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java @@ -181,7 +181,7 @@ public interface IRemoteServerLauncher extends IServerLauncherProperties{ * * @see org.eclipse.rse.core.subsystems.ServerLaunchType */ - public void enableServerLaunchType(ServerLaunchType serverLaunchType, boolean enable); +// public void enableServerLaunchType(ServerLaunchType serverLaunchType, boolean enable); /** * This methods returns the enablement state per server launch type. diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java index 709b932f3d6..f7d94ea1f78 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java @@ -74,12 +74,12 @@ public interface ISubSystemConfigurationProxy * Return the subsystem factory singleton instance. Will instantiate if not already. */ public ISubSystemConfiguration getSubSystemConfiguration(); - /** - * Return an instance of the ISystem class identified by the "systemClass" attribute - * 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. - */ - public IConnectorService getSystemObject(); +// /** +// * Return an instance of the ISystem class identified by the "systemClass" attribute +// * 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. +// */ +// public IConnectorService getSystemObject(); /** * Test if the given system type matches one or more of the type names declared in the diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml index 06fb38abc51..ced9cbe67c1 100644 --- a/rse/plugins/org.eclipse.rse.ui/plugin.xml +++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml @@ -60,7 +60,7 @@ Contributors: - + diff --git a/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfigurations.exsd b/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfigurations.exsd index 69027f6a89e..bc61bb9271d 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfigurations.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfigurations.exsd @@ -180,16 +180,6 @@ category of "database". - - - - Optional. - - - - - - diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java index 4e90aff3222..27f04e11e4f 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java @@ -27,7 +27,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.SystemBasePlugin; -import org.eclipse.rse.core.subsystems.IConnectorService; +//import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; import org.eclipse.rse.core.subsystems.SubSystemConfiguration; @@ -41,7 +41,8 @@ import org.osgi.framework.Bundle; */ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy { - private String name,description,id,types,vendor, category, systemClassName; +// private String name,description,id,types,vendor, category, systemClassName; + private String name,description,id,types,vendor, category; private int priority; private String[] systemTypes; private List typesArray; @@ -65,7 +66,7 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy this.types = element.getAttribute("systemTypes"); this.vendor = element.getAttribute("vendor"); this.category = element.getAttribute("category"); - this.systemClassName = element.getAttribute("systemClass"); +// this.systemClassName = element.getAttribute("systemClass"); this.priority = Integer.MAX_VALUE; String priorityStr = element.getAttribute("priority"); @@ -292,30 +293,30 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy } return object; } - /** - * Return an instance of the ISystem class identified by the "systemClass" attribute - * 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. - */ - public IConnectorService getSystemObject() - { - if (systemClassName == null) - return null; - Object object = null; - try - { - object = (IConnectorService)element.createExecutableExtension("systemClass"); - } catch (Exception exc) - { - SystemBasePlugin.logError("Unable to instantiate ISystem class "+ systemClassName + " for extension point " + id,exc); - org.eclipse.swt.widgets.MessageBox mb = new org.eclipse.swt.widgets.MessageBox(SystemBasePlugin.getActiveWorkbenchShell()); - mb.setText("Unexpected Error"); - String errmsg = "Unable to instantiate ISystem class " + systemClassName + " for extension point " + id +": " + exc.getClass().getName()+" - " + exc.getMessage(); - mb.setMessage(errmsg); - mb.open(); - } - return (IConnectorService)object; - } +// /** +// * Return an instance of the ISystem class identified by the "systemClass" attribute +// * 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. +// */ +// public IConnectorService getSystemObject() +// { +// if (systemClassName == null) +// return null; +// Object object = null; +// try +// { +// object = (IConnectorService)element.createExecutableExtension("systemClass"); +// } catch (Exception exc) +// { +// SystemBasePlugin.logError("Unable to instantiate ISystem class "+ systemClassName + " for extension point " + id,exc); +// org.eclipse.swt.widgets.MessageBox mb = new org.eclipse.swt.widgets.MessageBox(SystemBasePlugin.getActiveWorkbenchShell()); +// mb.setText("Unexpected Error"); +// String errmsg = "Unable to instantiate ISystem class " + systemClassName + " for extension point " + id +": " + exc.getClass().getName()+" - " + exc.getMessage(); +// mb.setMessage(errmsg); +// mb.open(); +// } +// return (IConnectorService)object; +// } /** * Reset for a full refresh from disk, such as after a team synch. 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 45de1454d31..b1cfa64e69d 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 @@ -1022,26 +1022,26 @@ public abstract class AbstractConnectorService extends RSEModelObject implements // ------------------------- // PRIVATE HELPER METHODS... // ------------------------- - /** - * Call this method to identify specific server launch types that are not to be permitted. - *

- * You normally do not call this! Rather, your subsystem factory class will override - * {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}. - * 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 - * subsystemConfigurations extension point. - * - * @see org.eclipse.rse.core.subsystems.ServerLaunchType - */ - protected void enableServerLaunchType(ISubSystem subsystem, ServerLaunchType serverLaunchType, boolean enable) - { - IServerLauncherProperties sl =getRemoteServerLauncherProperties(); - if (sl instanceof RemoteServerLauncher) - { - RemoteServerLauncher isl = (RemoteServerLauncher)sl; - isl.enableServerLaunchType(serverLaunchType, enable); - } - } +// /** +// * Call this method to identify specific server launch types that are not to be permitted. +// *

+// * You normally do not call this! Rather, your subsystem factory class will override +// * {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}. +// * 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 +// * subsystemConfigurations extension point. +// * +// * @see org.eclipse.rse.core.subsystems.ServerLaunchType +// */ +// protected void enableServerLaunchType(ISubSystem subsystem, ServerLaunchType serverLaunchType, boolean enable) +// { +// IServerLauncherProperties sl =getRemoteServerLauncherProperties(); +// if (sl instanceof RemoteServerLauncher) +// { +// RemoteServerLauncher isl = (RemoteServerLauncher)sl; +// isl.enableServerLaunchType(serverLaunchType, enable); +// } +// } /** * This methods returns the enablement state per server launch type. * If {@link #enableServerLaunchType(ServerLaunchType,boolean)} has not been