diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/model/DStoreFileAdapter.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/model/DStoreFileAdapter.java index c719b27cc3d..cee033a4051 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/model/DStoreFileAdapter.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/model/DStoreFileAdapter.java @@ -21,6 +21,7 @@ import java.util.List; import org.eclipse.dstore.core.model.DataElement; import org.eclipse.rse.connectorservice.dstore.DStoreConnectorService; +import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.services.dstore.files.DStoreHostFile; import org.eclipse.rse.services.dstore.files.DStoreVirtualHostFile; import org.eclipse.rse.services.files.IHostFile; @@ -42,7 +43,7 @@ public class DStoreFileAdapter implements IHostFileToRemoteFileAdapter if (_listener == null) { DStoreConnectorService connectorService = (DStoreConnectorService)ss.getConnectorService(); - Shell shell = FileServiceSubSystem.getActiveWorkbenchShell(); + Shell shell = SubSystem.getActiveWorkbenchShell(); _listener = new RemoteFilePropertyChangeListener(shell, connectorService, connectorService.getDataStore(), ss); } } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemSearchResultConfiguration.java index 0fd84bdfc7f..0699d0af88c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/DStoreFileSubSystemSearchResultConfiguration.java @@ -83,7 +83,7 @@ public class DStoreFileSubSystemSearchResultConfiguration extends DStoreSearchRe _fileSubSystem.listFiles(parentRemoteFile); } - String path = fileNode.getValue() + "/" + fileNode.getName(); + String path = fileNode.getValue() + "/" + fileNode.getName(); //$NON-NLS-1$ IRemoteFile remoteFile = _fileSubSystem.getRemoteFileObject(path); List contained = fileNode.getNestedData(); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/RemoteFilePropertyChangeListener.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/RemoteFilePropertyChangeListener.java index ffc23baf45e..e258c25d416 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/RemoteFilePropertyChangeListener.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/RemoteFilePropertyChangeListener.java @@ -212,7 +212,7 @@ public class RemoteFilePropertyChangeListener implements IDomainListener, if (updated != null) { String classification = updated.getClassification(); - if (!classification.equals("file") && !classification.equals("directory")) + if (!classification.equals("file") && !classification.equals("directory")) //$NON-NLS-1$ //$NON-NLS-2$ { refreshParent = true; toUpdate.add(updated); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/Activator.java index 360ead1935f..c0bf42addad 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/Activator.java @@ -68,6 +68,6 @@ public class Activator extends AbstractUIPlugin { * @return the image descriptor */ public static ImageDescriptor getImageDescriptor(String path) { - return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.files.ftp", path); + return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.files.ftp", path); //$NON-NLS-1$ } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/model/FTPRemoteFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/model/FTPRemoteFile.java index 972697c8a54..3d095a91e2e 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/model/FTPRemoteFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/subsystems/files/ftp/model/FTPRemoteFile.java @@ -49,11 +49,11 @@ public class FTPRemoteFile extends AbstractRemoteFile { if (isFile()) { - return "file"; + return "file"; //$NON-NLS-1$ } else { - return "directory"; + return "directory"; //$NON-NLS-1$ } } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/Activator.java index dc192eda881..30f913c3bd2 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/Activator.java @@ -68,6 +68,6 @@ public class Activator extends AbstractUIPlugin { * @return the image descriptor */ public static ImageDescriptor getImageDescriptor(String path) { - return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.dstore", path); + return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.files.local", path); //$NON-NLS-1$ } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java index e0e7ac7680f..549ceb4fd3b 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java @@ -57,9 +57,9 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu public LocalFileSubSystemConfiguration() { super(); - String osName = System.getProperty("os.name").toLowerCase(); + String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$ - _isWindows = (osName.startsWith("windows")); + _isWindows = (osName.startsWith("windows")); //$NON-NLS-1$ setIsUnixStyle(!_isWindows); } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFile.java index 844757252e6..aee1781e817 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalFile.java @@ -54,7 +54,7 @@ public class LocalFile extends AbstractRemoteFile implements IRemoteFile } catch (Exception e) { - return ""; + return ""; //$NON-NLS-1$ } } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalVirtualFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalVirtualFile.java index be2aa816c8d..267843e506e 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalVirtualFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/model/LocalVirtualFile.java @@ -89,25 +89,25 @@ public class LocalVirtualFile extends LocalFile implements IVirtualRemoteFile public void setVirtualFullPath(String string) { - if (string.equals("")) + if (string.equals("")) //$NON-NLS-1$ { _node.getChild().renameTo(_node.getChild().name); } else { - _node.getChild().renameTo(string + "/" + _node.getChild().name); + _node.getChild().renameTo(string + "/" + _node.getChild().name); //$NON-NLS-1$ } } public void setVirtualName(String string) { - if (_node.getChild().path.equals("")) + if (_node.getChild().path.equals("")) //$NON-NLS-1$ { _node.getChild().renameTo(string); } else { - _node.getChild().renameTo(_node.getChild().path + "/" + string); + _node.getChild().renameTo(_node.getChild().path + "/" + string); //$NON-NLS-1$ } } diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/Activator.java index c1ae9fbdee8..de074cdac82 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/Activator.java @@ -67,6 +67,6 @@ public class Activator extends AbstractUIPlugin { * @return the image descriptor */ public static ImageDescriptor getImageDescriptor(String path) { - return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.processes.dstore", path); + return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.processes.dstore", path); //$NON-NLS-1$ } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/Activator.java index c0221848e8c..fb686c382cb 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/Activator.java @@ -67,6 +67,6 @@ public class Activator extends AbstractUIPlugin { * @return the image descriptor */ public static ImageDescriptor getImageDescriptor(String path) { - return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.processes.dstore", path); + return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.processes.local", path); //$NON-NLS-1$ } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/Activator.java index 828ba2c8f0c..a8163fffbb6 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/Activator.java @@ -69,6 +69,6 @@ public class Activator extends AbstractUIPlugin { * @return the image descriptor */ public static ImageDescriptor getImageDescriptor(String path) { - return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.shells.dstore", path); + return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.shells.dstore", path); //$NON-NLS-1$ } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/Activator.java index 3c73ba4aa74..2228cdeff6b 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/Activator.java @@ -69,6 +69,6 @@ public class Activator extends AbstractUIPlugin { * @return the image descriptor */ public static ImageDescriptor getImageDescriptor(String path) { - return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.shells.dstore", path); + return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.shells.local", path); //$NON-NLS-1$ } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/LocalShellSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/LocalShellSubSystemConfiguration.java index 24340c6c3ad..2a94ce56cb7 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/LocalShellSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/LocalShellSubSystemConfiguration.java @@ -45,14 +45,14 @@ public class LocalShellSubSystemConfiguration extends ShellServiceSubSystemConfi */ public String getCommandSeparator() { - String os = System.getProperty("os.name").toLowerCase(); - if (os.startsWith("win")) + String os = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$ + if (os.startsWith("win")) //$NON-NLS-1$ { - return "&"; + return "&"; //$NON-NLS-1$ } else { - return ";"; + return ";"; //$NON-NLS-1$ } } diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java index 8e01c0f911d..1217fcdf502 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/subsystems/shells/local/model/LocalServiceCommandShell.java @@ -26,7 +26,7 @@ public class LocalServiceCommandShell extends ServiceCommandShell { super(cmdSS, hostShell); _patterns = new Patterns(); - _patterns.update("cmd"); + _patterns.update("cmd"); //$NON-NLS-1$ ISubSystem[] sses = cmdSS.getHost().getSubSystems(); for (int i = 0; i < sses.length; i++) { @@ -75,7 +75,7 @@ public class LocalServiceCommandShell extends ServiceCommandShell } RemoteOutput output = null; - String type = "stdout"; + String type = "stdout"; //$NON-NLS-1$ if (parsedMsg != null) { type = parsedMsg.type; @@ -97,7 +97,7 @@ public class LocalServiceCommandShell extends ServiceCommandShell if (parsedMsg != null) { String file = parsedMsg.file; - if (type.equals("prompt")) + if (type.equals("prompt")) //$NON-NLS-1$ { _workingDir = file; output.setAbsolutePath(_workingDir);