diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/SystemFileFilterStringEditPane.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/SystemFileFilterStringEditPane.java index 735fc733464..75ebcb0ad2e 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/SystemFileFilterStringEditPane.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/SystemFileFilterStringEditPane.java @@ -472,13 +472,15 @@ public class SystemFileFilterStringEditPane errorMessage = validateFolderInput(); if (errorMessage != null) - controlInError = folderCombo; - - if (errorMessage == null) - { - if (subsetByFileNameRadioButton.getSelection()) + { + controlInError = folderCombo; + } + else + { + if (subsetByFileNameRadioButton.getSelection()) { errorMessage = validateFileInput(); - else + } + else { if (textTypes.getText().trim().length() == 0) { diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/StatusChangeListener.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/StatusChangeListener.java index d3c0b38507a..10aaa1330c7 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/StatusChangeListener.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/StatusChangeListener.java @@ -43,7 +43,7 @@ public class StatusChangeListener implements IDomainListener protected Vector historyOfTargets; - protected class FindShell implements Runnable { + protected static class FindShell implements Runnable { private Shell shell; /** @@ -169,9 +169,6 @@ public class StatusChangeListener implements IDomainListener this.done = done; } - /** - * @see IDomainListener#getShell() - */ public Shell getShell() { // dy: DomainNotifier (which calls this method) requires the shell not be disposed //if (shell == null) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/StatusChangeListener.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/StatusChangeListener.java index 61f084a2b78..c4d5646c977 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/StatusChangeListener.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/old/StatusChangeListener.java @@ -52,7 +52,7 @@ public class StatusChangeListener implements IDomainListener, ICommunicationsLis protected Vector historyOfTargets; - protected class FindShell implements Runnable { + protected static class FindShell implements Runnable { private Shell shell; /** @@ -192,9 +192,6 @@ public class StatusChangeListener implements IDomainListener, ICommunicationsLis this.done = done; } - /** - * @see IDomainListener#getShell() - */ public Shell getShell() { // dy: DomainNotifier (which calls this method) requires the shell not be disposed //if (shell == null) { @@ -412,7 +409,7 @@ public class StatusChangeListener implements IDomainListener, ICommunicationsLis * Start diagnostic * * @param Class diagnostic is the an implementation of ICommunicationsDiagnostic - * @param boolean quiet is the flag to indicate if user should be prompted + * @param quiet is the flag to indicate if user should be prompted * - true for no prompt * @return ICommunciationsDiagnostic class instance */ diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveDownFilterPoolReferenceAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveDownFilterPoolReferenceAction.java index 92ae9b87993..d1be898f1f8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveDownFilterPoolReferenceAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveDownFilterPoolReferenceAction.java @@ -123,7 +123,7 @@ public class SystemFilterMoveDownFilterPoolReferenceAction extends SystemBaseAct ISystemFilterPoolReferenceManager fprMgr = null; while (i.hasNext()) { - sortableArray[idx] = new SystemSortableSelection((ISystemFilterPoolReference)i.next()); + sortableArray[idx] = new SystemSortableSelection(i.next()); filterPoolRef = (ISystemFilterPoolReference)sortableArray[idx].getSelectedObject(); fprMgr = filterPoolRef.getFilterPoolReferenceManager(); sortableArray[idx].setPosition(fprMgr.getSystemFilterPoolReferencePosition(filterPoolRef)); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java index 21fe8a6c003..797e51b23c9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java @@ -19,7 +19,6 @@ package org.eclipse.rse.ui.filters.dialogs; import java.util.Vector; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterContainer; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java index 1740cef60ea..c67558ed567 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java @@ -230,7 +230,7 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW */ protected void displayAsyncMsg(SubSystem ss, org.eclipse.rse.services.clientserver.messages.SystemMessageException msg) { - DisplayErrorMessageJob job = ss.new DisplayErrorMessageJob(null, msg); + DisplayErrorMessageJob job = new DisplayErrorMessageJob(null, msg); job.setPriority(Job.INTERACTIVE); job.setSystem(true); job.schedule(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizard.java index 9107867aeee..92050c3a547 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizard.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizard.java @@ -15,7 +15,6 @@ ********************************************************************************/ package org.eclipse.rse.ui.wizards; -import org.eclipse.jface.wizard.WizardPage; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.ui.ISystemIconConstants; diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java index df06d41f88d..8546c031288 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/internal/filters/SystemFilterPoolReference.java @@ -18,7 +18,6 @@ package org.eclipse.rse.internal.filters; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; -import org.eclipse.rse.core.references.IRSEPersistableReferencedObject; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterContainer; diff --git a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java index 323f8f515cd..4aab5dded29 100644 --- a/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java +++ b/rse/plugins/org.eclipse.rse.ui/references/org/eclipse/rse/internal/references/SystemPersistableReferencingObjectHelper.java @@ -16,7 +16,6 @@ package org.eclipse.rse.internal.references; import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject; -import org.eclipse.rse.core.references.IRSEBaseReferencedObject; import org.eclipse.rse.core.references.IRSEBaseReferencingObject; /** 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 0ee5950bde4..d4da8a2114d 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 @@ -961,7 +961,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS /** * Display message on message thread */ - protected void displayAsyncMsg(org.eclipse.rse.services.clientserver.messages.SystemMessageException msg) + protected void displayAsyncMsg(SystemMessageException msg) { DisplayErrorMessageJob job = new DisplayErrorMessageJob(getShell(), msg); job.setPriority(Job.INTERACTIVE); @@ -969,18 +969,18 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS job.schedule(); } /** - * Inner class which extends WorkbenchJob to allow us to show an error message, which is a GUI operation, + * Nested class which extends WorkbenchJob to allow us to show an error message, which is a GUI operation, * from a non-GUI thread. This is done by creating an instance of this class and then scheduling it. */ - public class DisplayErrorMessageJob extends WorkbenchJob + public static class DisplayErrorMessageJob extends WorkbenchJob { private Shell shell; - private org.eclipse.rse.services.clientserver.messages.SystemMessageException msgExc; + private SystemMessageException msgExc; /** * Constructor */ - public DisplayErrorMessageJob(Shell shell, org.eclipse.rse.services.clientserver.messages.SystemMessageException msgExc) + public DisplayErrorMessageJob(Shell shell, SystemMessageException msgExc) { super(""); this.shell = shell; //FIXME remove this diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtensionManager.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtensionManager.java index f988480dc15..c7cd2def170 100644 --- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtensionManager.java +++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtensionManager.java @@ -15,7 +15,6 @@ ********************************************************************************/ package org.eclipse.rse.core; -import org.eclipse.core.runtime.IAdaptable; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; import org.eclipse.ui.internal.dialogs.PropertyPageManager;