93427 : NLS Drop for VE 1.1 M2
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer2.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer2.java
index fb87172..92ec00d 100644
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer2.java
+++ b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer2.java
@@ -10,7 +10,7 @@
*******************************************************************************/
/*
* $RCSfile: ILogRenderer2.java,v $
- * $Revision: 1.2 $ $Date: 2005/02/15 23:05:54 $
+ * $Revision: 1.3 $ $Date: 2005/05/18 21:58:34 $
*/
package org.eclipse.jem.util.logger.proxy;
@@ -31,13 +31,13 @@
* When Logger.setLevel(DEFAULT): restore to what the default level was.
* When log(...,DEFAULT): Log at the default level for the type of object.
*/
- static final Level DEFAULT = new Logger.LocalLevel("DEFAULT", Integer.MAX_VALUE-1);
+ static final Level DEFAULT = new Logger.LocalLevel("DEFAULT", Integer.MAX_VALUE-1); //$NON-NLS-1$
/**
* When log(...,TRACE) : Log only when in trace mode.
* Don't use in Logger.setLevel(). Has no meaning in that case.
*/
- static final Level TRACE = new Logger.LocalLevel("TRACE", Integer.MAX_VALUE-2);
+ static final Level TRACE = new Logger.LocalLevel("TRACE", Integer.MAX_VALUE-2); //$NON-NLS-1$
/**
* Log the throwable at the given level (if DEFAULT, use default level for a throwable).
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/Logger.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/Logger.java
index 465bfe4..a19d8a6 100644
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/Logger.java
+++ b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/Logger.java
@@ -10,7 +10,7 @@
*******************************************************************************/
/*
* $RCSfile: Logger.java,v $
- * $Revision: 1.2 $ $Date: 2005/02/15 23:05:54 $
+ * $Revision: 1.3 $ $Date: 2005/05/18 21:58:34 $
*/
package org.eclipse.jem.util.logger.proxy;
@@ -184,7 +184,7 @@
private void init() {
if (System.getProperty("debug") != null) //$NON-NLS-1$
fTraceMode = true;
- level = defaultLevel = Level.parse(System.getProperty("logLevel", Level.WARNING.getName()));
+ level = defaultLevel = Level.parse(System.getProperty("logLevel", Level.WARNING.getName())); //$NON-NLS-1$
try {
fLineSeperator = System.getProperty("line.separator"); // Diff on Win/Unix/Mac //$NON-NLS-1$
@@ -221,7 +221,7 @@
StringBuffer genMsg = new StringBuffer(msg.length()+16);
genMsg.append(fLineSeperator);
genMsg.append(getLevelHeader(aLevel));
- genMsg.append(": ");
+ genMsg.append(": "); //$NON-NLS-1$
genMsg.append(new Date());
indentMsg(msg, genMsg);
return genMsg.toString();
@@ -235,10 +235,10 @@
};
private static final String[] LEVEL_MARK = new String[] {
- "*** ERROR ***",
- "+++ Warning +++",
- "Info",
- "[Trace]"
+ "*** ERROR ***", //$NON-NLS-1$
+ "+++ Warning +++", //$NON-NLS-1$
+ "Info", //$NON-NLS-1$
+ "[Trace]" //$NON-NLS-1$
};
private String getLevelHeader(Level aLevel) {
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PerformanceMonitorUtil.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PerformanceMonitorUtil.java
index c24fcee..85520e9 100644
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PerformanceMonitorUtil.java
+++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PerformanceMonitorUtil.java
@@ -10,7 +10,7 @@
*******************************************************************************/
/*
* $RCSfile: PerformanceMonitorUtil.java,v $
- * $Revision: 1.4 $ $Date: 2005/02/15 23:04:14 $
+ * $Revision: 1.5 $ $Date: 2005/05/18 21:58:34 $
*/
package org.eclipse.jem.util;
import java.util.EventObject;
@@ -125,9 +125,9 @@
public static PerformanceMonitorUtil getMonitor() {
if (sharedMonitor == null) {
try {
- Class.forName("org.eclipse.perfmsr.core.PerfMsrCorePlugin"); // This just tests if the performance plugin is available. Throws
+ Class.forName("org.eclipse.perfmsr.core.PerfMsrCorePlugin"); // This just tests if the performance plugin is available. Throws //$NON-NLS-1$
// exception otherwise.
- Class presentClass = Class.forName("org.eclipse.jem.util.PresentPerformanceMonitor"); // Get the class we use wrapper it.
+ Class presentClass = Class.forName("org.eclipse.jem.util.PresentPerformanceMonitor"); // Get the class we use wrapper it. //$NON-NLS-1$
sharedMonitor = (PerformanceMonitorUtil) presentClass.newInstance();
if (!sharedMonitor.isValid())
sharedMonitor = null;
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java
index 3f3cfbe..94abc28 100644
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java
+++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java
@@ -10,7 +10,7 @@
*******************************************************************************/
/*
* $$RCSfile: RegistryReader.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
+ * $$Revision: 1.3 $$ $$Date: 2005/05/18 21:58:34 $$
*/
package org.eclipse.jem.util;
import org.eclipse.core.runtime.*;
@@ -150,7 +150,7 @@
*/
protected static Bundle getSystemBundle() {
if (systemBundle == null)
- systemBundle = Platform.getBundle("org.eclipse.osgi");
+ systemBundle = Platform.getBundle("org.eclipse.osgi"); //$NON-NLS-1$
return systemBundle;
}
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/TimerTests.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/TimerTests.java
index 453c5cf..a7612d6 100644
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/TimerTests.java
+++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/TimerTests.java
@@ -10,7 +10,7 @@
*******************************************************************************/
/*
* $RCSfile: TimerTests.java,v $
- * $Revision: 1.3 $ $Date: 2005/02/15 23:04:14 $
+ * $Revision: 1.4 $ $Date: 2005/05/18 21:58:34 $
*/
package org.eclipse.jem.util;
@@ -28,7 +28,7 @@
*/
public static TimerTests basicTest = new TimerTests();
- public static final String CURRENT_PARENT_ID = "current parent";
+ public static final String CURRENT_PARENT_ID = "current parent"; //$NON-NLS-1$
protected String currentParentId = null;
@@ -185,27 +185,27 @@
}
strb.setLength(0);
strb.append(step.currentTime);
- strb.append("\t");
+ strb.append("\t"); //$NON-NLS-1$
for (int j = 0; j < indent; j++) {
- strb.append(" ");
+ strb.append(" "); //$NON-NLS-1$
}
switch (step.type) {
case TimerStep.START:
- strb.append("Start");
+ strb.append("Start"); //$NON-NLS-1$
break;
case TimerStep.STOP:
- strb.append("Stop ");
+ strb.append("Stop "); //$NON-NLS-1$
break;
default:
break;
}
;
- strb.append(" \"");
+ strb.append(" \""); //$NON-NLS-1$
strb.append(step.id);
- strb.append("\" id(");
+ strb.append("\" id("); //$NON-NLS-1$
strb.append(step.threadId);
- strb.append(")");
+ strb.append(")"); //$NON-NLS-1$
Map startSteps = (Map) stepInfoByThreadId.get(threadId);
if (startSteps == null)
stepInfoByThreadId.put(threadId, startSteps = new HashMap());
@@ -221,18 +221,18 @@
if (startStep != null) {
int addchars = 100 - strb.length();
for (int j = 0; j < addchars; j++) {
- strb.append(" ");
+ strb.append(" "); //$NON-NLS-1$
}
long delta = step.currentTime - startStep.currentTime;
- strb.append(" Total = " + delta + " ms");
+ strb.append(" Total = " + delta + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
if (totalTime > 0)
- strb.append(" " + percentFormatter.format(delta/totalTime));
+ strb.append(" " + percentFormatter.format(delta/totalTime)); //$NON-NLS-1$
}
} else
- strb.append(" ---> Couldn't find Starting point for \"" + step.id + "\"");
+ strb.append(" ---> Couldn't find Starting point for \"" + step.id + "\""); //$NON-NLS-1$ //$NON-NLS-2$
}
if (i > 0 && (step.currentTime - prevStep.currentTime) > 0)
- System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --");
+ System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --"); //$NON-NLS-1$ //$NON-NLS-2$
prevStep = step;
System.out.println(strb);
break;
@@ -248,18 +248,18 @@
indent = threadIndent.intValue();
strb.setLength(0);
strb.append(step.currentTime);
- strb.append("\t");
+ strb.append("\t"); //$NON-NLS-1$
for (int j = 0; j < indent; j++) {
- strb.append(" ");
+ strb.append(" "); //$NON-NLS-1$
}
- strb.append("Start Accumulating");
- strb.append(" \"");
+ strb.append("Start Accumulating"); //$NON-NLS-1$
+ strb.append(" \""); //$NON-NLS-1$
strb.append(step.id);
- strb.append("\" id(");
+ strb.append("\" id("); //$NON-NLS-1$
strb.append(step.threadId);
- strb.append(")");
+ strb.append(")"); //$NON-NLS-1$
if (i > 0 && (step.currentTime - prevStep.currentTime) > 0)
- System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --");
+ System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --"); //$NON-NLS-1$ //$NON-NLS-2$
prevStep = step;
System.out.println(strb);
break;
@@ -304,45 +304,45 @@
indent = threadIndent.intValue();
strb.setLength(0);
strb.append(step.currentTime);
- strb.append("\t");
+ strb.append("\t"); //$NON-NLS-1$
for (int j = 0; j < indent; j++) {
- strb.append(" ");
+ strb.append(" "); //$NON-NLS-1$
}
- strb.append("Stop Accumulating");
- strb.append(" \"");
+ strb.append("Stop Accumulating"); //$NON-NLS-1$
+ strb.append(" \""); //$NON-NLS-1$
strb.append(step.id);
- strb.append("\" id(");
+ strb.append("\" id("); //$NON-NLS-1$
strb.append(step.threadId);
- strb.append(")");
+ strb.append(")"); //$NON-NLS-1$
cumSteps = (Map) stepInfoByThreadId.get(threadId);
if (cumSteps != null) {
Object info = cumSteps.get(step.id);
if (info instanceof CumulativeInformation) {
CumulativeInformation cumInfo = (CumulativeInformation) info;
if (cumInfo.currentCumulativeStep != null) {
- strb.append(" cumulative time=");
+ strb.append(" cumulative time="); //$NON-NLS-1$
strb.append(cumInfo.cumTime);
- strb.append(" cumulative count=");
+ strb.append(" cumulative count="); //$NON-NLS-1$
strb.append(cumInfo.cumCount);
- strb.append(" max time=");
+ strb.append(" max time="); //$NON-NLS-1$
strb.append(cumInfo.maxTime);
- strb.append(" min time=");
+ strb.append(" min time="); //$NON-NLS-1$
strb.append(cumInfo.minTime);
- strb.append(" avg time=");
+ strb.append(" avg time="); //$NON-NLS-1$
strb.append(((double) cumInfo.cumTime)/cumInfo.cumCount);
- strb.append(" NonZero times: cumulative ~0 count=");
+ strb.append(" NonZero times: cumulative ~0 count="); //$NON-NLS-1$
strb.append(cumInfo.cumCountNonZero);
if (cumInfo.cumCountNonZero != 0) {
- strb.append(" min ~0 time=");
+ strb.append(" min ~0 time="); //$NON-NLS-1$
strb.append(cumInfo.minTimeNonZero);
- strb.append(" avg ~0 time=");
+ strb.append(" avg ~0 time="); //$NON-NLS-1$
strb.append(((double) cumInfo.cumTime) / cumInfo.cumCountNonZero);
}
}
}
}
if (i > 0 && (step.currentTime - prevStep.currentTime) > 0)
- System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --");
+ System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --"); //$NON-NLS-1$ //$NON-NLS-2$
prevStep = step;
System.out.println(strb);
break;
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UIContextDetermination.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UIContextDetermination.java
index 443df5a..45e754b 100644
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UIContextDetermination.java
+++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UIContextDetermination.java
@@ -10,7 +10,7 @@
*******************************************************************************/
/*
* $$RCSfile: UIContextDetermination.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/02/15 23:04:14 $$
+ * $$Revision: 1.3 $$ $$Date: 2005/05/18 21:58:34 $$
*/
package org.eclipse.jem.util;
import java.util.HashMap;
@@ -31,9 +31,9 @@
private static final int UNKNOWN = 100;
- public static final String HEADLESS_CONTEXT_LITERAL = "Headless";
+ public static final String HEADLESS_CONTEXT_LITERAL = "Headless"; //$NON-NLS-1$
- public static final String UI_CONTEXT_LITERAL = "UI";
+ public static final String UI_CONTEXT_LITERAL = "UI"; //$NON-NLS-1$
public static final int HEADLESS_CONTEXT = 102;
@@ -64,11 +64,11 @@
result = contextSensitiveClass
.createExecutableExtension(UIContextDeterminationRegistryReader.UI_CONTEXT_SENSTIVE_CLASS_CLASSNAME_ATTR);
} catch (CoreException e) {
- Logger.getLogger().logError("Problem loading extension not found for key \"" + key + "\".");
+ Logger.getLogger().logError("Problem loading extension not found for key \"" + key + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
Logger.getLogger().logError(e);
}
if (result == null)
- Logger.getLogger().logError("Extension not found for key \"" + key + "\".");
+ Logger.getLogger().logError("Extension not found for key \"" + key + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
return result;
}
@@ -114,13 +114,13 @@
*/
private static class UIContextDeterminationRegistryReader extends RegistryReader {
- public static final String UI_CONTEXT_SENSTIVE_CLASS_ELEMENT = "uiContextSensitiveClass";
+ public static final String UI_CONTEXT_SENSTIVE_CLASS_ELEMENT = "uiContextSensitiveClass"; //$NON-NLS-1$
- public static final String UI_CONTEXT_SENSTIVE_CLASS_KEY_ATTR = "key";
+ public static final String UI_CONTEXT_SENSTIVE_CLASS_KEY_ATTR = "key"; //$NON-NLS-1$
- public static final String UI_CONTEXT_SENSTIVE_CLASS_CLASSNAME_ATTR = "className";
+ public static final String UI_CONTEXT_SENSTIVE_CLASS_CLASSNAME_ATTR = "className"; //$NON-NLS-1$
- public static final String UI_CONTEXT_SENSTIVE_CLASS_CONTEXT_ATTR = "context";
+ public static final String UI_CONTEXT_SENSTIVE_CLASS_CONTEXT_ATTR = "context"; //$NON-NLS-1$
public UIContextDeterminationRegistryReader() {
super(JEMUtilPlugin.PLUGIN_ID, JEMUtilPlugin.UI_CONTEXT_EXTENSION_POINT);
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/AbstractWorkBenchRenderer.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/AbstractWorkBenchRenderer.java
index 643c2f9..7df0b43 100644
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/AbstractWorkBenchRenderer.java
+++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/AbstractWorkBenchRenderer.java
@@ -10,7 +10,7 @@
*******************************************************************************/
/*
* $RCSfile: AbstractWorkBenchRenderer.java,v $
- * $Revision: 1.2 $ $Date: 2005/02/15 23:04:14 $
+ * $Revision: 1.3 $ $Date: 2005/05/18 21:58:34 $
*/
package org.eclipse.jem.util.logger.proxyrender;
@@ -79,7 +79,7 @@
* Is the console log for eclipse turned on to sysout. If true, then we shouldn't log to console anything already logged because Eclipse would of
* logged it for us. This comes from the -Declipse.consoleLog="true" which is the default when starting eclipse from PDE.
*/
- protected static final boolean consoleLogOn = "true".equals(System.getProperty(EclipseStarter.PROP_CONSOLE_LOG));
+ protected static final boolean consoleLogOn = "true".equals(System.getProperty(EclipseStarter.PROP_CONSOLE_LOG)); //$NON-NLS-1$
/*
* (non-Javadoc)
@@ -301,7 +301,7 @@
// Test again because we could be here simply due to trace mode, in which case we
// don't want to workbench log it.
if (fMyLogger.isLoggingLevel(level)) {
- Platform.getLog(fMyBundle).log(new Status(getStatusSeverity(level), fMyBundle.getSymbolicName(), 0, "Exception thrown.", t));
+ Platform.getLog(fMyBundle).log(new Status(getStatusSeverity(level), fMyBundle.getSymbolicName(), 0, "Exception thrown.", t)); //$NON-NLS-1$
result = WORKBENCH_DESCRIPTION;
if (fTraceMode)
log(fMyLogger.getGenericMsg(fMyLogger.exceptionToString(t), level), level, true);
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/EclipseLogger.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/EclipseLogger.java
index 4dcc8c9..781162c 100644
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/EclipseLogger.java
+++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/EclipseLogger.java
@@ -10,7 +10,7 @@
*******************************************************************************/
/*
* $RCSfile: EclipseLogger.java,v $
- * $Revision: 1.2 $ $Date: 2005/02/15 23:04:14 $
+ * $Revision: 1.3 $ $Date: 2005/05/18 21:58:34 $
*/
package org.eclipse.jem.util.logger.proxyrender;
@@ -56,9 +56,9 @@
public class EclipseLogger extends Logger {
public static final String DEBUG_TRACE_OPTION = "/debug/logtrace"; //$NON-NLS-1$
- public static final String DEBUG_TRACE_FILE_OPTION = "/debug/logtracefile";
- public static final String DEBUG_LOG_LEVEL_OPTION = "/debug/loglevel"; // The logging level to use when no Hyaedes. (which we don't support at this time).
- public static final String DEFAULT_OPTION = "default"; // If option value is this, then the value from WTP Common plugin options will be used for both logTrace and logLevel.
+ public static final String DEBUG_TRACE_FILE_OPTION = "/debug/logtracefile"; //$NON-NLS-1$
+ public static final String DEBUG_LOG_LEVEL_OPTION = "/debug/loglevel"; // The logging level to use when no Hyaedes. (which we don't support at this time). //$NON-NLS-1$
+ public static final String DEFAULT_OPTION = "default"; // If option value is this, then the value from WTP Common plugin options will be used for both logTrace and logLevel. //$NON-NLS-1$
/**
* Return a logger based upon the Plugin.
@@ -88,17 +88,17 @@
logger = getLogger(id); // Create one, we will now customize it.
String pluginOption = Platform.getDebugOption(id + DEBUG_TRACE_OPTION);
- if (pluginOption == null || "default".equalsIgnoreCase(pluginOption))
+ if (pluginOption == null || "default".equalsIgnoreCase(pluginOption)) //$NON-NLS-1$
pluginOption = Platform.getDebugOption(JEMUtilPlugin.getDefault().getBundle().getSymbolicName() + DEBUG_TRACE_OPTION);
- boolean logTrace = "true".equalsIgnoreCase(pluginOption);
+ boolean logTrace = "true".equalsIgnoreCase(pluginOption); //$NON-NLS-1$
pluginOption = Platform.getDebugOption(id + DEBUG_TRACE_FILE_OPTION);
- if (pluginOption == null || "default".equalsIgnoreCase(pluginOption))
+ if (pluginOption == null || "default".equalsIgnoreCase(pluginOption)) //$NON-NLS-1$
pluginOption = Platform.getDebugOption(JEMUtilPlugin.getDefault().getBundle().getSymbolicName() + DEBUG_TRACE_FILE_OPTION);
- boolean logTraceFile = "true".equalsIgnoreCase(pluginOption);
+ boolean logTraceFile = "true".equalsIgnoreCase(pluginOption); //$NON-NLS-1$
pluginOption = Platform.getDebugOption(id + DEBUG_LOG_LEVEL_OPTION);
- if (pluginOption == null || "default".equalsIgnoreCase(pluginOption))
+ if (pluginOption == null || "default".equalsIgnoreCase(pluginOption)) //$NON-NLS-1$
pluginOption = Platform.getDebugOption(JEMUtilPlugin.getDefault().getBundle().getSymbolicName() + DEBUG_LOG_LEVEL_OPTION);
Level logLevel = Level.WARNING;
