From 4a6b55ecb6465a71cc9fc1b23224d818c78edf58 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Tue, 29 Aug 2006 12:31:13 +0000 Subject: [PATCH] [cleanup] fix 'local variable/field is never read' compiler warnings --- .../RemoteFileSubSystemConfiguration.java | 8 ++--- .../subsystems/SubSystemConfiguration.java | 29 +++++++++---------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java index 00863678f29..5eb1e32c7cc 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystemConfiguration.java @@ -35,9 +35,9 @@ import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage; /** - * Specialization for file subsystem factories. - * It is subclassed via use of a Rose model and MOF/EMF, or better yet - * by subclassing {@link org.eclipse.rse.core.servicesubsystem.impl.FileServiceSubSystemConfiguration}. + * Specialization for file subsystem configurations. + * It is best used by subclassing + * {@link org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystemConfiguration}. * * @see RemoteFileSubSystem */ @@ -429,7 +429,7 @@ public abstract class RemoteFileSubSystemConfiguration extends SubSystemConfigur /** * Populate a new subsystem with our unique attributes, and/or create default filter references. * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#initializeSubSystem(ISubSystem,ISystemNewConnectionWizardPage[]) - * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#getNewConnectionWizardPages(org.eclipse.jface.wizard.IWizard) + * @see org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard) */ protected void initializeSubSystem(ISubSystem ss, ISystemNewConnectionWizardPage[] yourNewConnectionWizardPages) { diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java index acfa52afddf..cc7ea271a37 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java @@ -453,7 +453,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration public abstract boolean supportsServerLaunchProperties(IHost host); /** - * If {@link #supportsServerLaunchProperties()} returns true, this method may be called by + * If {@link #supportsServerLaunchProperties(IHost)} returns true, this method may be called by * the server launcher to decide if a given remote server launch type is supported or not. *
We return true by default. * @see org.eclipse.rse.core.subsystems.ServerLaunchType @@ -984,7 +984,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration /** * Return list of all subsystems. - * @param true if we should force all the subsystems to be restored from disk if not already + * @param force true if we should force all the subsystems to be restored from disk if not already */ public ISubSystem[] getSubSystems(boolean force) { @@ -1025,7 +1025,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration * Returns a list of subsystem objects existing for the given connection. * For performance, the calculated array is cached until something changes. * @param conn System connection to retrieve subsystems for - * @param true if we should force all the subsystems to be restored from disk if not already + * @param force true if we should force all the subsystems to be restored from disk if not already */ public ISubSystem[] getSubSystems(IHost conn, boolean force) { @@ -1165,7 +1165,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration *
  • does initialization of common attributes *
  • if {@link #supportsFilters()}, creates a {@link org.eclipse.rse.filters.ISystemFilterPoolReferenceManager} for the * subsystem to manage references to filter pools - *
  • if (@link #supportsServerLaunchProperties()}, calls {@link #createServerLauncher(ISubSystem)}, to create + *
  • if (@link #supportsServerLaunchProperties()}, calls {@link #createServerLauncher(IConnectorService)}, to create * the server launcher instance to associate with this subsystem. This can be subsequently * retrieved via calling subsystem's {@link ISubSystem#getRemoteServerLauncher()}. *
  • calls {@link #initializeSubSystem(ISubSystem, ISystemNewConnectionWizardPage[])} so subclasses can @@ -1176,7 +1176,8 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration * @param creatingConnection true if we are creating a connection, false if just creating * another subsystem for an existing connection. * @param yourNewConnectionWizardPages The wizard pages you supplied to the New Connection wizard, via the - * {@link #getNewConnectionWizardPages(IWizard)} method or null if you didn't override this method. + * {@link org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter#getNewConnectionWizardPages(ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard)} + * method or null if you didn't override this method. * Note there may be more pages than you originally supplied as it is all pages contributed by * this factory object, including subclasses. */ @@ -1406,7 +1407,8 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration * * @param ss - The subsystem that was created via createSubSystemInternal * @param yourNewConnectionWizardPages - The wizard pages you supplied to the New Connection wizard, via the - * {@link #getNewConnectionWizardPages(IWizard)} method or null if you didn't override this method. + * {@link org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard)} + * method or null if you didn't override this method. * Note there may be more pages than you originally supplied, as you are passed all pages contributed * by this factory object, including subclasses. This is null when this method is called other than * for a New Connection operation. @@ -1522,7 +1524,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration } /** * Update the port for the given subsystem instance. - * Shortcut to {@link #updateSubSystem(Shell,ISubSystem,boolean,String,boolean,Integer)} + * Shortcut to {@link #updateSubSystem(Shell, ISubSystem, boolean, String, boolean, int)} */ public void setSubSystemPort(Shell shell, ISubSystem subsystem, int port) { @@ -1530,7 +1532,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration } /** * Update the user ID for the given subsystem instance. - * Shortcut to {@link #updateSubSystem(Shell,ISubSystem,boolean,String,boolean,Integer)} + * Shortcut to {@link #updateSubSystem(Shell, ISubSystem, boolean, String, boolean, int)} */ public void setSubSystemUserId(Shell shell, ISubSystem subsystem, String userId) { @@ -1875,11 +1877,6 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration SystemMessageDialog.displayExceptionMessage(null, exc); return null; // something very bad happend! } - if (mgr == null) - { - SystemBasePlugin.logError("Restore/Creation of SystemFilterPoolManager " + getFilterPoolManagerName(profile) + " failed!", null); - return null; // something very bad happend! - } addFilterPoolManager(profile, mgr); @@ -2633,7 +2630,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration * for a given subsystem. *

    * Create an instance of ServerLauncher, and add it to the given subsystem. - * When a subsystem is created, and {@link #supportsServerLaunchProperties()} + * When a subsystem is created, and {@link #supportsServerLaunchProperties(IHost)} * returns true, this method is called to create the server launcher instance * associated with the subsystem. The default implementation is to create an * instance of {@link IRemoteServerLauncher}, but override to create your own @@ -2659,9 +2656,9 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration } /** * Return the form used in the property page, etc for this server launcher. - * Only called if {@link #supportsServerLaunchProperties()} returns true. + * Only called if {@link #supportsServerLaunchProperties(IHost)} returns true. *

    - * We return {@link org.eclipse.rse.ui.widgets.ServerLauncherForm}. + * We return {@link RemoteServerLauncherForm}. * Override if appropriate. */ public IServerLauncherForm getServerLauncherForm(Shell shell, ISystemMessageLine msgLine)