From 04251c8bcdca9062578e44fc7b6c622a0d760cca Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 7 Jul 2006 08:15:18 +0000
Subject: [PATCH] Fix externalized strings warnings in tracer
---
.../rse/connectorservice/ssh/Activator.java | 31 +++++++++++--------
.../eclipse/rse/services/ssh/Activator.java | 10 ++++--
.../rse/services/ssh/files/SftpHostFile.java | 4 +--
.../rse/services/ssh/shell/SshHostShell.java | 2 +-
4 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/Activator.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/Activator.java
index 09cf9a61b51..7702ff5a47f 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/Activator.java
+++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/connectorservice/ssh/Activator.java
@@ -15,7 +15,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.rse.connectorservice.ssh";
+ public static final String PLUGIN_ID = "org.eclipse.rse.connectorservice.ssh"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
@@ -53,12 +53,25 @@ public class Activator extends AbstractUIPlugin {
return plugin;
}
+ /**
+ * Returns an image descriptor for the image file at the given
+ * plug-in relative path.
+ *
+ * @param path the path
+ * @return the image descriptor
+ */
+ public static ImageDescriptor getImageDescriptor(String path) {
+ return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+ }
+
+ //----------------------------------------------------
+
private static Boolean fTracingOn = null;
public static boolean isTracingOn() {
if (fTracingOn==null) {
String id = plugin.getBundle().getSymbolicName();
String val = Platform.getDebugOption(id + "/debug"); //$NON-NLS-1$
- if ("true".equals(val)) {
+ if ("true".equals(val)) { //$NON-NLS-1$
fTracingOn = Boolean.TRUE;
} else {
fTracingOn = Boolean.FALSE;
@@ -79,20 +92,12 @@ public class Activator extends AbstractUIPlugin {
}
public static void trace(String msg) {
if (isTracingOn()) {
- String fullMsg = getTimestamp() + " | " + Thread.currentThread().getName() + " | " + msg;
+ String fullMsg = getTimestamp() + " | " + Thread.currentThread().getName() + " | " + msg; //$NON-NLS-1$ //$NON-NLS-2$
System.out.println(fullMsg);
System.out.flush();
}
}
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
+ //---------------------------------------------------
+
}
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/Activator.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/Activator.java
index c89cef5e9f2..4b470373e00 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/Activator.java
+++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/Activator.java
@@ -62,12 +62,14 @@ public class Activator extends Plugin {
return plugin;
}
+ //----------------------------------------------------
+
private static Boolean fTracingOn = null;
public static boolean isTracingOn() {
if (fTracingOn==null) {
String id = plugin.getBundle().getSymbolicName();
String val = Platform.getDebugOption(id + "/debug"); //$NON-NLS-1$
- if ("true".equals(val)) {
+ if ("true".equals(val)) { //$NON-NLS-1$
fTracingOn = Boolean.TRUE;
} else {
fTracingOn = Boolean.FALSE;
@@ -88,10 +90,12 @@ public class Activator extends Plugin {
}
public static void trace(String msg) {
if (isTracingOn()) {
- String fullMsg = getTimestamp() + " | " + Thread.currentThread().getName() + " | " + msg;
+ String fullMsg = getTimestamp() + " | " + Thread.currentThread().getName() + " | " + msg; //$NON-NLS-1$ //$NON-NLS-2$
System.out.println(fullMsg);
System.out.flush();
}
}
-
+
+ //---------------------------------------------------
+
}
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpHostFile.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpHostFile.java
index 565667a0ecc..4d34ec90963 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpHostFile.java
+++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpHostFile.java
@@ -85,7 +85,7 @@ public class SftpHostFile implements IHostFile {
return getName();
} else {
StringBuffer path = new StringBuffer(getParentPath());
- if (!fParentPath.endsWith("/"))
+ if (!fParentPath.endsWith("/")) //$NON-NLS-1$
{
path.append('/');
}
@@ -103,7 +103,7 @@ public class SftpHostFile implements IHostFile {
}
public void renameTo(String newAbsolutePath) {
- int i = newAbsolutePath.lastIndexOf("/");
+ int i = newAbsolutePath.lastIndexOf("/"); //$NON-NLS-1$
if (i == -1) {
fName = newAbsolutePath;
}
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java
index bb3e45ba8a1..b2466dce0c4 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java
+++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/shell/SshHostShell.java
@@ -56,7 +56,7 @@ public class SshHostShell extends AbstractHostShell {
fStdinHandler = new PrintWriter(fChannel.getOutputStream());
fChannel.connect();
- writeToShell("cd "+initialWorkingDirectory);
+ writeToShell("cd "+initialWorkingDirectory); //$NON-NLS-1$
} catch(Exception e) {
//TODO Forward exception to RSE properly
e.printStackTrace();