From 1f3cf1136978fcc32d720c7c04a371730ea0d0b1 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Tue, 8 Aug 2006 08:34:20 +0000 Subject: [PATCH] Remove unnecessary check after instanceof --- .../ui/view/SystemViewRemoteSearchResultAdapter.java | 7 ++----- .../subsystems/shells/subsystems/RemoteCmdSubSystem.java | 9 +++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java index 87d27c226dd..b87eab7cfaf 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java @@ -713,10 +713,7 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt if (context instanceof IRemoteFile) { IRemoteFile cwd = (IRemoteFile)context; - if (cwd != null) - { - return cwd.getAbsolutePath(); - } + return cwd.getAbsolutePath(); } else { @@ -724,6 +721,6 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt } } } - return ""; + return ""; //$NON-NLS-1$ } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java index 2c7e8c271d8..bf8260a8057 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java @@ -594,12 +594,9 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd if (context instanceof IRemoteFile) { IRemoteFile pwdf = (IRemoteFile) context; - if (pwdf != null) - { - String pwd = pwdf.getAbsolutePath(); - shellBuffer.append(pwd); - gotShell = true; - } + String pwd = pwdf.getAbsolutePath(); + shellBuffer.append(pwd); + gotShell = true; } else {