diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html b/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html index 11637c7d591..a68e8c102b6 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html +++ b/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html @@ -52,11 +52,11 @@ Here are the extension points that are defined by the RSE: Description - org.eclipse.rse.core.systemType + org.eclipse.rse.core.systemTypes For defining new system types that show up in the New Connection wizard. - org.eclipse.rse.core.subsystemConfiguration + org.eclipse.rse.ui.subsystemConfiguration For defining new subsystems that appear when a connection is expanded. diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/subsystem.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/subsystem.html index f969c94af54..0929ac00364 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/subsystem.html +++ b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/subsystem.html @@ -89,7 +89,7 @@ add the line highlighted here. </configuration> </extension> -Note: You would normal use the icon and iconLive attributes to specify +Note: You would normal use the icon and iconlive attributes to specify a unique icon for your subsystem, but to keep it simple here, just use the default icon. diff --git a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml index bd7be527d88..88f088a2900 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml +++ b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml @@ -15,10 +15,9 @@ Martin Oberhuber (Wind River) - initial API and implementation - - - + description="%FTPDaytimeSystemDescription" + icon="icons/full/obj16/daytime_obj.gif" + iconLive="icons/full/obj16/daytimelive_obj.gif"/> - - - + description="Place holder for host information used by the Remote C++ Application launch configuration." + icon="icons/full/obj16/systemlocal_obj.gif" + iconLive="icons/full/obj16/systemlocallive_obj.gif"/> diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/Activator.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/Activator.java index 3c14ea97c0a..6d961436769 100644 --- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/Activator.java +++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/Activator.java @@ -29,15 +29,17 @@ public class Activator extends Plugin { plugin = this; } - /** - * This method is called upon plug-in activation + /* + * (non-Javadoc) + * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext) */ public void start(BundleContext context) throws Exception { super.start(context); } - /** - * This method is called when the plug-in is stopped + /* + * (non-Javadoc) + * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) */ public void stop(BundleContext context) throws Exception { super.stop(context); diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/IRemoteConnectionConfigurationConstants.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/IRemoteConnectionConfigurationConstants.java index a61d9232dac..da008cfcc22 100644 --- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/IRemoteConnectionConfigurationConstants.java +++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/IRemoteConnectionConfigurationConstants.java @@ -19,12 +19,12 @@ public interface IRemoteConnectionConfigurationConstants extends IMILaunchConfigurationConstants { public static final String ATTR_REMOTE_CONNECTION = - DebugPlugin.getUniqueIdentifier() + ".REMOTE_TCP"; + DebugPlugin.getUniqueIdentifier() + ".REMOTE_TCP"; //$NON-NLS-1$ /* * ATTR_TCP_PORT: gdbserver port. */ - public static final String ATTR_TCP_PORT = "2345"; + public static final String ATTR_TCP_PORT = "2345"; //$NON-NLS-1$ /* * Generic Remote Path and Download options @@ -32,8 +32,8 @@ public interface IRemoteConnectionConfigurationConstants extends * ATTR_SKIP_DOWNLOAD_TO_TARGET: true if download to remote is not desired. */ public static final String ATTR_REMOTE_PATH = - DebugPlugin.getUniqueIdentifier() + ".ATTR_TARGET_PATH"; + DebugPlugin.getUniqueIdentifier() + ".ATTR_TARGET_PATH"; //$NON-NLS-1$ public static final String ATTR_SKIP_DOWNLOAD_TO_TARGET = - DebugPlugin.getUniqueIdentifier() + ".ATTR_SKIP_DOWNLOAD_TO_TARGET"; + DebugPlugin.getUniqueIdentifier() + ".ATTR_SKIP_DOWNLOAD_TO_TARGET"; //$NON-NLS-1$ } diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java index 2dbae1419da..aef78814dc2 100644 --- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java +++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteCMainTab.java @@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Text; public class RemoteCMainTab extends CMainTab { - private static final String[] SYSTEM_TYPE = {"Ssh/Gdbserver"}; + private static final String[] SYSTEM_TYPE = {"Ssh/Gdbserver"}; //$NON-NLS-1$ /* Labels and Error Messages */ private static final String REMOTE_PROG_LABEL_TEXT = "Remote Path for C/C++ Application:"; private static final String SKIP_DOWNLOAD_BUTTON_TEXT = "Skip download to target path."; @@ -111,8 +111,8 @@ public class RemoteCMainTab extends CMainTab { if(retVal == true) { setErrorMessage(null); int currentSelection = connectionCombo.getSelectionIndex(); - String connection_name = currentSelection >= 0 ? connectionCombo.getItem(currentSelection) : ""; - if(connection_name.equals("")) { + String connection_name = currentSelection >= 0 ? connectionCombo.getItem(currentSelection) : ""; //$NON-NLS-1$ + if(connection_name.equals("")) { //$NON-NLS-1$ setErrorMessage(CONNECTION_TEXT_ERROR); retVal = false; } @@ -242,7 +242,7 @@ public class RemoteCMainTab extends CMainTab { String remoteConnection = null; try { remoteConnection = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_CONNECTION, - ""); + ""); //$NON-NLS-1$ } catch (CoreException ce) { /* default to doing nothing */ } diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java index 32b76b252fa..05f3d730817 100644 --- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java +++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java @@ -45,11 +45,11 @@ import org.eclipse.rse.ui.RSEUIPlugin; public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { - private final static String REMOTE_GDBSERVER_COMMAND = "gdbserver"; - private final static String SFTP_COMMAND = "sftp"; - private final static String SFTP_COMMAND_ARGS = "-b -"; - private final static String SSH_COMMAND = "ssh"; - private final static String SYSTEM_TYPE = "Ssh/Gdbserver"; + private final static String REMOTE_GDBSERVER_COMMAND = "gdbserver"; //$NON-NLS-1$ + private final static String SFTP_COMMAND = "sftp"; //$NON-NLS-1$ + private final static String SFTP_COMMAND_ARGS = "-b -"; //$NON-NLS-1$ + private final static String SSH_COMMAND = "ssh"; //$NON-NLS-1$ + private final static String SYSTEM_TYPE = "Ssh/Gdbserver"; //$NON-NLS-1$ /* * (non-Javadoc) * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch @@ -66,7 +66,7 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { String arguments = getProgramArguments(config); String remoteExePath = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_PATH, - ""); + ""); //$NON-NLS-1$ if(mode.equals(ILaunchManager.DEBUG_MODE)){ setDefaultSourceLocator(launch, config); @@ -83,9 +83,9 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { /* Automatically start up the gdbserver to be used by the GDBServerCDIDebugger on the remote * using ssh. */ - String command_arguments = ":" + IRemoteConnectionConfigurationConstants.ATTR_TCP_PORT + " " + remoteExePath; - if(arguments != null && !arguments.equals("")) - command_arguments += " " + arguments; + String command_arguments = ":" + IRemoteConnectionConfigurationConstants.ATTR_TCP_PORT + " " + remoteExePath; //$NON-NLS-1$ //$NON-NLS-2$ + if(arguments != null && !arguments.equals("")) //$NON-NLS-1$ + command_arguments += " " + arguments; //$NON-NLS-1$ Process sshProcess = remoteSshExec(config, REMOTE_GDBSERVER_COMMAND, command_arguments); DebugPlugin.newProcess(launch, sshProcess, renderProcessLabel(REMOTE_GDBSERVER_COMMAND)); /* Pre-set configuration constants for the GDBSERVERCDIDebugger to indicate how the gdbserver @@ -156,7 +156,7 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { if(inputString == null) return null; - return inputString.replaceAll(" ", "\\\\ "); + return inputString.replaceAll(" ", "\\\\ "); //$NON-NLS-1$ //$NON-NLS-2$ } protected Process remoteSftpDownload(ILaunchConfiguration config, ILaunch launch, String localExePath, String remoteExePath) @@ -168,14 +168,14 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { //Nothing to do. Download is skipped. return null; - String arguments = SFTP_COMMAND_ARGS + " " + getRemoteHostname(config); + String arguments = SFTP_COMMAND_ARGS + " " + getRemoteHostname(config); //$NON-NLS-1$ Process p = null; try { p = execLocal(SFTP_COMMAND, arguments); DebugPlugin.newProcess(launch, p, renderProcessLabel(SFTP_COMMAND)); OutputStream outStream = p.getOutputStream(); - String putCommand = "put " + quotify(localExePath) + " " + quotify(remoteExePath) + "\n"; - String exitCommand = "exit\n"; + String putCommand = "put " + quotify(localExePath) + " " + quotify(remoteExePath) + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String exitCommand = "exit\n"; //$NON-NLS-1$ // Execute the put and then the exit command. outStream.write(putCommand.getBytes()); outStream.write(exitCommand.getBytes()); @@ -193,7 +193,7 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { protected String getRemoteHostname(ILaunchConfiguration config) throws CoreException{ String remoteConnection = config.getAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_CONNECTION, - ""); + ""); //$NON-NLS-1$ IHost[] connections = RSEUIPlugin.getTheSystemRegistry().getHostsBySystemType(SYSTEM_TYPE); int i = 0; @@ -211,8 +211,8 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { protected Process remoteSshExec(ILaunchConfiguration config, String remoteCommandPath, String arguments) throws CoreException { String remote_command = arguments == null ? spaceEscapify(remoteCommandPath) : - spaceEscapify(remoteCommandPath) + " " + arguments; - String ssh_arguments = getRemoteHostname(config) + " " + remote_command; + spaceEscapify(remoteCommandPath) + " " + arguments; //$NON-NLS-1$ + String ssh_arguments = getRemoteHostname(config) + " " + remote_command; //$NON-NLS-1$ Process p = execLocal(SSH_COMMAND, ssh_arguments); return p; @@ -247,7 +247,7 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { protected Process execLocal(String file, String arguments) throws CoreException { Process p = null; - String command = file + " " + arguments; + String command = file + " " + arguments; //$NON-NLS-1$ try { p = new Spawner(command, false); } catch (Exception e) { @@ -263,6 +263,6 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate { } protected String getPluginID() { - return "org.eclipse.rse.remotecdt"; + return "org.eclipse.rse.remotecdt"; //$NON-NLS-1$ } } diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.xml b/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.xml index 1c088bcb81d..fbce7ade932 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.xml +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.xml @@ -12,11 +12,11 @@ Martin Oberhuber - initial API and implementation - - - - + diff --git a/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd b/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd index 02b48d5f280..edbc999bdcb 100644 --- a/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd +++ b/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd @@ -6,46 +6,140 @@ - [Enter description of this extension point.] + This extension point is used in combination with the org.eclipse.rse.ui.subsystemConfiguration +extension point for defining new subsystems, which appear under a connection when it is expanded in the +Remote Systems view. The systemTypes extension point allows subsystem providers to define a new system +type that appears in the list of valid system types in the New Connection wizard, used by users when defining +a new connection to a remote system. The system type is simply a string identifying the operating system +type, such as Solaris, and an pair of icons used to identify connections to systems of this type. One +icon is used when the connection is not connected, while the other is used when there is a live connection. - + + + + (no description available) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This element defines a remote system type like "Linux", against which subsystem configurations can be registered. + + + + - + A unique identifier for this extension. - + The display name for the system type, such as "Solaris". This name is also currently used when referencing the system type in filters, subsystem configurations and similar, therefore it is not translatable. Future versions of RSE may change this and reference the systemType id instead of the name. +<p> +RSE pre-defines a number of system types, although they may not appear unless a subsystem configuration is registered against that type. These are the supplied system types: +<ul> +<li>Local</li> +<li>Unix</li> +<li>Linux</li> +</ul> +</p> + + + + + + + A short description of the system type. Shows up in preferences for system type. - + - + A relative path to an icon that will be used when displaying connections to systems of this type. If not specified, a default icon will be used by RSE. - + + + + + A relative path to an icon that will be used when displaying connections to systems of this type, when there is a live connection to the remote system. This is usually a derivation of the icon attribute, adorned with a bright green arrow. +If not specified, a default icon will be used by RSE. + + + + + + + + + + Whether this system type can be put in offline mode. This decides whether to show the Work Offline action for connections of this type. This is an optional attribute, the default value is false. + + + + + + + + + On optional property for the system type. The following property keys are already used internally, and are thus reserved: +<ul> +<li>"icon" to store the value of the icon attribute</li> +<li>"iconLive" to store the value of the iconLive attribute</li> +<li>"enableOffline" to store the value of the enableOffline attribute</li> +</ul> + + @@ -69,7 +163,7 @@ - [Enter the first release in which this extension point appears.] + 1.0.0 @@ -78,7 +172,18 @@ - [Enter extension point usage example here.] + The following is an example of the extension point schema: +<p> +<pre> + <extension point="org.eclipse.rse.ui.systemTypes"> + <systemType id="com.acme.systemtype.Solaris" + name="Solaris" + <property name="icon" value="icons/solaris.gif"/> + <property name="iconLive" value="icons/solarisLive.gif"/> + </systemType> + </extension> +</pre> +</p> @@ -87,7 +192,7 @@ - [Enter API information here.] + There is no code to implement for this extension point. @@ -96,7 +201,7 @@ - [Enter information about supplied implementation of this extension point.] + See the plugin.xml file for plugin org.eclipse.rse.ui for examples of using this extension point. @@ -105,7 +210,13 @@ - + Copyright (c) 2002, 2006 IBM Corporation. All Rights Reserved. +This program and the accompanying materials are made available under the terms +of the Eclipse Public License v1.0 which accompanies this distribution, and is +available at http://www.eclipse.org/legal/epl-v10.html + +Contributors: +IBM Corporation - initial API and implementation diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java index ac35561ea40..b711f05fbc9 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java @@ -23,8 +23,8 @@ package org.eclipse.rse.core; */ public interface IRSECoreRegistry { - public static final String PI_RSE_CORE = "org.eclipse.rse.core"; - public static final String PI_SYSTEM_TYPES = "systemTypes"; + public static final String PI_RSE_CORE = "org.eclipse.rse.core"; //$NON-NLS-1$ + public static final String PI_SYSTEM_TYPES = "systemTypes"; //$NON-NLS-1$ /** * Returns all defined system types. @@ -34,6 +34,7 @@ public interface IRSECoreRegistry { /** * Returns the names of all defined system types. + * @return all defined system type names */ public String[] getSystemTypeNames(); diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java index d2b173e548d..098a73cf5f1 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java @@ -13,6 +13,6 @@ package org.eclipse.rse.core; * These constants define the set of preference names that the RSE core uses. */ public interface IRSEPreferenceNames { - public static final String ST_DEFAULT_USERID = "systemType.defaultUserId"; - public static final String ST_ENABLED = "systemType.enabled"; + public static final String ST_DEFAULT_USERID = "systemType.defaultUserId"; //$NON-NLS-1$ + public static final String ST_ENABLED = "systemType.enabled"; //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java index cf76ad0afb6..d2786a21c33 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java @@ -30,52 +30,52 @@ public interface IRSESystemType extends IAdaptable { /** * Linux system type, "Linux". */ - public static final String SYSTEMTYPE_LINUX = "Linux"; + public static final String SYSTEMTYPE_LINUX = "Linux"; //$NON-NLS-1$ /** * Power Linux type, "Power Linux". */ - public static final String SYSTEMTYPE_POWER_LINUX = "Power Linux"; + public static final String SYSTEMTYPE_POWER_LINUX = "Power Linux"; //$NON-NLS-1$ /** * Power Linux type, "zSeries Linux". */ - public static final String SYSTEMTYPE_ZSERIES_LINUX = "zSeries Linux"; + public static final String SYSTEMTYPE_ZSERIES_LINUX = "zSeries Linux"; //$NON-NLS-1$ /** * Unix system type, "Unix". */ - public static final String SYSTEMTYPE_UNIX = "Unix"; + public static final String SYSTEMTYPE_UNIX = "Unix"; //$NON-NLS-1$ /** * AIX system type, "AIX". */ - public static final String SYSTEMTYPE_AIX = "AIX"; + public static final String SYSTEMTYPE_AIX = "AIX"; //$NON-NLS-1$ /** * PASE system type, "PASE". */ - public static final String SYSTEMTYPE_PASE = "PASE"; + public static final String SYSTEMTYPE_PASE = "PASE"; //$NON-NLS-1$ /** * iSeries system type, "iSeries". */ - public static final String SYSTEMTYPE_ISERIES = "iSeries"; + public static final String SYSTEMTYPE_ISERIES = "iSeries"; //$NON-NLS-1$ /** * Local system type, "Local". */ - public static final String SYSTEMTYPE_LOCAL = "Local"; + public static final String SYSTEMTYPE_LOCAL = "Local"; //$NON-NLS-1$ /** * z/OS system type, "z/OS". */ - public static final String SYSTEMTYPE_ZSERIES = "z/OS"; + public static final String SYSTEMTYPE_ZSERIES = "z/OS"; //$NON-NLS-1$ /** * Windows system type, "Windows". */ - public static final String SYSTEMTYPE_WINDOWS = "Windows"; + public static final String SYSTEMTYPE_WINDOWS = "Windows"; //$NON-NLS-1$ /** * Returns the id of the system type. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/IRSESystemTypeConstants.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeConstants.java similarity index 71% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/IRSESystemTypeConstants.java rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeConstants.java index 00bb085797b..8d5c78568ea 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/IRSESystemTypeConstants.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeConstants.java @@ -7,17 +7,17 @@ * Contributors: * Kushal Munir (IBM) - Initial API and implementation. ********************************************************************************/ -package org.eclipse.rse.ui; +package org.eclipse.rse.core; /** * These constants define the set of properties that the UI expects to * be available via IRSESystemType.getProperty(String). * - * @see org.eclipse.core.runtime.IRSESystemType#getProperty(String) + * @see org.eclipse.rse.core.IRSESystemType#getProperty(String) */ public interface IRSESystemTypeConstants { - public static final String ICON = "icon"; - public static final String ICON_LIVE = "iconLive"; - public static final String ENABLE_OFFLINE = "enableOffline"; + public static final String ICON = "icon"; //$NON-NLS-1$ + public static final String ICON_LIVE = "iconLive"; //$NON-NLS-1$ + public static final String ENABLE_OFFLINE = "enableOffline"; //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java index 08d986bbda2..945ece82ee0 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java @@ -68,16 +68,18 @@ public class RSECorePlugin extends Plugin { plugin = this; } - /** - * Starts the bundle. + /* + * (non-Javadoc) + * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext) */ public void start(BundleContext context) throws Exception { super.start(context); logger = LoggerFactory.getLogger(this); } - /** - * This method is called when the plug-in is stopped. + /* + * (non-Javadoc) + * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) */ public void stop(BundleContext context) throws Exception { super.stop(context); diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSECoreRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSECoreRegistry.java index d8e3e3ce001..fc3fa981eba 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSECoreRegistry.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSECoreRegistry.java @@ -39,7 +39,7 @@ public class RSECoreRegistry implements IRSECoreRegistry { private IRSESystemType[] systemTypes; // constants - private static final String ELEMENT_SYTEM_TYPE = "systemType"; + private static final String ELEMENT_SYTEM_TYPE = "systemType"; //$NON-NLS-1$ /** * Constructor. diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSESystemType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSESystemType.java index f75cc660f32..dd3b6b88b80 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSESystemType.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/internal/RSESystemType.java @@ -20,6 +20,7 @@ import java.util.HashMap; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.IRSESystemTypeConstants; import org.osgi.framework.Bundle; /** @@ -27,10 +28,13 @@ import org.osgi.framework.Bundle; */ public class RSESystemType implements IRSESystemType { - private static final String ATTR_ID = "id"; - private static final String ATTR_NAME = "name"; - private static final String ATTR_DESCRIPTION = "description"; - private static final String ATTR_VALUE = "value"; + private static final String ATTR_ID = "id"; //$NON-NLS-1$ + private static final String ATTR_NAME = "name"; //$NON-NLS-1$ + private static final String ATTR_DESCRIPTION = "description"; //$NON-NLS-1$ + private static final String ATTR_ICON = "icon"; //$NON-NLS-1$ + private static final String ATTR_ICONLIVE = "iconLive"; //$NON-NLS-1$ + private static final String ATTR_ENABLEOFFLINE = "enableOffline"; //$NON-NLS-1$ + private static final String ATTR_VALUE = "value"; //$NON-NLS-1$ String id = null; String name = null; @@ -49,6 +53,13 @@ public class RSESystemType implements IRSESystemType { description = element.getAttribute(ATTR_DESCRIPTION); loadProperties(element); + + String icon = element.getAttribute(ATTR_ICON); + if (icon!=null) properties.put(IRSESystemTypeConstants.ICON, icon); + String iconLive = element.getAttribute(ATTR_ICONLIVE); + if (iconLive!=null) properties.put(IRSESystemTypeConstants.ICON_LIVE, iconLive); + String enableOffline = element.getAttribute(ATTR_ENABLEOFFLINE); + if (enableOffline!=null) properties.put(IRSESystemTypeConstants.ENABLE_OFFLINE, enableOffline); definingBundle = Platform.getBundle(element.getContributor().getName()); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java index 6657cf6e885..dfbff0aaf10 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java @@ -26,6 +26,7 @@ import org.eclipse.core.runtime.Preferences; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.core.IRSEPreferenceNames; import org.eclipse.rse.core.IRSESystemType; +import org.eclipse.rse.core.IRSESystemTypeConstants; import org.eclipse.rse.core.RSECorePlugin; import org.osgi.framework.Bundle; @@ -39,17 +40,26 @@ public class RSESystemTypeAdapter extends RSEAdapter implements IRSESystemTypeCo } /** + * Returns the image descriptor for the icon of this system type. + * Returns the default live connection image descriptor if no icon has been configured. * @see org.eclipse.ui.model.WorkbenchAdapter#getImageDescriptor(java.lang.Object) */ public ImageDescriptor getImageDescriptor(Object object) { - return getImage(object, ICON); + ImageDescriptor img = getImage(object, ICON); + if (img==null) img = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_CONNECTION_ID); + return img; } /** - * @see org.eclipse.ui.model.WorkbenchAdapter#getImageDescriptor(java.lang.Object) + * Returns the "live" image descriptor for this system type. + * Returns the default live connection image descriptor if no icon has been configured. + * @param object The object to get an image descriptor for. + * @return ImageDescriptor */ public ImageDescriptor getLiveImageDescriptor(Object object) { - return getImage(object, ICON_LIVE); + ImageDescriptor img = getImage(object, ICON_LIVE); + if (img==null) img = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_CONNECTIONLIVE_ID); + return img; } private ImageDescriptor getImage(Object object, String propertyKey) { @@ -80,7 +90,7 @@ public class RSESystemTypeAdapter extends RSEAdapter implements IRSESystemTypeCo * the absolute or relative path * @param definingBundle * bundle to be used for relative paths (may be null) - * @return + * @return ImageDescriptor */ public static ImageDescriptor getImage(String value, Bundle definingBundle) { URL url = getUrl(value, definingBundle); 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 3636a93aaa2..d81881c3f5e 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 @@ -720,179 +720,6 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi } - /** - * Reset the system types objects to the given array. Called by preferences - * page when Defaults is pressed, and then OK/Apply. - */ -/* public void setSystemTypes(SystemType[] systemTypes) - { - allSystemTypes = systemTypes; - }*/ - - /** - * Return all system type objects. Unlike {@link #getSystemTypes()}, this method - * returns all registered system types, not just those currently enabled. - * @param refresh - true if to force a re-read from disk. If specified, then the read - * is not effective, but rather is only returned. To affectively revert back, you - * must call setSystemTypes. This is used by the preferences page. - * @return array of SystemType objects, one for every systemtype extension - */ - /* public SystemType[] getAllSystemTypes(boolean refresh) - { - - SystemType[] tempAllSystemTypes = null; - if (refresh || (allSystemTypes == null)) - { - IConfigurationElement[] typePlugins = getSystemTypePlugins(); - - if (typePlugins != null) - { - Vector v = new Vector(); - List typeStrs = new ArrayList(); - ISubSystemConfigurationProxy[] proxies = getSubSystemConfigurationProxies(); - if (proxies == null) - proxies = new ISubSystemConfigurationProxy[0]; - - for (int idx=0; idx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -393,8 +363,10 @@ Contributors: - + + @@ -529,71 +501,61 @@ Contributors: - - - + description="%systemType.windows" + icon="icons/full/obj16/systemwin_obj.gif" + iconLive="icons/full/obj16/systemwinlive_obj.gif"/> - - - + description="%systemType.linux" + icon="icons/full/obj16/systemlinux_obj.gif" + iconLive="icons/full/obj16/systemlinuxlive_obj.gif"/> - - - + description="%systemType.unix" + icon="icons/full/obj16/systemunix_obj.gif" + iconLive="icons/full/obj16/systemunixlive_obj.gif"/> - - - + description="%systemType.local" + icon="icons/full/obj16/systemlocal_obj.gif" + iconLive="icons/full/obj16/systemlocallive_obj.gif"/>