Externalize strings from Tanya.

debug/org.eclipse.cdt.debug.mi.core/ChangeLog

@@ -1,3 +1,9 @@
+2004-03-12 Tanya Wolff
+
+	Marked strings as non-translatable.
+	
+	* mi/
+	
 2004-03-01 Alain Magloire
 
 	Reog. New source browser.

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CLICommand.java

@@ -14,7 +14,7 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class CLICommand extends Command
 {
 
-	String operation = "";
+	String operation = ""; //$NON-NLS-1$
 
 	public CLICommand(String oper) {
 		operation = oper;
@@ -34,9 +34,9 @@ public class CLICommand extends Command
 	 * @return the text representation of this command
 	 */
 	public String toString(){
-		String str = getToken() + " " + operation;
+		String str = getToken() + " " + operation; //$NON-NLS-1$
-		if (str.endsWith("\n"))
+		if (str.endsWith("\n")) //$NON-NLS-1$
 			return str;
-		return str + "\n";
+		return str + "\n"; //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/CygwinMIEnvironmentDirectory.java

@@ -28,10 +28,10 @@ public class CygwinMIEnvironmentDirectory extends MIEnvironmentDirectory {
 			ByteArrayOutputStream output = new ByteArrayOutputStream();
 
 			launcher.execute(
-				new Path("cygpath"),
+				new Path("cygpath"), //$NON-NLS-1$
-				new String[] { "-u", paths[i] },
+				new String[] { "-u", paths[i] }, //$NON-NLS-1$
 				new String[0],
-				new Path("."));
+				new Path(".")); //$NON-NLS-1$
 			if (launcher.waitAndRead(output, output) != CommandLauncher.OK)
 				newpaths[i] = paths[i];
 			else

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakAfter.java

@@ -21,7 +21,7 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIBreakAfter extends MICommand
 {
 	public MIBreakAfter(int brknum, int count) {
-		super("-break-after",new String[]{Integer.toString(brknum),
+		super("-break-after",new String[]{Integer.toString(brknum), //$NON-NLS-1$
 		 	 Integer.toString(count)});
 		 
 	}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakCondition.java

@@ -18,7 +18,7 @@ package org.eclipse.cdt.debug.mi.core.command;
  */
 public class MIBreakCondition extends MICommand {
 	public MIBreakCondition(int brknum, String expr) {
-		super("-break-condition", new String[] { Integer.toString(brknum), expr });
+		super("-break-condition", new String[] { Integer.toString(brknum), expr }); //$NON-NLS-1$
 	}
 
 	/**

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakDelete.java

@@ -20,7 +20,7 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIBreakDelete extends MICommand
 {
 	public MIBreakDelete (int[] array) {
-		super("-break-delete");
+		super("-break-delete"); //$NON-NLS-1$
 		if (array != null && array.length > 0) {
 			String[] brkids = new String[array.length];
 			for (int i = 0; i < array.length; i++) {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakDisable.java

@@ -19,7 +19,7 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIBreakDisable extends MICommand
 {
 	public MIBreakDisable (int[] array) {
-		super("-break-disable");
+		super("-break-disable"); //$NON-NLS-1$
 		if (array != null && array.length > 0) {
 			String[] brkids = new String[array.length];
 			for (int i = 0; i < array.length; i++) {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakEnable.java

@@ -18,7 +18,7 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIBreakEnable extends MICommand
 {
 	public MIBreakEnable (int[] array) {
-		super("-break-enable");
+		super("-break-enable"); //$NON-NLS-1$
 		if (array != null && array.length > 0) {
 			String[] brkids = new String[array.length];
 			for (int i = 0; i < array.length; i++) {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakInsert.java

@@ -61,7 +61,7 @@ public class MIBreakInsert extends MICommand
 
 	public MIBreakInsert(boolean isTemporary, boolean isHardware,
 			 String condition, int ignoreCount, String line) {
-		super("-break-insert");
+		super("-break-insert"); //$NON-NLS-1$
 
 		int i = 0;
 		if (isTemporary || isHardware) {
@@ -78,20 +78,20 @@ public class MIBreakInsert extends MICommand
 		
 		i = 0;
 		if (isTemporary) {
-			opts[i] = "-t";
+			opts[i] = "-t"; //$NON-NLS-1$
 			i++;
 		} else if (isHardware) {
-			opts[i] = "-h";
+			opts[i] = "-h"; //$NON-NLS-1$
 			i++;
 		}
 		if (condition != null && condition.length() > 0) {
-			opts[i] = "-c";
+			opts[i] = "-c"; //$NON-NLS-1$
 			i++;
 			opts[i] = condition;
 			i++;
 		}
 		if (ignoreCount > 0) {
-			opts[i] = "-i";
+			opts[i] = "-i"; //$NON-NLS-1$
 			i++;
 			opts[i] = Integer.toString(ignoreCount);
 			i++;

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java

@@ -47,7 +47,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIOutput;
 public class MIBreakList extends MICommand
 {
 	public MIBreakList () {
-		super("-break-list");
+		super("-break-list"); //$NON-NLS-1$
 	}
 
 	public MIBreakListInfo getMIBreakListInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIBreakWatch.java

@@ -27,12 +27,12 @@ import org.eclipse.cdt.debug.mi.core.output.MIOutput;
 public class MIBreakWatch extends MICommand
 {
 	public MIBreakWatch (boolean access, boolean read, String expr) {
-		super("-break-watch");
+		super("-break-watch");//$NON-NLS-1$
 		String[] opts = null;
 		if (access) {
-			opts = new String[] {"-a"};
+			opts = new String[] {"-a"}; //$NON-NLS-1$
 		} else if (read) {
-			opts = new String[] {"-r"};
+			opts = new String[] {"-r"}; //$NON-NLS-1$
 		}
 		if (opts != null) {
 			setOptions(opts);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MICommand.java

@@ -14,7 +14,7 @@ public class MICommand extends Command {
 	final String[] empty = new String[0];
 	String[] options = empty;
 	String[] parameters = empty;
-	String operation = "";
+	String operation = ""; //$NON-NLS-1$
 
 	public MICommand(String oper) {
 		this.operation = oper;
@@ -95,7 +95,7 @@ public class MICommand extends Command {
 			// Add a "--" separator if any parameters start with "-"
 			if (options != null && options.length > 0) {
 				for (int i = 0; i < parameters.length; i++) {
-					if (parameters[i].startsWith("-")) {
+					if (parameters[i].startsWith("-")) { //$NON-NLS-1$
 						buffer.append('-').append('-');
 						break;
 					}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataDisassemble.java

@@ -67,22 +67,22 @@ import org.eclipse.cdt.debug.mi.core.output.MIOutput;
 public class MIDataDisassemble extends MICommand 
 {
 	public MIDataDisassemble(String start, String end, boolean mode) {
-		super("-data-disassemble");
+		super("-data-disassemble"); //$NON-NLS-1$
-		setOptions(new String[]{"-s", start, "-e", end});
+		setOptions(new String[]{"-s", start, "-e", end}); //$NON-NLS-1$ //$NON-NLS-2$
-		String mixed = "0";
+		String mixed = "0"; //$NON-NLS-1$
 		if (mode) {
-			mixed = "1";
+			mixed = "1"; //$NON-NLS-1$
 		}
 		setParameters(new String[]{mixed});
 	}
 
 	public MIDataDisassemble(String file, int linenum, int lines, boolean mode) {
-		super("-data-disassemble");
+		super("-data-disassemble"); //$NON-NLS-1$
-		setOptions(new String[]{"-f", file, "-l",
+		setOptions(new String[]{"-f", file, "-l", //$NON-NLS-1$ //$NON-NLS-2$
-			 Integer.toString(linenum), "-n", Integer.toString(lines)});
+			 Integer.toString(linenum), "-n", Integer.toString(lines)}); //$NON-NLS-1$
-		String mixed = "0";
+		String mixed = "0"; //$NON-NLS-1$
 		if (mode) {
-			mixed = "1";
+			mixed = "1"; //$NON-NLS-1$
 		}
 		setParameters(new String[]{mixed});	
 	}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataEvaluateExpression.java

@@ -23,7 +23,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIOutput;
 public class MIDataEvaluateExpression extends MICommand 
 {
 	public MIDataEvaluateExpression(String expr) {
-		super("-data-evaluate-expression", new String[]{expr});
+		super("-data-evaluate-expression", new String[]{expr}); //$NON-NLS-1$
 	}
 
 	public MIDataEvaluateExpressionInfo getMIDataEvaluateExpressionInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListChangedRegisters.java

@@ -21,7 +21,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIOutput;
 public class MIDataListChangedRegisters extends MICommand 
 {
 	public MIDataListChangedRegisters() {
-		super("-data-list-changed-registers" );
+		super("-data-list-changed-registers" ); //$NON-NLS-1$
 	}
 
 	public MIDataListChangedRegistersInfo getMIDataListChangedRegistersInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterNames.java

@@ -26,7 +26,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIOutput;
 public class MIDataListRegisterNames extends MICommand 
 {
 	public MIDataListRegisterNames() {
-		super("-data-list-register-names");
+		super("-data-list-register-names"); //$NON-NLS-1$
 	}
 
 	public MIDataListRegisterNames(int [] regnos) {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataListRegisterValues.java

@@ -30,33 +30,33 @@ public class MIDataListRegisterValues extends MICommand
 	}
 
 	public MIDataListRegisterValues(int fmt, int [] regnos) {
-		super("-data-list-register-values");
+		super("-data-list-register-values"); //$NON-NLS-1$
 
-		String format = "x";
+		String format = "x"; //$NON-NLS-1$
 		switch (fmt) {
 			case MIFormat.NATURAL:
-				format = "N";
+				format = "N"; //$NON-NLS-1$
 			break;
 
 			case MIFormat.RAW:
-				format = "r";
+				format = "r"; //$NON-NLS-1$
 			break;
 
 			case MIFormat.DECIMAL:
-				format = "d";
+				format = "d"; //$NON-NLS-1$
 			break;
 
 			case MIFormat.BINARY:
-				format = "t";
+				format = "t"; //$NON-NLS-1$
 			break;
 
 			case MIFormat.OCTAL:
-				format = "o";
+				format = "o"; //$NON-NLS-1$
 			break;
 
 			case MIFormat.HEXADECIMAL:
 			default:
-				format = "x";
+				format = "x"; //$NON-NLS-1$
 			break;
 		}
 

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataReadMemory.java

@@ -60,52 +60,52 @@ public class MIDataReadMemory extends MICommand {
 		int rows,
 		int cols,
 		Character asChar) {
-		super("-data-read-memory");
+		super("-data-read-memory"); //$NON-NLS-1$
 		if (offset != 0) {
-			setOptions(new String[] { "-o", Long.toString(offset)});
+			setOptions(new String[] { "-o", Long.toString(offset)}); //$NON-NLS-1$
 		}
 
-		String format = "x";
+		String format = "x"; //$NON-NLS-1$
 		switch (wordFormat) {
 			case MIFormat.UNSIGNED :
-				format = "u";
+				format = "u"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.FLOAT :
-				format = "f";
+				format = "f"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.ADDRESS :
-				format = "a";
+				format = "a"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.INSTRUCTION :
-				format = "i";
+				format = "i"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.CHAR :
-				format = "c";
+				format = "c"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.STRING :
-				format = "s";
+				format = "s"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.DECIMAL :
-				format = "d";
+				format = "d"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.BINARY :
-				format = "t";
+				format = "t"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.OCTAL :
-				format = "o";
+				format = "o"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.HEXADECIMAL :
 			default :
-				format = "x";
+				format = "x"; //$NON-NLS-1$
 				break;
 		}
 

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataWriteMemory.java

@@ -37,53 +37,53 @@ public class MIDataWriteMemory extends MICommand {
 	public MIDataWriteMemory(long offset, String address, int wordFormat, int wordSize,
 		String value) {
 
-		super ("-data-write-memory");
+		super ("-data-write-memory"); //$NON-NLS-1$
 
 		if (offset != 0) {
-			setOptions(new String[] { "-o", Long.toString(offset)});
+			setOptions(new String[] { "-o", Long.toString(offset)}); //$NON-NLS-1$
 		}
 
-		String format = "x";
+		String format = "x"; //$NON-NLS-1$
 		switch (wordFormat) {
 			case MIFormat.UNSIGNED :
-				format = "u";
+				format = "u"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.FLOAT :
-				format = "f";
+				format = "f"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.ADDRESS :
-				format = "a";
+				format = "a"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.INSTRUCTION :
-				format = "i";
+				format = "i"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.CHAR :
-				format = "c";
+				format = "c"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.STRING :
-				format = "s";
+				format = "s"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.DECIMAL :
-				format = "d";
+				format = "d"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.BINARY :
-				format = "t";
+				format = "t"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.OCTAL :
-				format = "o";
+				format = "o"; //$NON-NLS-1$
 				break;
 
 			case MIFormat.HEXADECIMAL :
 			default :
-				format = "x";
+				format = "x"; //$NON-NLS-1$
 				break;
 		}
 

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIDataWriteRegisterValues.java

@@ -21,33 +21,33 @@ import org.eclipse.cdt.debug.mi.core.MIFormat;
 public class MIDataWriteRegisterValues extends MICommand {
 
 	public MIDataWriteRegisterValues(int fmt, int[] regnos, String[] values) {
-		super("-data-write-register-values");
+		super("-data-write-register-values"); //$NON-NLS-1$
 
-		String format = "x";
+		String format = "x"; //$NON-NLS-1$
 		switch (fmt) {
 			case MIFormat.NATURAL:
-				format = "N";
+				format = "N"; //$NON-NLS-1$
 			break;
 
 			case MIFormat.RAW:
-				format = "r";
+				format = "r"; //$NON-NLS-1$
 			break;
 
 			case MIFormat.DECIMAL:
-				format = "d";
+				format = "d"; //$NON-NLS-1$
 			break;
 
 			case MIFormat.BINARY:
-				format = "t";
+				format = "t"; //$NON-NLS-1$
 			break;
 
 			case MIFormat.OCTAL:
-				format = "o";
+				format = "o"; //$NON-NLS-1$
 			break;
 
 			case MIFormat.HEXADECIMAL:
 			default:
-				format = "x";
+				format = "x"; //$NON-NLS-1$
 			break;
 		}
 

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentCD.java

@@ -18,6 +18,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIEnvironmentCD extends MICommand 
 {
 	public MIEnvironmentCD(String path) {
-		super("-environment-cd", new String[]{path});
+		super("-environment-cd", new String[]{path}); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentPWD.java

@@ -21,7 +21,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIOutput;
 public class MIEnvironmentPWD extends MICommand 
 {
 	public MIEnvironmentPWD() {
-		super("-environment-pwd");
+		super("-environment-pwd"); //$NON-NLS-1$
 	}
 
 	public MIInfo getMIInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIEnvironmentPath.java

@@ -16,6 +16,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIEnvironmentPath extends MICommand 
 {
 	public MIEnvironmentPath(String[] paths) {
-		super("-environment-path", paths);
+		super("-environment-path", paths); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecAbort.java

@@ -18,6 +18,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecAbort extends CLICommand 
 {
 	public MIExecAbort() {
-		super("kill");
+		super("kill"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecContinue.java

@@ -17,6 +17,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecContinue extends MICommand 
 {
 	public MIExecContinue() {
-		super("-exec-continue");
+		super("-exec-continue"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecFinish.java

@@ -18,6 +18,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecFinish extends MICommand 
 {
 	public MIExecFinish() {
-		super("-exec-finish");
+		super("-exec-finish"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecInterrupt.java

@@ -21,6 +21,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecInterrupt extends MICommand 
 {
 	public MIExecInterrupt() {
-		super("-exec-interrupt");
+		super("-exec-interrupt"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecNext.java

@@ -17,6 +17,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecNext extends MICommand 
 {
 	public MIExecNext() {
-		super("-exec-next");
+		super("-exec-next"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecNextInstruction.java

@@ -19,6 +19,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecNextInstruction extends MICommand 
 {
 	public MIExecNextInstruction() {
-		super("-exec-next-instruction");
+		super("-exec-next-instruction"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecReturn.java

@@ -19,6 +19,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecReturn extends MICommand 
 {
 	public MIExecReturn() {
-		super("-exec-return");
+		super("-exec-return"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecRun.java

@@ -18,10 +18,10 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecRun extends MICommand 
 {
 	public MIExecRun() {
-		super("-exec-run");
+		super("-exec-run"); //$NON-NLS-1$
 	}
 	
 	public MIExecRun(String[] args) {
-		super("-exec-run", args);
+		super("-exec-run", args); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecStep.java

@@ -19,6 +19,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecStep extends MICommand 
 {
 	public MIExecStep() {
-		super("-exec-step");
+		super("-exec-step"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecStepInstruction.java

@@ -22,6 +22,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecStepInstruction extends MICommand 
 {
 	public MIExecStepInstruction() {
-		super("-exec-step-instruction");
+		super("-exec-step-instruction"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIExecUntil.java

@@ -20,10 +20,10 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIExecUntil extends MICommand 
 {
 	public MIExecUntil() {
-		super("-exec-until");
+		super("-exec-until"); //$NON-NLS-1$
 	}
 
 	public MIExecUntil(String loc) {
-		super("-exec-until", new String[]{loc});
+		super("-exec-until", new String[]{loc}); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIFileExecFile.java

@@ -20,6 +20,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIFileExecFile extends MICommand 
 {
 	public MIFileExecFile(String file) {
-		super("-file-exec-file", new String[]{file});
+		super("-file-exec-file", new String[]{file}); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIFileSymbolFile.java

@@ -18,6 +18,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIFileSymbolFile extends MICommand 
 {
 	public MIFileSymbolFile(String file) {
-		super("-file-symbol-file", new String[]{file});
+		super("-file-symbol-file", new String[]{file}); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBExit.java

@@ -16,6 +16,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIGDBExit extends MICommand 
 {
 	public MIGDBExit() {
-		super("-gdb-exit");
+		super("-gdb-exit"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSet.java

@@ -16,6 +16,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIGDBSet extends MICommand 
 {
 	public MIGDBSet(String[] params) {
-		super("-gdb-set", params);
+		super("-gdb-set", params); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetAutoSolib.java

@@ -15,6 +15,6 @@ package org.eclipse.cdt.debug.mi.core.command;
  */
 public class MIGDBSetAutoSolib extends MIGDBSet {
 	public MIGDBSetAutoSolib(boolean isSet) {
-		super(new String[] {"auto-solib-add", (isSet) ? "on" : "off"});
+		super(new String[] {"auto-solib-add", (isSet) ? "on" : "off"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetSolibSearchPath.java

@@ -17,7 +17,7 @@ public class MIGDBSetSolibSearchPath extends MIGDBSet {
 	public MIGDBSetSolibSearchPath(String[] paths) {
 		super(paths);
 		// Overload the parameter
-		String sep = System.getProperty("path.separator", ":");
+		String sep = System.getProperty("path.separator", ":"); //$NON-NLS-1$ //$NON-NLS-2$
 		StringBuffer buffer = new StringBuffer();
 		for (int i = 0; i < paths.length; i++) {
 			if (buffer.length() == 0) {
@@ -26,7 +26,7 @@ public class MIGDBSetSolibSearchPath extends MIGDBSet {
 				buffer.append(sep).append(paths[i]);
 			}
 		}
-		String[] p = new String [] {"solib-search-path", buffer.toString()};
+		String[] p = new String [] {"solib-search-path", buffer.toString()}; //$NON-NLS-1$
 		setParameters(p);
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBSetStopOnSolibEvents.java

@@ -15,6 +15,6 @@ package org.eclipse.cdt.debug.mi.core.command;
  */
 public class MIGDBSetStopOnSolibEvents extends MIGDBSet {
 	public MIGDBSetStopOnSolibEvents(boolean isSet) {
-		super(new String[] {"stop-on-solib-events", (isSet) ? "1" : "0"});
+		super(new String[] {"stop-on-solib-events", (isSet) ? "1" : "0"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShow.java

@@ -20,7 +20,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIOutput;
  */
 public class MIGDBShow extends MICommand {
 	public MIGDBShow(String[] params) {
-		super("-gdb-show", params);
+		super("-gdb-show", params); //$NON-NLS-1$
 	}
 
 	public MIGDBShowInfo getMIGDBShowInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIGDBShowExitCode.java

@@ -22,7 +22,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIOutput;
 public class MIGDBShowExitCode extends MIDataEvaluateExpression {
 
 	public MIGDBShowExitCode() {
-		super("$_exitcode");
+		super("$_exitcode"); //$NON-NLS-1$
 	}
 
 	public MIGDBShowExitCodeInfo getMIGDBShowExitCodeInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIPType.java

@@ -19,7 +19,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIPTypeInfo;
 public class MIPType extends CLICommand 
 {
 	public MIPType(String var) {
-		super("ptype " + var);
+		super("ptype " + var); //$NON-NLS-1$
 	}
 
 	public MIPTypeInfo getMIPtypeInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MISharedLibrary.java

@@ -16,10 +16,10 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MISharedLibrary extends CLICommand {
 
 	public MISharedLibrary() {
-		super("sharedlibrary");
+		super("sharedlibrary"); //$NON-NLS-1$
 	}
 
 	public MISharedLibrary(String name) {
-		super("sharedlibrary " + name);
+		super("sharedlibrary " + name); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackInfoDepth.java

@@ -22,11 +22,11 @@ import org.eclipse.cdt.debug.mi.core.output.MIStackInfoDepthInfo;
 public class MIStackInfoDepth extends MICommand 
 {
 	public MIStackInfoDepth() {
-		super("-stack-info-depth");
+		super("-stack-info-depth"); //$NON-NLS-1$
 	}
 
 	public MIStackInfoDepth(int maxDepth) {
-		super("-stack-info-depth", new String[]{Integer.toString(maxDepth)});
+		super("-stack-info-depth", new String[]{Integer.toString(maxDepth)}); //$NON-NLS-1$
 	}
 
 	public MIStackInfoDepthInfo getMIStackInfoDepthInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListArguments.java

@@ -28,21 +28,21 @@ import org.eclipse.cdt.debug.mi.core.output.MIStackListArgumentsInfo;
 public class MIStackListArguments extends MICommand 
 {
 	public MIStackListArguments(boolean showValues) {
-		super("-stack-list-arguments");
+		super("-stack-list-arguments"); //$NON-NLS-1$
 		if (showValues) {
-			setParameters(new String[]{"1"});
+			setParameters(new String[]{"1"}); //$NON-NLS-1$
 		} else {
-			setParameters(new String[]{"0"});
+			setParameters(new String[]{"0"}); //$NON-NLS-1$
 		}
 	}
 
 	public MIStackListArguments(boolean showValues, int low, int high) {
-		super("-stack-list-arguments");
+		super("-stack-list-arguments"); //$NON-NLS-1$
 		String[] params = new String[3];
 		if (showValues) {
-			params[0] = "1";
+			params[0] = "1"; //$NON-NLS-1$
 		} else {
-			params[0] = "0";
+			params[0] = "0"; //$NON-NLS-1$
 		}
 		params[1] = Integer.toString(low);
 		params[2] = Integer.toString(high);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java

@@ -43,11 +43,11 @@ import org.eclipse.cdt.debug.mi.core.output.MIStackListFramesInfo;
 public class MIStackListFrames extends MICommand 
 {
 	public MIStackListFrames() {
-		super("-stack-list-frames");
+		super("-stack-list-frames"); //$NON-NLS-1$
 	}
 
 	public MIStackListFrames(int low, int high) {
-		super("-stack-list-frames", new String[]{Integer.toString(low),
+		super("-stack-list-frames", new String[]{Integer.toString(low), //$NON-NLS-1$
 			Integer.toString(high)});
 	}
 

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListLocals.java

@@ -23,11 +23,11 @@ import org.eclipse.cdt.debug.mi.core.output.MIStackListLocalsInfo;
 public class MIStackListLocals extends MICommand 
 {
 	public MIStackListLocals(boolean printValues) {
-		super("-stack-list-locals");
+		super("-stack-list-locals"); //$NON-NLS-1$
 		if (printValues) {
-			setParameters(new String[]{"1"});
+			setParameters(new String[]{"1"}); //$NON-NLS-1$
 		} else {
-			setParameters(new String[]{"0"});
+			setParameters(new String[]{"0"}); //$NON-NLS-1$
 		}
 	}
 

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackSelectFrame.java

@@ -19,6 +19,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIStackSelectFrame extends MICommand 
 {
 	public MIStackSelectFrame(int frameNum) {
-		super("-stack-select-frame", new String[]{Integer.toString(frameNum)});
+		super("-stack-select-frame", new String[]{Integer.toString(frameNum)}); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MITargetAttach.java

@@ -17,6 +17,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MITargetAttach extends CLICommand 
 {
 	public MITargetAttach(int pid) {
-		super("attach " + Integer.toString(pid));
+		super("attach " + Integer.toString(pid)); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MITargetDetach.java

@@ -17,6 +17,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MITargetDetach extends MICommand 
 {
 	public MITargetDetach() {
-		super("-target-detach");
+		super("-target-detach"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MITargetDownload.java

@@ -31,6 +31,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MITargetDownload extends MICommand 
 {
 	public MITargetDownload() {
-		super("-target-download");
+		super("-target-download"); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadListIds.java

@@ -22,7 +22,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIThreadListIdsInfo;
 public class MIThreadListIds extends MICommand 
 {
 	public MIThreadListIds() {
-		super("-thread-list-ids");
+		super("-thread-list-ids"); //$NON-NLS-1$
 	}
 
 	public MIThreadListIdsInfo getMIThreadListIdsInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java

@@ -22,7 +22,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIThreadSelectInfo;
 public class MIThreadSelect extends MICommand 
 {
 	public MIThreadSelect(int threadNum) {
-		super("-thread-select", new String[]{Integer.toString(threadNum)});
+		super("-thread-select", new String[]{Integer.toString(threadNum)}); //$NON-NLS-1$
 	}
 
 	public MIThreadSelectInfo getMIThreadSelectInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarAssign.java

@@ -17,6 +17,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIVarAssign extends MICommand 
 {
 	public MIVarAssign(String name, String expression) {
-		super("-var-assign", new String[]{name, expression});
+		super("-var-assign", new String[]{name, expression}); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java

@@ -43,15 +43,15 @@ import org.eclipse.cdt.debug.mi.core.output.MIVarCreateInfo;
 public class MIVarCreate extends MICommand 
 {
 	public MIVarCreate(String expression) {
-		this("-", "*", expression);
+		this("-", "*", expression); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	public MIVarCreate(String name, String expression) {
-		this(name, "*", expression);
+		this(name, "*", expression); //$NON-NLS-1$
 	}
 
 	public MIVarCreate(String name, String frameAddr, String expression) {
-		super("-var-create", new String[]{name, frameAddr, expression});
+		super("-var-create", new String[]{name, frameAddr, expression}); //$NON-NLS-1$
 	}
 
 	public MIVarCreateInfo getMIVarCreateInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java

@@ -24,7 +24,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIVarEvaluateExpressionInfo;
  */
 public class MIVarEvaluateExpression extends MICommand {
 	public MIVarEvaluateExpression(String expression) {
-		super("-var-evaluate-expression", new String[] { expression });
+		super("-var-evaluate-expression", new String[] { expression }); //$NON-NLS-1$
 	}
 
 	public MIVarEvaluateExpressionInfo getMIVarEvaluateExpressionInfo()

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoExpression.java

@@ -25,7 +25,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIVarInfoExpressionInfo;
 public class MIVarInfoExpression extends MICommand 
 {
 	public MIVarInfoExpression(String name) {
-		super("-var-info-expression", new String[]{name});
+		super("-var-info-expression", new String[]{name}); //$NON-NLS-1$
 	}
 	
 	public MIVarInfoExpressionInfo getMIVarInfoExpressionInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoNumChildren.java

@@ -23,7 +23,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIVarInfoNumChildrenInfo;
 public class MIVarInfoNumChildren extends MICommand 
 {
 	public MIVarInfoNumChildren(String name) {
-		super("-var-info-num-children", new String[]{name});
+		super("-var-info-num-children", new String[]{name}); //$NON-NLS-1$
 	}
 
 	public MIVarInfoNumChildrenInfo getMIVarInfoNumChildrenInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarInfoType.java

@@ -19,6 +19,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIVarInfoType extends MICommand 
 {
 	public MIVarInfoType(String name) {
-		super("-var-info-type", new String[]{name});
+		super("-var-info-type", new String[]{name}); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java

@@ -24,7 +24,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIVarListChildrenInfo;
 public class MIVarListChildren extends MICommand 
 {
 	public MIVarListChildren(String name) {
-		super("-var-list-children", new String[]{name});
+		super("-var-list-children", new String[]{name}); //$NON-NLS-1$
 	}
 
 	public MIVarListChildrenInfo getMIVarListChildrenInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarSetFormat.java

@@ -24,7 +24,7 @@ import org.eclipse.cdt.debug.mi.core.MIFormat;
 public class MIVarSetFormat extends MICommand 
 {
 	public MIVarSetFormat(String name, int fmt) {
-		super("-var-set-format");
+		super("-var-set-format"); //$NON-NLS-1$
 		String format = "hexadecimal";
 		switch (fmt) {
 		case MIFormat.NATURAL:

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java

@@ -25,7 +25,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIVarShowAttributesInfo;
 public class MIVarShowAttributes extends MICommand 
 {
 	public MIVarShowAttributes(String name) {
-		super("-var-show-attributes", new String[]{name});
+		super("-var-show-attributes", new String[]{name}); //$NON-NLS-1$
 	}
 
 	public MIVarShowAttributesInfo getMIVarShowAttributesInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarShowFormat.java

@@ -19,6 +19,6 @@ package org.eclipse.cdt.debug.mi.core.command;
 public class MIVarShowFormat extends MICommand 
 {
 	public MIVarShowFormat(String name) {
-		super("-var-show-format", new String[]{name});
+		super("-var-show-format", new String[]{name}); //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java

@@ -23,7 +23,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIVarUpdateInfo;
 public class MIVarUpdate extends MICommand {
 
 	public MIVarUpdate() {
-		this("*");
+		this("*"); //$NON-NLS-1$
 	}
 	
 	public MIVarUpdate(String name) {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIWhatis.java

@@ -19,7 +19,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIWhatisInfo;
 public class MIWhatis extends CLICommand 
 {
 	public MIWhatis(String var) {
-		super("whatis " + var);
+		super("whatis " + var); //$NON-NLS-1$
 	}
 
 	public MIWhatisInfo getMIWhatisInfo() throws MIException {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIBreakpointHitEvent.java

@@ -61,23 +61,23 @@ public class MIBreakpointHitEvent extends MIStoppedEvent {
 			for (int i = 0; i < results.length; i++) {
 				String var = results[i].getVariable();
 				MIValue value = results[i].getMIValue();
-				String str = "";
+				String str = ""; //$NON-NLS-1$
 				if (value != null && value instanceof MIConst) {
 					str = ((MIConst)value).getString();
 				}
 
-				if (var.equals("bkptno")) {
+				if (var.equals("bkptno")) { //$NON-NLS-1$
 					try {
 						bkptno = Integer.parseInt(str.trim());
 					} catch (NumberFormatException e) {
 					}
-				} else if (var.equals("thread-id")) {
+				} else if (var.equals("thread-id")) { //$NON-NLS-1$
 					try {
 						int id = Integer.parseInt(str.trim());
 						setThreadId(id);
 					} catch (NumberFormatException e) {
 					}
-				} else if (var.equals("frame")) {
+				} else if (var.equals("frame")) { //$NON-NLS-1$
 					if (value instanceof MITuple) {
 						frame = new MIFrame((MITuple)value);
 					}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIErrorEvent.java

@@ -23,8 +23,8 @@ import org.eclipse.cdt.debug.mi.core.output.MIValue;
  */
 public class MIErrorEvent extends MIStoppedEvent {
 
-	String msg = "";
+	String msg = ""; //$NON-NLS-1$
-	String log = "";
+	String log = ""; //$NON-NLS-1$
 	MIOOBRecord[] oobs;
 
 	public MIErrorEvent(MIResultRecord rr, MIOOBRecord[] o) {
@@ -49,12 +49,12 @@ public class MIErrorEvent extends MIStoppedEvent {
 				for (int i = 0; i < results.length; i++) {
 					String var = results[i].getVariable();
 					MIValue value = results[i].getMIValue();
-					String str = "";
+					String str = ""; //$NON-NLS-1$
 					if (value instanceof MIConst) {
 						str = ((MIConst)value).getString();
 					}
 
-					if (var.equals("msg")) {
+					if (var.equals("msg")) { //$NON-NLS-1$
 						msg = str;
 					}
 				}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java

@@ -18,8 +18,8 @@ import org.eclipse.cdt.debug.mi.core.output.MIValue;
  */
 public class MIFunctionFinishedEvent extends MIStoppedEvent {
 
-	String gdbResult = "";
+	String gdbResult = ""; //$NON-NLS-1$
-	String returnValue = "";
+	String returnValue = ""; //$NON-NLS-1$
 
 	public MIFunctionFinishedEvent(MIExecAsyncOutput async) {
 		super(async);
@@ -41,8 +41,8 @@ public class MIFunctionFinishedEvent extends MIStoppedEvent {
 
 	public String toString() {
 		StringBuffer buffer = new StringBuffer();
-		buffer.append("gdb-result-var=" + gdbResult + "\n");
+		buffer.append("gdb-result-var=" + gdbResult + "\n"); //$NON-NLS-2$
-		buffer.append("return-value=" + returnValue + "\n");
+		buffer.append("return-value=" + returnValue + "\n"); //$NON-NLS-2$
 		buffer.append("thread-id=").append(getThreadId()).append('\n');
 		MIFrame f = getFrame();
 		if (f != null) {
@@ -65,22 +65,22 @@ public class MIFunctionFinishedEvent extends MIStoppedEvent {
 			for (int i = 0; i < results.length; i++) {
 				String var = results[i].getVariable();
 				MIValue value = results[i].getMIValue();
-				String str = "";
+				String str = ""; //$NON-NLS-1$
 				if (value instanceof MIConst) {
 					str = ((MIConst)value).getString();
 				}
 
-				if (var.equals("gdb-result-var")) {
+				if (var.equals("gdb-result-var")) { //$NON-NLS-1$
 					gdbResult = str;
-				} else if (var.equals("return-value")) {
+				} else if (var.equals("return-value")) { //$NON-NLS-1$
 					returnValue = str;
-				} else if (var.equals("thread-id")) {
+				} else if (var.equals("thread-id")) { //$NON-NLS-1$
 					try {
 						int id = Integer.parseInt(str.trim());
 						setThreadId(id);
 					} catch (NumberFormatException e) {
 					}
-				} else if (var.equals("frame")) {
+				} else if (var.equals("frame")) { //$NON-NLS-1$
 					if (value instanceof MITuple) {
 						MIFrame f = new MIFrame((MITuple)value);
 						setFrame(f);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIInferiorExitEvent.java

@@ -58,12 +58,12 @@ public class MIInferiorExitEvent extends MIDestroyedEvent {
 			for (int i = 0; i < results.length; i++) {
 				String var = results[i].getVariable();
 				MIValue value = results[i].getMIValue();
-				String str = "";
+				String str = ""; //$NON-NLS-1$
 				if (value instanceof MIConst) {
 					str = ((MIConst)value).getString();
 				}
 
-				if (var.equals("exit-code")) {
+				if (var.equals("exit-code")) { //$NON-NLS-1$
 					try {
 						code = Integer.decode(str.trim()).intValue();
 					} catch (NumberFormatException e) {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIInferiorSignalExitEvent.java

@@ -19,8 +19,8 @@ import org.eclipse.cdt.debug.mi.core.output.MIValue;
  */
 public class MIInferiorSignalExitEvent extends MIDestroyedEvent {
 
-	String sigName = "";
+	String sigName = ""; //$NON-NLS-1$
-	String sigMeaning = "";
+	String sigMeaning = ""; //$NON-NLS-1$
 
 	MIExecAsyncOutput exec = null;
 	MIResultRecord rr = null;
@@ -47,8 +47,8 @@ public class MIInferiorSignalExitEvent extends MIDestroyedEvent {
 
 	public String toString() {
 		StringBuffer buffer = new StringBuffer();
-		buffer.append("signal-name=" + sigName + "\n");
+		buffer.append("signal-name=" + sigName + "\n"); //$NON-NLS-2$
-		buffer.append("signal-meaning=" + sigMeaning + "\n");
+		buffer.append("signal-meaning=" + sigMeaning + "\n"); //$NON-NLS-2$
 		return buffer.toString();
 	}
 
@@ -63,14 +63,14 @@ public class MIInferiorSignalExitEvent extends MIDestroyedEvent {
 			for (int i = 0; i < results.length; i++) {
 				String var = results[i].getVariable();
 				MIValue value = results[i].getMIValue();
-				String str = "";
+				String str = ""; //$NON-NLS-1$
 				if (value instanceof MIConst) {
 					str = ((MIConst)value).getString();
 				}
 
-				if (var.equals("signal-name")) {
+				if (var.equals("signal-name")) { //$NON-NLS-1$
 					sigName = str;
-				} else if (var.equals("signal-meaning")) {
+				} else if (var.equals("signal-meaning")) { //$NON-NLS-1$
 					sigMeaning = str;
 				}
 			}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java

@@ -52,18 +52,18 @@ public class MILocationReachedEvent extends MIStoppedEvent {
 			for (int i = 0; i < results.length; i++) {
 				String var = results[i].getVariable();
 				MIValue value = results[i].getMIValue();
-				String str = "";
+				String str = ""; //$NON-NLS-1$
 				if (value instanceof MIConst) {
 					str = ((MIConst)value).getString();
 				}
 
-				if (var.equals("thread-id")) {
+				if (var.equals("thread-id")) { //$NON-NLS-1$
 					try {
 						int id = Integer.parseInt(str.trim());
 						setThreadId(id);
 					} catch (NumberFormatException e) {
 					}
-				} else if (var.equals("frame")) {
+				} else if (var.equals("frame")) { //$NON-NLS-1$
 					if (value instanceof MITuple) {
 						MIFrame f = new MIFrame((MITuple)value);
 						setFrame(f);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java

@@ -19,8 +19,8 @@ import org.eclipse.cdt.debug.mi.core.output.MIValue;
  */
 public class MISignalEvent extends MIStoppedEvent {
 
-	String sigName = "";
+	String sigName = ""; //$NON-NLS-1$
-	String sigMeaning = "";
+	String sigMeaning = ""; //$NON-NLS-1$
 
 	public MISignalEvent(MIExecAsyncOutput async) {
 		super(async);
@@ -66,22 +66,22 @@ public class MISignalEvent extends MIStoppedEvent {
 			for (int i = 0; i < results.length; i++) {
 				String var = results[i].getVariable();
 				MIValue value = results[i].getMIValue();
-				String str = "";
+				String str = ""; //$NON-NLS-1$
 				if (value instanceof MIConst) {
 					str = ((MIConst)value).getString();
 				}
 
-				if (var.equals("signal-name")) {
+				if (var.equals("signal-name")) { //$NON-NLS-1$
 					sigName = str;
-				} else if (var.equals("signal-meaning")) {
+				} else if (var.equals("signal-meaning")) { //$NON-NLS-1$
 					sigMeaning = str;
-				} else if (var.equals("thread-id")) {
+				} else if (var.equals("thread-id")) { //$NON-NLS-1$
 					try {
 						int id = Integer.parseInt(str.trim());
 						setThreadId(id);
 					} catch (NumberFormatException e) {
 					}
-				} else if (var.equals("frame")) {
+				} else if (var.equals("frame")) { //$NON-NLS-1$
 					if (value instanceof MITuple) {
 						MIFrame f = new MIFrame((MITuple)value);
 						setFrame(f);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java

@@ -53,7 +53,7 @@ public class MISteppingRangeEvent extends MIStoppedEvent {
 				String var = results[i].getVariable();
 				MIValue value = results[i].getMIValue();
 
-				if (var.equals("thread-id")) {
+				if (var.equals("thread-id")) { //$NON-NLS-1$
 					if (value instanceof MIConst) {
 						String str = ((MIConst)value).getString();
 						try {
@@ -62,7 +62,7 @@ public class MISteppingRangeEvent extends MIStoppedEvent {
 						} catch (NumberFormatException e) {
 						}
 					}
-				} else if (var.equals("frame")) {
+				} else if (var.equals("frame")) { //$NON-NLS-1$
 					if (value instanceof MITuple) {
 						MIFrame f = new MIFrame((MITuple)value);
 						setFrame(f);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIStoppedEvent.java

@@ -74,7 +74,7 @@ public class MIStoppedEvent extends MIEvent {
 				String var = results[i].getVariable();
 				MIValue value = results[i].getMIValue();
 
-				if (var.equals("thread-id")) {
+				if (var.equals("thread-id")) { //$NON-NLS-1$
 					if (value instanceof MIConst) {
 						String str = ((MIConst)value).getString();
 						try {
@@ -82,7 +82,7 @@ public class MIStoppedEvent extends MIEvent {
 						} catch (NumberFormatException e) {
 						}
 					}
-				} else if (var.equals("frame")) {
+				} else if (var.equals("frame")) { //$NON-NLS-1$
 					if (value instanceof MITuple) {
 						frame = new MIFrame((MITuple)value);
 					}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java

@@ -50,7 +50,7 @@ public class MIWatchpointScopeEvent extends MIStoppedEvent {
 				String var = results[i].getVariable();
 				MIValue value = results[i].getMIValue();
 
-				if (var.equals("wpnum")) {
+				if (var.equals("wpnum")) { //$NON-NLS-1$
 					if (value instanceof MIConst) {
 						String str = ((MIConst) value).getString();
 						try {
@@ -58,7 +58,7 @@ public class MIWatchpointScopeEvent extends MIStoppedEvent {
 						} catch (NumberFormatException e) {
 						}
 					}
-				} else if (var.equals("thread-id")) {
+				} else if (var.equals("thread-id")) { //$NON-NLS-1$
 					if (value instanceof MIConst) {
 						String str = ((MIConst) value).getString();
 						try {
@@ -67,7 +67,7 @@ public class MIWatchpointScopeEvent extends MIStoppedEvent {
 						} catch (NumberFormatException e) {
 						}
 					}
-				} else if (var.equals("frame")) {
+				} else if (var.equals("frame")) { //$NON-NLS-1$
 					if (value instanceof MITuple) {
 						MIFrame f = new MIFrame((MITuple) value);
 						setFrame(f);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java

@@ -20,9 +20,9 @@ import org.eclipse.cdt.debug.mi.core.output.MIValue;
 public class MIWatchpointTriggerEvent extends MIStoppedEvent {
 
 	int number;
-	String exp = "";
+	String exp = ""; //$NON-NLS-1$
-	String oldValue = "";
+	String oldValue = ""; //$NON-NLS-1$
-	String newValue = "";
+	String newValue = ""; //$NON-NLS-1$
 
 	public MIWatchpointTriggerEvent(MIExecAsyncOutput async) {
 		super(async);
@@ -54,9 +54,9 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent {
 	public String toString() {
 		StringBuffer buffer = new StringBuffer();
 		buffer.append("number=").append(number).append('\n');
-		buffer.append("expression=" + exp + "\n");
+		buffer.append("expression=" + exp + "\n"); //$NON-NLS-2$
-		buffer.append("old=" + oldValue + "\n");
+		buffer.append("old=" + oldValue + "\n"); //$NON-NLS-2$
-		buffer.append("new=" + newValue + "\n");
+		buffer.append("new=" + newValue + "\n"); //$NON-NLS-2$
 		buffer.append("thread-id=").append(getThreadId()).append('\n');
 		MIFrame f = getFrame();
 		if (f != null) {
@@ -79,15 +79,15 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent {
 				String var = results[i].getVariable();
 				MIValue value = results[i].getMIValue();
 
-				if (var.equals("wpt") || var.equals("hw-awpt") || var.equals("hw-rwpt")) {
+				if (var.equals("wpt") || var.equals("hw-awpt") || var.equals("hw-rwpt")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 					if (value instanceof MITuple) {
 						parseWPT((MITuple) value);
 					}
-				} else if (var.equals("value")) {
+				} else if (var.equals("value")) { //$NON-NLS-1$
 					if (value instanceof MITuple) {
 						parseValue((MITuple) value);
 					}
-				} else if (var.equals("thread-id")) {
+				} else if (var.equals("thread-id")) { //$NON-NLS-1$
 					if (value instanceof MIConst) {
 						String str = ((MIConst) value).getString();
 						try {
@@ -96,7 +96,7 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent {
 						} catch (NumberFormatException e) {
 						}
 					}
-				} else if (var.equals("frame")) {
+				} else if (var.equals("frame")) { //$NON-NLS-1$
 					if (value instanceof MITuple) {
 						MIFrame f = new MIFrame((MITuple) value);
 						setFrame(f);
@@ -112,7 +112,7 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent {
 			String var = results[i].getVariable();
 			MIValue value = results[i].getMIValue();
 
-			if (var.equals("number")) {
+			if (var.equals("number")) { //$NON-NLS-1$
 				if (value instanceof MIConst) {
 					String str = ((MIConst) value).getString();
 					try {
@@ -120,7 +120,7 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent {
 					} catch (NumberFormatException e) {
 					}
 				}
-			} else if (var.equals("exp")) {
+			} else if (var.equals("exp")) { //$NON-NLS-1$
 				if (value instanceof MIConst) {
 					exp = ((MIConst) value).getString();
 				}
@@ -133,16 +133,16 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent {
 		for (int i = 0; i < results.length; i++) {
 			String var = results[i].getVariable();
 			MIValue value = results[i].getMIValue();
-			String str = "";
+			String str = ""; //$NON-NLS-1$
 			if (value instanceof MIConst) {
 				str = ((MIConst) value).getString();
 			}
 
-			if (var.equals("old")) {
+			if (var.equals("old")) { //$NON-NLS-1$
 				oldValue = str;
-			} else if (var.equals("new")) {
+			} else if (var.equals("new")) { //$NON-NLS-1$
 				newValue = str;
-			} else if (var.equals("value")) {
+			} else if (var.equals("value")) { //$NON-NLS-1$
 				oldValue = newValue = str;
 			}
 		}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIArg.java

@@ -51,7 +51,7 @@ public class MIArg {
 			MIValue value = results[i].getMIValue();
 			if (value instanceof MIConst) {
 				String str = ((MIConst)value).getCString();
-				aList.add(new MIArg(str, ""));
+				aList.add(new MIArg(str, "")); //$NON-NLS-1$
 			}
 		}
 		return ((MIArg[])aList.toArray(new MIArg[aList.size()]));
@@ -66,21 +66,21 @@ public class MIArg {
 		MIArg arg = null;
 		if (args.length == 2) {
 			// Name
-			String aName = "";
+			String aName = ""; //$NON-NLS-1$
 			MIValue value = args[0].getMIValue();
 			if (value != null && value instanceof MIConst) {
 				aName = ((MIConst)value).getCString();
 			} else {
-				aName = "";
+				aName = ""; //$NON-NLS-1$
 			}
 
 			// Value
-			String aValue = "";
+			String aValue = ""; //$NON-NLS-1$
 			value = args[1].getMIValue();
 			if (value != null && value instanceof MIConst) {
 				aValue = ((MIConst)value).getCString();
 			} else {
-				aValue = "";
+				aValue = ""; //$NON-NLS-1$
 			}
 
 			arg = new MIArg(aName, aValue);
@@ -89,6 +89,6 @@ public class MIArg {
 	}
 
 	public String toString() {
-		return name + "=" + value;
+		return name + "=" + value; //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsm.java

@@ -10,9 +10,9 @@ package org.eclipse.cdt.debug.mi.core.output;
  */
 public class MIAsm {
 	long address;
-	String function = "";
+	String function = ""; //$NON-NLS-1$
-	String opcode = "";
+	String opcode = ""; //$NON-NLS-1$
-	String args = "";
+	String args = ""; //$NON-NLS-1$
 	long offset;
 
 	public MIAsm (MITuple tuple) {
@@ -32,16 +32,16 @@ public class MIAsm {
 	}
 
 	public String getInstruction() {
-		return opcode + " " + args;
+		return opcode + " " + args; //$NON-NLS-1$
 	}
 
 	public String toString() {
 		StringBuffer buffer = new StringBuffer();
 		buffer.append('{');
-		buffer.append("address=\"" + Long.toHexString(address) +"\"");
+		buffer.append("address=\"" + Long.toHexString(address) +"\""); //$NON-NLS-2$
-		buffer.append(",func-name=\"" + function + "\"");
+		buffer.append(",func-name=\"" + function + "\""); //$NON-NLS-2$
 		buffer.append(",offset=\"").append(offset).append('"');
-		buffer.append(",inst=\"" + getInstruction() + "\"");
+		buffer.append(",inst=\"" + getInstruction() + "\""); //$NON-NLS-2$
 		buffer.append('}');
 		return buffer.toString();
 	}
@@ -51,7 +51,7 @@ public class MIAsm {
 		for (int i = 0; i < results.length; i++) {
 			String var = results[i].getVariable();
 			MIValue value = results[i].getMIValue();
-			String str = "";
+			String str = ""; //$NON-NLS-1$
 
 			if (value != null && value instanceof MIConst) {
 				str = ((MIConst)value).getCString();

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIAsyncRecord.java

@@ -13,7 +13,7 @@ public abstract class MIAsyncRecord extends MIOOBRecord {
 	final static MIResult[] nullResults = new MIResult[0];
 
 	MIResult[] results = null;
-	String asynClass = "";
+	String asynClass = ""; //$NON-NLS-1$
 	int token = 0;
 
 	public int getToken() {

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIBreakInsertInfo.java

@@ -34,24 +34,24 @@ public class MIBreakInsertInfo extends MIInfo {
 					String var = results[i].getVariable();
 					MIValue val = results[i].getMIValue();
 					MIBreakpoint bpt = null;
-					if (var.equals("wpt")) {
+					if (var.equals("wpt")) { //$NON-NLS-1$
 						if (val instanceof MITuple) {
 							bpt = new MIBreakpoint((MITuple)val);
 							bpt.setEnabled(true);
 							bpt.setWriteWatchpoint(true);
 						}
-					} else if (var.equals("bkpt")) {
+					} else if (var.equals("bkpt")) { //$NON-NLS-1$
 						if (val instanceof MITuple) {
 							bpt = new MIBreakpoint((MITuple)val);
 							bpt.setEnabled(true);
 						}
-					} else if (var.equals("hw-awpt")) {
+					} else if (var.equals("hw-awpt")) { //$NON-NLS-1$
 						if (val instanceof MITuple) {
 							bpt = new MIBreakpoint((MITuple)val);
 							bpt.setAccessWatchpoint(true);
 							bpt.setEnabled(true);
 						}
-					} else if (var.equals("hw-rwpt")) {
+					} else if (var.equals("hw-rwpt")) { //$NON-NLS-1$
 						if (val instanceof MITuple) {
 							bpt = new MIBreakpoint((MITuple)val);
 							bpt.setReadWatchpoint(true);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIBreakListInfo.java

@@ -40,7 +40,7 @@ public class MIBreakListInfo extends MIInfo {
 				MIResult[] results =  rr.getMIResults();
 				for (int i = 0; i < results.length; i++) {
 					String var = results[i].getVariable();
-					if (var.equals("BreakpointTable")) {
+					if (var.equals("BreakpointTable")) { //$NON-NLS-1$
 						parseTable(results[i].getMIValue(), aList);
 					}
 				}
@@ -54,7 +54,7 @@ public class MIBreakListInfo extends MIInfo {
 			MIResult[] table = ((MITuple)val).getMIResults();
 			for (int j = 0; j < table.length; j++) {
 				String variable = table[j].getVariable();
-				if (variable.equals("body")) {
+				if (variable.equals("body")) { //$NON-NLS-1$
 					parseBody(table[j].getMIValue(), aList);
 				}
 			}
@@ -66,7 +66,7 @@ public class MIBreakListInfo extends MIInfo {
 			MIResult[] bkpts = ((MIList)body).getMIResults();
 			for (int i = 0; i < bkpts.length; i++) {
 				String b = bkpts[i].getVariable();
-				if (b.equals("bkpt")) {
+				if (b.equals("bkpt")) { //$NON-NLS-1$
 					MIValue value = bkpts[i].getMIValue();
 					if (value instanceof MITuple) {
 						aList.add(new MIBreakpoint((MITuple)value));

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIBreakpoint.java

@@ -45,17 +45,17 @@ package org.eclipse.cdt.debug.mi.core.output;
 public class MIBreakpoint {
 
 	int number;
-	String type = "";
+	String type = ""; //$NON-NLS-1$
-	String disp = "";
+	String disp = ""; //$NON-NLS-1$
 	boolean enabled;
 	long address;
-	String func = ""; 
+	String func = "";  //$NON-NLS-1$
-	String file = "";
+	String file = ""; //$NON-NLS-1$
 	int line;
-	String cond = "";
+	String cond = ""; //$NON-NLS-1$
 	int times;
-	String what = "";
+	String what = ""; //$NON-NLS-1$
-	String threadId = "";
+	String threadId = ""; //$NON-NLS-1$
 	int ignore;
 
 	boolean isWpt;
@@ -181,74 +181,74 @@ public class MIBreakpoint {
 		for (int i = 0; i < results.length; i++) {
 			String var = results[i].getVariable();
 			MIValue value = results[i].getMIValue();
-			String str = "";
+			String str = ""; //$NON-NLS-1$
 			if (value != null && value instanceof MIConst) {
 				str = ((MIConst)value).getCString();
 			}
 
-			if (var.equals("number")) {
+			if (var.equals("number")) { //$NON-NLS-1$
 				try {
 					number = Integer.parseInt(str.trim());
 				} catch (NumberFormatException e) {
 				}
-			} else if (var.equals("type")) {
+			} else if (var.equals("type")) { //$NON-NLS-1$
 				type = str;
 				//type="hw watchpoint"
-				if (type.startsWith("hw")) {
+				if (type.startsWith("hw")) { //$NON-NLS-1$
 					isHdw = true;
 					isWWpt = true;
 					isWpt = true;
 				}
 				//type="acc watchpoint"
-				if (type.startsWith("acc")) {
+				if (type.startsWith("acc")) { //$NON-NLS-1$
 					isWWpt = true;
 					isRWpt = true;
 					isWpt = true;
 				}
 				//type="read watchpoint"
-				if (type.startsWith("read")) {
+				if (type.startsWith("read")) { //$NON-NLS-1$
 					isRWpt = true;
 					isWpt = true;
 				}
 				// ??
-				if (type.equals("watchpoint")) {
+				if (type.equals("watchpoint")) { //$NON-NLS-1$
 					isWpt = true;
 				}
 				// type="breakpoint"
 				// default ok.
-			} else if (var.equals("disp")) {
+			} else if (var.equals("disp")) { //$NON-NLS-1$
 				disp = str;
-			} else if (var.equals("enabled")) {
+			} else if (var.equals("enabled")) { //$NON-NLS-1$
 				enabled = str.equals("y");
-			} else if (var.equals("addr")) {
+			} else if (var.equals("addr")) { //$NON-NLS-1$
 				try {
 					address = Long.decode(str.trim()).longValue();
 				} catch (NumberFormatException e) {
 				}
-			} else if (var.equals("func")) {
+			} else if (var.equals("func")) { //$NON-NLS-1$
 				func = str;
-			} else if (var.equals("file")) {
+			} else if (var.equals("file")) { //$NON-NLS-1$
 				file = str;
-			} else if (var.equals("thread")) {
+			} else if (var.equals("thread")) { //$NON-NLS-1$
 				threadId = str;
-			} else if (var.equals("line")) {
+			} else if (var.equals("line")) { //$NON-NLS-1$
 				try {
 					line = Integer.parseInt(str.trim());
 				} catch (NumberFormatException e) {
 				}
-			} else if (var.equals("times")) {
+			} else if (var.equals("times")) { //$NON-NLS-1$
 				try {
 					times = Integer.parseInt(str.trim());
 				} catch (NumberFormatException e) {
 				}
-			} else if (var.equals("what") || var.equals("exp")) {
+			} else if (var.equals("what") || var.equals("exp")) { //$NON-NLS-1$ //$NON-NLS-2$
 				what = str;
-			} else if (var.equals("ignore")) {
+			} else if (var.equals("ignore")) { //$NON-NLS-1$
 				try {
 					ignore = Integer.parseInt(str.trim());
 				} catch (NumberFormatException e) {
 				}
-			} else if (var.equals("cond")) {
+			} else if (var.equals("cond")) { //$NON-NLS-1$
 				cond = str;
 			}
 		}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIConst.java

@@ -9,7 +9,7 @@ package org.eclipse.cdt.debug.mi.core.output;
  * GDB/MI const value represents a ios-c string.
  */
 public class MIConst extends MIValue {
-	String cstring = "";
+	String cstring = ""; //$NON-NLS-1$
 
 	public String getCString() {
 		return cstring;
@@ -68,25 +68,25 @@ public class MIConst extends MIValue {
 	private static String isoC(char c) {
 		String s = new Character(c).toString();
 		if (c == '"') {
-			s = "\"";
+			s = "\""; //$NON-NLS-1$
 		} else if (c == '\'') {
-			s = "\'";
+			s = "\'"; //$NON-NLS-1$
 		} else if (c == '?') {
-			s = "?";
+			s = "?"; //$NON-NLS-1$
 		} else if (c == 'a') {
-			s = "\007";
+			s = "\007"; //$NON-NLS-1$
 		} else if (c == 'b') {
-			s = "\b";
+			s = "\b"; //$NON-NLS-1$
 		} else if (c == 'f') {
-			s = "\f";
+			s = "\f"; //$NON-NLS-1$
 		} else if (c == 'n') {
-			s = System.getProperty("line.separator", "\n");
+			s = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ $NON-NLS-2$
 		} else if (c == 'r') {
-			s = "\r";
+			s = "\r"; //$NON-NLS-1$
 		} else if (c == 't') {
-			s = "\t";
+			s = "\t"; //$NON-NLS-1$
 		} else if (c == 'v') {
-			s = "\013";
+			s = "\013"; //$NON-NLS-1$
 		}
 		return s;
 	}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataDisassembleInfo.java

@@ -56,7 +56,7 @@ public class MIDataDisassembleInfo extends MIInfo {
 				buffer.append(array[i].toString());
 			}
 		}
-		buffer.append("]");
+		buffer.append("]"); //$NON-NLS-1$
 		return buffer.toString();
 	}
 
@@ -70,7 +70,7 @@ public class MIDataDisassembleInfo extends MIInfo {
 				MIResult[] results =  rr.getMIResults();
 				for (int i = 0; i < results.length; i++) {
 					String var = results[i].getVariable();
-					if (var.equals("asm_insns")) {
+					if (var.equals("asm_insns")) { //$NON-NLS-1$
 						MIValue value = results[i].getMIValue();
 						if (value instanceof MIList) {
 							parse((MIList)value, srcList, asmList);
@@ -91,7 +91,7 @@ public class MIDataDisassembleInfo extends MIInfo {
 		if (results != null && results.length > 0) {
 			for (int i = 0; i < results.length; i++) {
 				String var = results[i].getVariable();
-				if (var.equals("src_and_asm_line")) {
+				if (var.equals("src_and_asm_line")) { //$NON-NLS-1$
 					MIValue value = results[i].getMIValue();
 					if (value instanceof MITuple) {
 						srcList.add(new MISrcAsm((MITuple)value));

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataEvaluateExpressionInfo.java

@@ -25,7 +25,7 @@ public class MIDataEvaluateExpressionInfo extends MIInfo{
 	}
 
 	void parse() {
-		expr = "";
+		expr = ""; //$NON-NLS-1$
 		if (isDone()) {
 			MIOutput out = getMIOutput();
 			MIResultRecord rr = out.getMIResultRecord();
@@ -33,7 +33,7 @@ public class MIDataEvaluateExpressionInfo extends MIInfo{
 				MIResult[] results =  rr.getMIResults();
 				for (int i = 0; i < results.length; i++) {
 					String var = results[i].getVariable();
-					if (var.equals("value")) {
+					if (var.equals("value")) { //$NON-NLS-1$
 						MIValue value = results[i].getMIValue();
 						if (value instanceof MIConst) {
 							expr = ((MIConst)value).getCString();

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataListChangedRegistersInfo.java

@@ -34,7 +34,7 @@ public class MIDataListChangedRegistersInfo extends MIInfo {
 				MIResult[] results =  rr.getMIResults();
 				for (int i = 0; i < results.length; i++) {
 					String var = results[i].getVariable();
-					if (var.equals("changed-registers")) {
+					if (var.equals("changed-registers")) { //$NON-NLS-1$
 						MIValue value = results[i].getMIValue();
 						if (value instanceof MIList) {
 							parseRegisters((MIList)value, aList);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataListRegisterNamesInfo.java

@@ -41,7 +41,7 @@ public class MIDataListRegisterNamesInfo extends MIInfo {
 				MIResult[] results = rr.getMIResults();
 				for (int i = 0; i < results.length; i++) {
 					String var = results[i].getVariable();
-					if (var.equals("register-names")) {
+					if (var.equals("register-names")) { //$NON-NLS-1$
 						MIValue value = results[i].getMIValue();
 						if (value instanceof MIList) {
 							parseRegisters((MIList) value, aList);
@@ -66,7 +66,7 @@ public class MIDataListRegisterNamesInfo extends MIInfo {
 					realNameCount++;
 					aList.add(str);
 				} else {
-					aList.add("");
+					aList.add(""); //$NON-NLS-1$
 				}
 			}
 		}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataListRegisterValuesInfo.java

@@ -31,7 +31,7 @@ public class MIDataListRegisterValuesInfo extends MIInfo {
 				MIResult[] results =  rr.getMIResults();
 				for (int i = 0; i < results.length; i++) {
 					String var = results[i].getVariable();
-					if (var.equals("register-values")) {
+					if (var.equals("register-values")) { //$NON-NLS-1$
 						MIValue value = results[i].getMIValue();
 						if (value instanceof MIList) {
 							registers = MIRegisterValue.getMIRegisterValues((MIList)value);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIDataReadMemoryInfo.java

@@ -83,47 +83,47 @@ public class MIDataReadMemoryInfo extends MIInfo {
 				for (int i = 0; i < results.length; i++) {
 					String var = results[i].getVariable();
 					MIValue value = results[i].getMIValue();
-					String str = "";
+					String str = ""; //$NON-NLS-1$
 					if (value != null && value instanceof MIConst) {
 						str = ((MIConst)value).getCString();
 					}
 
-					if (var.equals("addr")) {
+					if (var.equals("addr")) { //$NON-NLS-1$
 						try {
 							addr = Long.decode(str.trim()).longValue();
 						} catch (NumberFormatException e) {
 						}
-					} else if (var.equals("nr-bytes")) {
+					} else if (var.equals("nr-bytes")) { //$NON-NLS-1$
 						try {
 							numBytes = Long.decode(str.trim()).longValue();
 						} catch (NumberFormatException e) {
 						}
-					} else if (var.equals("total-bytes")) {
+					} else if (var.equals("total-bytes")) { //$NON-NLS-1$
 						try {
 							totalBytes = Long.decode(str.trim()).longValue();
 						} catch (NumberFormatException e) {
 						}
-					} else if (var.equals("next-row")) {
+					} else if (var.equals("next-row")) { //$NON-NLS-1$
 						try {
 							nextRow = Long.decode(str.trim()).longValue();
 						} catch (NumberFormatException e) {
 						}
-					} else if (var.equals("prev-row")) {
+					} else if (var.equals("prev-row")) { //$NON-NLS-1$
 						try {
 							prevRow = Long.decode(str.trim()).longValue();
 						} catch (NumberFormatException e) {
 						}
-					} else if (var.equals("next-page")) {
+					} else if (var.equals("next-page")) { //$NON-NLS-1$
 						try {
 							nextPage = Long.decode(str.trim()).longValue();
 						} catch (NumberFormatException e) {
 						}
-					} else if (var.equals("prev-page")) {
+					} else if (var.equals("prev-page")) { //$NON-NLS-1$
 						try {
 							prevPage = Long.decode(str.trim()).longValue();
 						} catch (NumberFormatException e) {
 						}
-					} else if (var.equals("memory")) {
+					} else if (var.equals("memory")) { //$NON-NLS-1$
 						if (value instanceof MIList) { 
 							parseMemory((MIList)value);
 						}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIEnvironmentPWDInfo.java

@@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.mi.core.output;
  */
 public class MIEnvironmentPWDInfo extends MIInfo {
 
-	String pwd = "";
+	String pwd = ""; //$NON-NLS-1$
 
 	public MIEnvironmentPWDInfo(MIOutput o) {
 		super(o);

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java

@@ -11,8 +11,8 @@ public class MIFrame {
 
 	int level;
 	long addr;
-	String func = "";
+	String func = ""; //$NON-NLS-1$
-	String file = "";
+	String file = ""; //$NON-NLS-1$
 	int line;
 	MIArg[] args = new MIArg[0];
 
@@ -46,18 +46,18 @@ public class MIFrame {
 
 	public String toString() {
 		StringBuffer buffer = new StringBuffer();
-		buffer.append("level=\"" + level + "\"");
+		buffer.append("level=\"" + level + "\"");  //$NON-NLS-1$//$NON-NLS-2$
-		buffer.append(",addr=\"" + Long.toHexString(addr) + "\"");
+		buffer.append(",addr=\"" + Long.toHexString(addr) + "\"");  //$NON-NLS-1$//$NON-NLS-2$
-		buffer.append(",func=\"" + func + "\"");
+		buffer.append(",func=\"" + func + "\"");  //$NON-NLS-1$//$NON-NLS-2$
-		buffer.append(",file=\"" + file + "\"");
+		buffer.append(",file=\"" + file + "\"");  //$NON-NLS-1$//$NON-NLS-2$
-		buffer.append(",line=\"").append(line).append('"');
+		buffer.append(",line=\"").append(line).append('"'); //$NON-NLS-1$
-		buffer.append(",args=[");
+		buffer.append(",args=["); //$NON-NLS-1$
 		for (int i = 0; i < args.length; i++) {
 			if (i != 0) {
 				buffer.append(',');
 			}
-			buffer.append("{name=\"" + args[i].getName() + "\"");
+			buffer.append("{name=\"" + args[i].getName() + "\"");//$NON-NLS-1$//$NON-NLS-2$
-			buffer.append(",value=\"" + args[i].getValue() + "\"}");
+			buffer.append(",value=\"" + args[i].getValue() + "\"}");//$NON-NLS-1$//$NON-NLS-2$
 		}
 		buffer.append(']');
 		return buffer.toString();
@@ -68,27 +68,27 @@ public class MIFrame {
 		for (int i = 0; i < results.length; i++) {
 			String var = results[i].getVariable();
 			MIValue value = results[i].getMIValue();
-			String str = "";
+			String str = ""; //$NON-NLS-1$
 			if (value != null && value instanceof MIConst) {
 				str = ((MIConst)value).getCString();
 			}
 
-			if (var.equals("level")) {
+			if (var.equals("level")) { //$NON-NLS-1$
 				try {
 					level = Integer.parseInt(str.trim());
 				} catch (NumberFormatException e) {
 				}
-			} else if (var.equals("addr")) {
+			} else if (var.equals("addr")) { //$NON-NLS-1$
 				try {
 					addr = Long.decode(str.trim()).longValue();
 				} catch (NumberFormatException e) {
 				}
-			} else if (var.equals("func")) {
+			} else if (var.equals("func")) { //$NON-NLS-1$
 				func = null;
 				if ( str != null ) {
 					str = str.trim();
-					if ( str.equals( "??" ) )
+					if ( str.equals( "??" ) ) //$NON-NLS-1$
-						func = "";
+						func = ""; //$NON-NLS-1$
 					else
 					{
 						// In some situations gdb returns the function names that include parameter types.
@@ -100,14 +100,14 @@ public class MIFrame {
 							func = str;
 					}
 				}
-			} else if (var.equals("file")) {
+			} else if (var.equals("file")) { //$NON-NLS-1$
 				file = str;
-			} else if (var.equals("line")) {
+			} else if (var.equals("line")) { //$NON-NLS-1$
 				try {
 					line = Integer.parseInt(str.trim());
 				} catch (NumberFormatException e) {
 				}
-			} else if (var.equals("args")) {
+			} else if (var.equals("args")) { //$NON-NLS-1$
 				if (value instanceof MIList) {
 					args = MIArg.getMIArgs((MIList)value);
 				}

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIGDBShowDirectoriesInfo.java

@@ -48,7 +48,7 @@ public class MIGDBShowDirectoriesInfo extends MIInfo {
 	}
 
 	void parseDirectories(String d) {
-		String sep = System.getProperty("path.separator", ":");
+		String sep = System.getProperty("path.separator", ":"); //$NON-NLS-1$ //$NON-NLS-2$
 		StringTokenizer st = new StringTokenizer(d, sep);
 		int count = st.countTokens();
 		dirs = new String[count];

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIGDBShowInfo.java

@@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.mi.core.output;
  */
 public class MIGDBShowInfo extends MIInfo {
 
-	String value = "";
+	String value = ""; //$NON-NLS-1$
 
 	public MIGDBShowInfo(MIOutput o) {
 		super(o);
@@ -31,7 +31,7 @@ public class MIGDBShowInfo extends MIInfo {
 				MIResult[] results =  rr.getMIResults();
 				for (int i = 0; i < results.length; i++) {
 					String var = results[i].getVariable();
-					if (var.equals("value")) {
+					if (var.equals("value")) { //$NON-NLS-1$
 						MIValue val = results[i].getMIValue();
 						if (val instanceof MIConst) {
 							value = ((MIConst)val).getString();

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIGDBShowSolibSearchPathInfo.java

@@ -35,7 +35,7 @@ public class MIGDBShowSolibSearchPathInfo extends MIGDBShowInfo {
 	}
 
 	void parseDirectories(String d) {
-		String sep = System.getProperty("path.separator", ":");
+		String sep = System.getProperty("path.separator", ":"); //$NON-NLS-1$ //$NON-NLS-2$
 		StringTokenizer st = new StringTokenizer(d, sep);
 		int count = st.countTokens();
 		dirs = new String[count];

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfo.java

@@ -43,7 +43,7 @@ public class MIInfo {
 		if (miOutput != null) {
 			return miOutput.toString();
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	boolean isResultClass(String rc) {
@@ -64,7 +64,7 @@ public class MIInfo {
 				MIResult[] results =  rr.getMIResults();
 				for (int i = 0; i < results.length; i++) {
 					String var = results[i].getVariable();
-					if (var.equals("msg")) {
+					if (var.equals("msg")) { //$NON-NLS-1$
 						MIValue value = results[i].getMIValue();
 						if (value instanceof MIConst) {
 							String s = ((MIConst)value).getCString();
@@ -74,6 +74,6 @@ public class MIInfo {
 				}
 			}
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 }

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfoProgramInfo.java

@@ -52,7 +52,7 @@ public class MIInfoProgramInfo extends MIInfo {
 		if (str != null && str.length() > 0) {
 			str = str.replace('.', ' ');
 			str = str.trim();
-			if (str.startsWith("Using")) {
+			if (str.startsWith("Using")) { //$NON-NLS-1$
 				StringTokenizer st = new StringTokenizer(str);
 				while (st.hasMoreTokens()) {
 					String s = st.nextToken();

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfoSharedLibraryInfo.java

@@ -53,7 +53,7 @@ public class MIInfoSharedLibraryInfo extends MIInfo {
 	void parseShared(String str, List aList) {
 		if (!hasProcessHeader) {
 			// Process the header and choose a type.
-			if (str.startsWith("DLL")) {
+			if (str.startsWith("DLL")) { //$NON-NLS-1$
 				isUnixFormat = false;
 			}
 			hasProcessHeader = true;
@@ -77,7 +77,7 @@ public class MIInfoSharedLibraryInfo extends MIInfo {
 			long from = 0;
 			long to = 0;
 			boolean syms = false;
-			String name = "";
+			String name = ""; //$NON-NLS-1$
 
 			for (int i = 0;(index = str.lastIndexOf(' ')) != -1 || i <= 3; i++) {
 				if (index == -1) {
@@ -125,8 +125,8 @@ public class MIInfoSharedLibraryInfo extends MIInfo {
 		if (index > 0) {
 			String sub = str.substring(index).trim();
 			// Go figure they do not print the "0x" to indicate hexadecimal!!
-			if (!sub.startsWith("0x")) {
+			if (!sub.startsWith("0x")) { //$NON-NLS-1$
-				sub = "0x" + sub;
+				sub = "0x" + sub; //$NON-NLS-1$
 			}
 			try {
 				from = Long.decode(sub).longValue();

debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIInfoSignalsInfo.java

@@ -61,11 +61,11 @@ public class MIInfoSignalsInfo extends MIInfo {
 			// ~"Signal        Stop\tPrint\tPass to program\tDescription\n"
 			// ~"Use the \"handle\" command to change these tables.\n"
 			if (!str.startsWith("Signal ") && !str.startsWith("Use ")) {
-				String signal = "";
+				String signal = ""; //$NON-NLS-1$
 				boolean stop = false;
 				boolean print = false;
 				boolean pass = false;
-				String desc = "";
+				String desc = ""; //$NON-NLS-1$
 
 				StringTokenizer tokenizer = new StringTokenizer(str);
 				for (int i = 0; tokenizer.hasMoreTokens(); i++) {