diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewPart.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewPart.java index 6549bd43e7b..1f097036e3e 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewPart.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewPart.java @@ -231,12 +231,12 @@ public class SystemBuildErrorViewPart extends ViewPart implements ISelectionList return; ISystemViewElementAdapter adapter = (ISystemViewElementAdapter) ((IAdaptable) element).getAdapter(ISystemViewElementAdapter.class); - boolean alreadyHandled = false; + //boolean alreadyHandled = false; if (adapter != null) { if (!adapter.hasChildren(element)) { - alreadyHandled = adapter.handleDoubleClick(element); + /*alreadyHandled =*/ adapter.handleDoubleClick(element); } } } @@ -290,16 +290,12 @@ public class SystemBuildErrorViewPart extends ViewPart implements ISelectionList if (object instanceof IRemoteOutput) { IRemoteOutput output = (IRemoteOutput)object; - if (output != null) - { - _viewer.setInput(output.getParent()); - SystemBuildErrorViewProvider provider = (SystemBuildErrorViewProvider)_viewer.getContentProvider(); - provider.setOffset(output.getIndex() - 1); - } + _viewer.setInput(output.getParent()); + SystemBuildErrorViewProvider provider = (SystemBuildErrorViewProvider)_viewer.getContentProvider(); + provider.setOffset(output.getIndex() - 1); } else if (object instanceof IRemoteLineReference) { - _viewer.setInput(((IRemoteLineReference)object).getParent()); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java index 99dcb3bf30f..fbcc4d6e739 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java @@ -21,10 +21,8 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.rse.core.SystemBasePlugin; -import org.eclipse.rse.internal.model.SystemProfileManager; import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.ISystemProfile; -import org.eclipse.rse.model.ISystemProfileManager; import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.ISystemMessages; @@ -49,7 +47,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction implements IRunnableWithProgress { private ISystemProfile profile, newProfile; - private ISystemProfileManager mgr; + //private ISystemProfileManager mgr; private ISystemRegistry sr; private String oldName,newName; private boolean makeActive; @@ -63,7 +61,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction super(SystemResources.ACTION_PROFILE_COPY_LABEL, SystemResources.ACTION_PROFILE_COPY_TOOLTIP, PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY), shell); - mgr = SystemProfileManager.getSystemProfileManager(); + //mgr = SystemProfileManager.getSystemProfileManager(); sr = RSEUIPlugin.getTheSystemRegistry(); setSelectionSensitive(true); allowOnMultipleSelection(false); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java index cbce54c4f3b..0f27f87a18f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java @@ -35,7 +35,7 @@ public abstract class SystemRemoteResourceDialog extends SystemPromptDialog private IValidatorRemoteSelection _selectionValidator; private boolean _multipleSelectionMode; private boolean _showPropertySheet = false; - private IHost _outputConnection; + //private IHost _outputConnection; private SystemActionViewerFilter _customViewerFilter; private String _message, _tip; @@ -234,7 +234,7 @@ public abstract class SystemRemoteResourceDialog extends SystemPromptDialog boolean closeDialog = _form.verify(); if (closeDialog) { - _outputConnection = _form.getSelectedConnection(); + //_outputConnection = _form.getSelectedConnection(); if (_multipleSelectionMode) setOutputObject(_form.getSelectedObjects()); else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java index 2abbc12e784..868b58dc59d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java @@ -79,7 +79,8 @@ public class SystemRenameSingleDialog extends SystemPromptDialog public static final boolean COLLISION_MODE = true; - private Button overwriteRadio, renameRadio; + private Button overwriteRadio; + //private Button renameRadio; private boolean overwriteMode = true; private Composite renameGroup; @@ -200,7 +201,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog */ protected ISystemMessageLine createMessageLine(Composite c) { - ISystemMessageLine msgLine = super.createMessageLine(c); + /*ISystemMessageLine msgLine =*/ super.createMessageLine(c); //form.setMessageLine(msgLine); return fMessageLine; } @@ -243,8 +244,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog { overwriteRadio = SystemWidgetHelpers.createRadioButton(composite, this, SystemResources.RESID_SIMPLE_RENAME_RADIO_OVERWRITE_LABEL, SystemResources.RESID_SIMPLE_RENAME_RADIO_OVERWRITE_TOOLTIP); overwriteRadio.setSelection(true); - - renameRadio = SystemWidgetHelpers.createRadioButton(composite, this, SystemResources.RESID_SIMPLE_RENAME_RADIO_RENAME_LABEL, SystemResources.RESID_SIMPLE_RENAME_RADIO_RENAME_TOOLTIP); + /*renameRadio =*/ SystemWidgetHelpers.createRadioButton(composite, this, SystemResources.RESID_SIMPLE_RENAME_RADIO_RENAME_LABEL, SystemResources.RESID_SIMPLE_RENAME_RADIO_RENAME_TOOLTIP); } int nbrRenameColumns = 2; @@ -526,12 +526,13 @@ public class SystemRenameSingleDialog extends SystemPromptDialog Control controlInError = null; clearErrorMessage(); errMsg = validateNameInput(newNameString); - if (errMsg != null) - controlInError = newName; - else if (isRemote && checkIfWillBeFilteredOut(inputElement, newNameString)) - return false; - if (errMsg != null) - controlInError.setFocus(); + if (errMsg != null) { + controlInError = newName; + controlInError.setFocus(); + } + else if (isRemote && checkIfWillBeFilteredOut(inputElement, newNameString)) { + return false; + } return (errMsg == null); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java index b6d52fef382..69708f7c836 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java @@ -29,7 +29,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; @@ -42,7 +41,7 @@ public class SystemSimpleCopyDialog ISelectionChangedListener { private String promptString; - private Label prompt; + //private Label prompt; private TreeViewer tree; private SystemSimpleContentProvider provider = new SystemSimpleContentProvider(); private SystemSimpleContentElement copyTreeContent, initialSelection; @@ -76,7 +75,7 @@ public class SystemSimpleCopyDialog */ protected ISystemMessageLine createMessageLine(Composite c) { - ISystemMessageLine msgLine = super.createMessageLine(c); + /*ISystemMessageLine msgLine =*/ super.createMessageLine(c); return fMessageLine; } @@ -98,7 +97,7 @@ public class SystemSimpleCopyDialog Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, nbrColumns); // PROMPT - prompt = SystemWidgetHelpers.createLabel(composite_prompts, promptString); + /*prompt =*/ SystemWidgetHelpers.createLabel(composite_prompts, promptString); // WORK-WITH TREE tree = new TreeViewer(new Tree(composite_prompts, SWT.SINGLE | SWT.BORDER)); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java index 868a88bd710..bb5ce7518ba 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java @@ -29,7 +29,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; @@ -38,7 +37,7 @@ import org.eclipse.swt.widgets.Tree; * Works in concert with {@link org.eclipse.rse.ui.dialogs.SystemSimpleContentElement} * and {@link org.eclipse.rse.ui.dialogs.SystemSimpleContentProvider}. *

- * The {@link #setInputObject} method is used to populate the selection tree: + * The {@link #setInputObject(SystemSimpleContentElement)} method is used to populate the selection tree: *