From 3665ea9c49600bd8c8ad40106266991776058a03 Mon Sep 17 00:00:00 2001 From: Kushal Munir < kmunir@ca.ibm.com> Date: Wed, 29 Nov 2006 03:35:53 +0000 Subject: [PATCH] Remove compile and javadoc warnings --- .../SystemShowPreferencesPageAction.java | 17 +++++++++++------ ...ractSystemSubSystemPropertyPageCoreForm.java | 10 ++++------ .../rse/ui/view/AbstractSystemViewAdapter.java | 5 ++--- .../subsystems/AbstractConnectorService.java | 4 ++-- .../AbstractConnectorServiceManager.java | 8 +++----- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowPreferencesPageAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowPreferencesPageAction.java index 0dc04c47972..33df3805ae1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowPreferencesPageAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemShowPreferencesPageAction.java @@ -24,6 +24,7 @@ import org.eclipse.jface.preference.IPreferenceNode; import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.jface.preference.PreferenceManager; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; @@ -40,6 +41,10 @@ import org.eclipse.ui.internal.dialogs.WorkbenchPreferenceDialog; * extension point. * @see org.eclipse.rse.ui.actions.SystemCascadingPreferencesAction */ +/** + * @author kmunir + * + */ public class SystemShowPreferencesPageAction extends SystemBaseAction implements IViewActionDelegate { @@ -48,12 +53,12 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements private String preferencePageCategory; /** - * Constructor. We are instantiated inside {@link RSEUIPlugin#getPreferencePageActionPlugins()} + * Constructor. We are instantiated inside {@link RSEUIPlugin#getShowPreferencePageActions()} * for each extension of our extension point org.eclipse.rse.core.remoteSystemsViewPreferencesActions */ public SystemShowPreferencesPageAction() { - super("temp label", null); + super("temp label", null); //$NON-NLS-1$ } /** @@ -94,17 +99,17 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements } + /** - * @see IActionDelegate#run(IAction) + * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ public void run(IAction action) { run(); } - /** - * @see IActionDelegate#selectionChanged(IAction, ISelection) + * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ public void selectionChanged(IAction action, ISelection selection) { @@ -130,7 +135,7 @@ public class SystemShowPreferencesPageAction extends SystemBaseAction implements PreferenceDialog d = new WorkbenchPreferenceDialog(shell, pm); d.create(); // TODO - hack to make this work in 3.1 - String id = PlatformUI.PLUGIN_ID + ".preference_dialog_context"; + String id = PlatformUI.PLUGIN_ID + ".preference_dialog_context"; //$NON-NLS-1$ PlatformUI.getWorkbench().getHelpSystem().setHelp(d.getShell(), id); d.open(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/AbstractSystemSubSystemPropertyPageCoreForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/AbstractSystemSubSystemPropertyPageCoreForm.java index 9d074158e81..e294292cbf3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/AbstractSystemSubSystemPropertyPageCoreForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/AbstractSystemSubSystemPropertyPageCoreForm.java @@ -21,7 +21,6 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.services.clientserver.messages.SystemMessage; -import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.dialogs.SystemPromptDialog; @@ -65,7 +64,6 @@ public abstract class AbstractSystemSubSystemPropertyPageCoreForm callerInstanceOfWizardPage = (caller instanceof WizardPage); callerInstanceOfSystemPromptDialog = (caller instanceof SystemPromptDialog); callerInstanceOfPropertyPage = (caller instanceof PropertyPage); - RSEUIPlugin sp = RSEUIPlugin.getDefault(); } /** * Get the input element @@ -103,22 +101,22 @@ public abstract class AbstractSystemSubSystemPropertyPageCoreForm // Vendor display labelText = SystemWidgetHelpers.appendColon(SystemResources.RESID_SUBSYSTEM_VENDOR_LABEL); labelVendorPrompt = SystemWidgetHelpers.createLabel(composite_prompts, labelText); - labelVendor = SystemWidgetHelpers.createLabel(composite_prompts, " "); + labelVendor = SystemWidgetHelpers.createLabel(composite_prompts, " "); //$NON-NLS-1$ // Name display labelText = SystemWidgetHelpers.appendColon(SystemResources.RESID_SUBSYSTEM_NAME_LABEL); labelNamePrompt = SystemWidgetHelpers.createLabel(composite_prompts, labelText); - labelName = SystemWidgetHelpers.createLabel(composite_prompts, " "); + labelName = SystemWidgetHelpers.createLabel(composite_prompts, " "); //$NON-NLS-1$ // Connection display labelText = SystemWidgetHelpers.appendColon(SystemResources.RESID_SUBSYSTEM_CONNECTION_LABEL); labelConnectionPrompt = SystemWidgetHelpers.createLabel(composite_prompts, labelText); - labelConnection = SystemWidgetHelpers.createLabel(composite_prompts, " "); + labelConnection = SystemWidgetHelpers.createLabel(composite_prompts, " "); //$NON-NLS-1$ // Profile display labelText = SystemWidgetHelpers.appendColon(SystemResources.RESID_SUBSYSTEM_PROFILE_LABEL); labelProfilePrompt = SystemWidgetHelpers.createLabel(composite_prompts, labelText); - labelProfile = SystemWidgetHelpers.createLabel(composite_prompts, " "); + labelProfile = SystemWidgetHelpers.createLabel(composite_prompts, " "); //$NON-NLS-1$ createInner(composite_prompts, inputElement, shell); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java index 238823bd1b3..65ad5f34a7e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java @@ -575,7 +575,7 @@ public abstract class AbstractSystemViewAdapter * * @return an array containing all descriptors to be added to the default set of descriptors, or null * if no additional properties desired. - * @see #createSimplePropertyDescriptor(String,ResourceBundle,String) + * @see #createSimplePropertyDescriptor(String, String, String) */ protected abstract IPropertyDescriptor[] internalGetPropertyDescriptors(); @@ -1105,9 +1105,8 @@ public abstract class AbstractSystemViewAdapter * set. For optimal performance, this should be overridden. * * @param set the set of objects to copy - * @param sameSystemType indication of whether the source and target reside on the same type of system * @param monitor the progress monitor - * @return a temporary workspace copies of the object that was copied + * @return the set of objects as a result of the drag * */ public ISystemResourceSet doDrag(SystemRemoteResourceSet set, IProgressMonitor monitor) 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 33635b540cd..f60bbfa358c 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 @@ -1044,7 +1044,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements // } /** * This methods returns the enablement state per server launch type. - * If {@link #enableServerLaunchType(ServerLaunchType,boolean)} has not been + * If {@link RemoteServerLauncher#enableServerLaunchType(ServerLaunchType, boolean)} has not been * called for this server launch type, then it is enabled by default. * @see org.eclipse.rse.core.subsystems.ServerLaunchType */ @@ -1144,7 +1144,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements private void logException(Throwable t) { Logger log = LoggerFactory.getLogger(RSEUIPlugin.getDefault()); - log.logError("Unexpected exception", t); + log.logError("Unexpected exception", t); //$NON-NLS-1$ } protected NewPasswordInfo promptForNewPassword(SystemMessage prompt) throws InterruptedException diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java index 9135bd71d6c..abf33422293 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java @@ -49,15 +49,13 @@ import org.eclipse.swt.widgets.Shell; *

* Your subclass must supply a method like the following:

* 

- * public static AbstractSystemManager getTheSystemManager()
+ * public static MyConnectorServiceManager getTheMyConnectorServiceManager()
  *  {
  *  	if (inst == null)
- *  	  inst = new AbstractSystemManager();
+ *  	  inst = new MyConnectorServiceManager();
  *  	return inst;
  *  }
  *
- * Your {@link org.eclipse.rse.core.servicesubsystem.ServiceSubSystem SubSystem} class - * should then call this factory method in its {@link org.eclipse.rse.core.servicesubsystem.ServiceSubSystem#getSystemManager() getSystemManager()} method. */ public abstract class AbstractConnectorServiceManager implements IConnectorServiceManager { @@ -185,7 +183,7 @@ public abstract class AbstractConnectorServiceManager implements IConnectorServi * subsystems in this SystemConnection, that share a single IConnectorService, * so we keep them all in synch in terms of these two properties used * by all ISystems. - * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#updateSubSystem(Shell,ISubSystem,boolean,String,boolean,Integer) + * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#updateSubSystem(ISubSystem, boolean, String, boolean, int) */ public void updateSubSystems(Shell shell, ISubSystem subsystem, boolean updateUserId, String userId, boolean updatePort, int port) {