93427 : NLS Drop for VE 1.1 M2

47 files changed, 399 insertions, 390 deletions

diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java
index f09075682..cee683277 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java
@@ -2,6 +2,9 @@
  * This is for primitive expressions that are optimized out the compiler such as bit or, bit and, etc..
    */
 package org.eclipse.jem.internal.proxy.initParser;
+
+import java.text.MessageFormat;
+
 /*******************************************************************************
  * Copyright (c)  2003 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
@@ -14,7 +17,7 @@ package org.eclipse.jem.internal.proxy.initParser;
  *******************************************************************************/
 /*
  *  $RCSfile: PrimitiveOperation.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
+ *  $Revision: 1.3 $  $Date: 2005/05/18 23:11:27 $ 
  */
 
 public class PrimitiveOperation extends Expression {
@@ -38,12 +41,12 @@ public class PrimitiveOperation extends Expression {
 				return new Integer(((Integer)leftHandSide).intValue() & ((Integer)rightHandSide).intValue());				
 			}
 		}
-		throw new RuntimeException("Invalid operator " + getOperDescription() + " between " + leftHandSide + " and " + rightHandSide);		
+		throw new RuntimeException(MessageFormat.format(ProxyInitParserMessages.getString("PrimitiveOperation.Evaluate.InvalidOperator_EXC_"), new Object[]{getOperDescription(), leftHandSide, rightHandSide}));		 //$NON-NLS-1$
 	}
 	protected String getOperDescription(){
-		if(operation == BitOR) return "|";
-		if (operation == BitAND) return "&";			
-		return "???";
+		if(operation == BitOR) return "|"; //$NON-NLS-1$
+		if (operation == BitAND) return "&";			 //$NON-NLS-1$
+		return "???"; //$NON-NLS-1$
 	}
 
 	public boolean isComplete() {
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties
index ed8cc3c71..f9b1ccbca 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 #
 # $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties,v $
-# $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $
+# $Revision: 1.3 $  $Date: 2005/05/18 23:11:27 $
 #
 
 
@@ -21,3 +21,4 @@ UnexpectedToken_EXC_                = IWAV0127E Unexpected Token "{0}".
 Statement.UnexpectedExecution_EXC_  = IWAV0128E Statement was executed unexpectedly.
 Statement.UnexpectedEvaluation_EXC_ = IWAV0129E Statements should not be evaluated.
 CharTooComplicated_EXC_             = IWAV0130E Input text not a char that can be evaluated. Too complicated. \"{0}"
+PrimitiveOperation.Evaluate.InvalidOperator_EXC_=Invalid operator {0} between {1} and {2}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
index f45487b50..87180f650 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ExpressionProcesser.java,v $
- *  $Revision: 1.10 $  $Date: 2005/05/18 18:41:20 $ 
+ *  $Revision: 1.11 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.initParser.tree;
 
@@ -59,7 +59,7 @@ public class ExpressionProcesser {
 			// If static, then receiver is ignored.
 			if (!Modifier.isStatic(field.getModifiers())) {
 				if (!field.getDeclaringClass().isInstance(receiver))
-					throw new IllegalArgumentException("Field receiver does not match the type of the field: Field: "+field.getType()+" receiver: "+(receiver!=null ? receiver.getClass() : null));
+					throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CreateFieldAccessReference.FieldsTypesNotMatching_EXC_"), new Object[]{field.getType(), (receiver!=null ? receiver.getClass() : null)})); //$NON-NLS-1$
 			}
 			field.setAccessible(true);	// Make it always accessible. Trust it. 
 			return new FieldAccessReference(field, receiver);
@@ -101,7 +101,7 @@ public class ExpressionProcesser {
 		 * @see java.lang.Object#toString()
 		 */
 		public String toString() {
-			return "FieldAccess{"+field.toString()+"} on "+receiver.toString();
+			return "FieldAccess{"+field.toString()+"} on "+receiver.toString(); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 	
@@ -132,7 +132,7 @@ public class ExpressionProcesser {
 		public static ArrayAccessReference createArrayAccessReference(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
 			int len = Array.getLength(array);
 			if (index < 0 || len <= index)
-				throw new ArrayIndexOutOfBoundsException("Index: "+index+" size:"+len);
+				throw new ArrayIndexOutOfBoundsException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CreateArrayAccessReference.OutOfBounds_EXC_"), new Object[]{new Integer(index), new Integer(len)})); //$NON-NLS-1$
 			return new ArrayAccessReference(array, index);
 		}
 		/**
@@ -169,7 +169,7 @@ public class ExpressionProcesser {
 		 * @see java.lang.Object#toString()
 		 */
 		public String toString() {
-			return "ArrayAccess["+index+"]: "+array.toString();
+			return "ArrayAccess["+index+"]: "+array.toString(); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 	
@@ -237,7 +237,7 @@ public class ExpressionProcesser {
 			e = e.getCause();
 		if (traceOn) {
 			System.out.println();
-			System.out.print("***** >>>\tException: ");
+			System.out.print("***** >>>\tException: "); //$NON-NLS-1$
 			System.out.println(e);
 		}
 		throwException(e);	// Treat as a throw to let try/catches expressions handle it.
@@ -264,7 +264,7 @@ public class ExpressionProcesser {
 	 */
 	protected final void processSyntaxException(NoExpressionValueException e) {
 		if (traceOn)
-			printTrace("Expression has no value", false);
+			printTrace("Expression has no value", false); //$NON-NLS-1$
 		try {
 			errorOccurred = true;
 			novalueException = true;
@@ -423,7 +423,7 @@ public class ExpressionProcesser {
 		try {
 			Class result = (Class) expressionTypeStack.remove(expressionTypeStack.size()-1);
 			if (!allowVoid && result == Void.TYPE)
-				throw new NoExpressionValueException("Expression was void.");
+				throw new NoExpressionValueException(InitparserTreeMessages.getString("ExpressionProcesser.PopExpressionType.ExpressionVoid_EXC_")); //$NON-NLS-1$
 			return result;
 				
 		} catch (IndexOutOfBoundsException e) {
@@ -523,9 +523,9 @@ public class ExpressionProcesser {
 	public ExpressionProcesser(boolean traceOn, long threshold) {
 		this.traceOn = traceOn;
 		if (traceOn) {
-			traceHeader = "**"+(++TRACE_COUNTER)+':';
+			traceHeader = "**"+(++TRACE_COUNTER)+':'; //$NON-NLS-1$
 			System.out.print(traceHeader);
-			System.out.println(" Start expression");
+			System.out.println(" Start expression"); //$NON-NLS-1$
 			this.thresholdTime = threshold != -1 ? threshold : 100;
 			lastExpressionEndTime = startExpressionTime = System.currentTimeMillis();
 		} else {
@@ -550,15 +550,15 @@ public class ExpressionProcesser {
 		if (sinceLastExpression > 0) {
 			System.out.print('(');
 			if (sinceLastExpression > thresholdTime)
-				System.out.print("***");
+				System.out.print("***"); //$NON-NLS-1$
 			System.out.print(sinceLastExpression);
-			System.out.print("ms)");
+			System.out.print("ms)"); //$NON-NLS-1$
 		}
 		System.out.print('\t');
 		if (!ignore)
-			System.out.print("\t");
+			System.out.print("\t"); //$NON-NLS-1$
 		else
-			System.out.print("##\t");
+			System.out.print("##\t"); //$NON-NLS-1$
 		
 		printIndent();
 		System.out.print(msg);
@@ -571,18 +571,18 @@ public class ExpressionProcesser {
 	 */
 	protected void printIndent() {
 		for(int i=indent; i>0; i--) {
-			System.out.print("  ");
+			System.out.print("  "); //$NON-NLS-1$
 		}
 	}
 
 	protected void printTraceEnd() {
 		long stop = System.currentTimeMillis()-startExpressionStepTime;
 		if (stop > 0) {
-			System.out.print(" (");
+			System.out.print(" ("); //$NON-NLS-1$
 			if (stop > thresholdTime)
-				System.out.print("***");
+				System.out.print("***"); //$NON-NLS-1$
 			System.out.print(stop);
-			System.out.print("ms)");
+			System.out.print("ms)"); //$NON-NLS-1$
 		}
 		System.out.println();
 		lastExpressionEndTime = System.currentTimeMillis();
@@ -610,9 +610,9 @@ public class ExpressionProcesser {
 	 */
 	protected void printObjectAndType(Object o, Class t) {
 		System.out.print(' ');
-		System.out.print("Object-");
+		System.out.print("Object-"); //$NON-NLS-1$
 		System.out.print(o);
-		System.out.print(" Type-");
+		System.out.print(" Type-"); //$NON-NLS-1$
 		System.out.print(t);
 		System.out.print(' ');
 	}
@@ -625,11 +625,11 @@ public class ExpressionProcesser {
 	public final void close() {
 		boolean firstClose = expressionStack != null;
 		if (firstClose && traceOn) {
-			printTrace("End expression", false);
+			printTrace("End expression", false); //$NON-NLS-1$
 			long totalTime = System.currentTimeMillis()-startExpressionTime;
-			System.out.print(" Total expression evaluation time: ");
+			System.out.print(" Total expression evaluation time: "); //$NON-NLS-1$
 			System.out.print(totalTime);
-			System.out.print("ms.");
+			System.out.print("ms."); //$NON-NLS-1$
 		}
 		try {
 			expressionStack = null;
@@ -654,7 +654,7 @@ public class ExpressionProcesser {
 	 */
 	public final void pullValue(Object[] value) throws NoExpressionValueException {
 		if (traceOn)
-			printTrace("Pull value:", false);
+			printTrace("Pull value:", false); //$NON-NLS-1$
 		try {
 			value[0] = popExpression();
 			value[1] = popExpressionType(false);
@@ -719,16 +719,16 @@ public class ExpressionProcesser {
 					value[1] = proxy.getType();
 					if (doTrace)
 						if (value[1] != Void.TYPE) {
-							printTrace("Return Proxy #" + proxyid + " Resolved to", false);
+							printTrace("Return Proxy #" + proxyid + " Resolved to", false); //$NON-NLS-1$ //$NON-NLS-2$
 							printObjectAndType(value[0], (Class) value[1]);
 						} else
-							printTrace("Return Proxy #" + proxyid + " Resolved to void.", false);
+							printTrace("Return Proxy #" + proxyid + " Resolved to void.", false); //$NON-NLS-1$ //$NON-NLS-2$
 					return true;
 
 				} else {
 					if (doTrace)
-						printTrace("Return Proxy #" + proxyid + ": Not resolved", false);
-					NoExpressionValueException e = new NoExpressionValueException("Expression Proxy never set.");
+						printTrace("Return Proxy #" + proxyid + ": Not resolved", false); //$NON-NLS-1$ //$NON-NLS-2$
+					NoExpressionValueException e = new NoExpressionValueException(InitparserTreeMessages.getString("ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyNotSet_EXC_")); //$NON-NLS-1$
 					if (pull)
 						throw e;
 					else
@@ -737,8 +737,8 @@ public class ExpressionProcesser {
 				}
 			} else {
 				if (doTrace)
-					printTrace("Return Proxy #" + proxyid + ": Never created.", false);
-				NoExpressionValueException e = new NoExpressionValueException("Expression proxy doesn't exist.");
+					printTrace("Return Proxy #" + proxyid + ": Never created.", false); //$NON-NLS-1$ //$NON-NLS-2$
+				NoExpressionValueException e = new NoExpressionValueException(InitparserTreeMessages.getString("ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyDoesntExist_EXC_")); //$NON-NLS-1$
 				if (pull)
 					throw e;
 				else
@@ -762,7 +762,7 @@ public class ExpressionProcesser {
 	public final void pushExpression(Object o, Class t) {
 		boolean ignore = (ignoreExpression != null || errorOccurred);
 		if (traceOn) {
-			printTrace("Push: ", ignore);
+			printTrace("Push: ", ignore); //$NON-NLS-1$
 			printObjectAndType(o, t);
 		}
 		try {
@@ -785,7 +785,7 @@ public class ExpressionProcesser {
 	public final void pushExpressionProxy(int proxyid) {
 		boolean ignore =(ignoreExpression != null || errorOccurred);
 		if (traceOn)
-			printTrace("Push Expression Proxy #"+proxyid, ignore);
+			printTrace("Push Expression Proxy #"+proxyid, ignore); //$NON-NLS-1$
 		try {
 			if (ignore)
 				return;
@@ -815,7 +815,7 @@ public class ExpressionProcesser {
 	public final void pushCast(Class type) {
 		boolean ignore = (ignoreExpression != null || errorOccurred);
 		if (traceOn)
-			printTrace("Cast to: "+type, ignore);
+			printTrace("Cast to: "+type, ignore); //$NON-NLS-1$
 		try {
 			if (ignore)
 				return;
@@ -982,7 +982,7 @@ public class ExpressionProcesser {
 			throw new IllegalArgumentException(bean != null ? bean.getClass().getName() : "null"); //$NON-NLS-1$
 	}
 	
-	private static final Object IFELSE_IGNORE = "IF/ELSE IGNORE";	// Flag for if/else in ingore
+	private static final Object IFELSE_IGNORE = "IF/ELSE IGNORE";	// Flag for if/else in ingore //$NON-NLS-1$
 	private int ifElseNesting = 0;	// Nesting of if/else expressions.
 	private int ifElseIgnoreNestCount = 0;	// When ignoring if/else expressions, ignore until this nest count.
 	private boolean ifElseSkipTruePart;
@@ -1009,7 +1009,7 @@ public class ExpressionProcesser {
 				ignore = false;
 			} finally {
 				if (traceOn)
-					printTrace("If test condition", ignore);
+					printTrace("If test condition", ignore); //$NON-NLS-1$
 			}
 					
 			try {
@@ -1018,10 +1018,10 @@ public class ExpressionProcesser {
 				if (type != Boolean.TYPE)
 					throwClassCast(Boolean.TYPE, condition);
 				if (traceOn) {
-					System.out.print(" Test Result="+condition);
+					System.out.print(" Test Result="+condition); //$NON-NLS-1$
 					printTraceEnd();
 					indent(true);
-					printTrace("Begin True Expression.", ignore);
+					printTrace("Begin True Expression.", ignore); //$NON-NLS-1$
 					printTraceEnd();
 					indent(true);
 				}				
@@ -1064,7 +1064,7 @@ public class ExpressionProcesser {
 			case InternalIfElseOperandType.TRUE_CLAUSE_VALUE:
 					if (traceOn) {
 						indent(false);
-						printTrace("Begin False Expression.", ignore);
+						printTrace("Begin False Expression.", ignore); //$NON-NLS-1$
 						printTraceEnd();
 						indent(true);
 					}
@@ -1078,7 +1078,7 @@ public class ExpressionProcesser {
 					if (traceOn) {
 						indent(false);
 						indent(false);
-						printTrace("End IF/ELSE Expression.", ignore);
+						printTrace("End IF/ELSE Expression.", ignore); //$NON-NLS-1$
 						printTraceEnd();
 					}					
 					int currentNesting = ifElseNesting--;
@@ -1124,7 +1124,7 @@ public class ExpressionProcesser {
 	public final void pushInstanceof(Class type) {
 		boolean ignore = (ignoreExpression != null || errorOccurred);
 		if (traceOn)
-			printTrace("Instanceof type: "+type, ignore);
+			printTrace("Instanceof type: "+type, ignore); //$NON-NLS-1$
 		try {
 			if (ignore)
 				return;
@@ -1177,7 +1177,7 @@ public class ExpressionProcesser {
 	public final void pushNewInstanceFromString(String initializationString, Class resultType, ClassLoader classloader) {
 		boolean ignore = (ignoreExpression != null || errorOccurred);
 		if (traceOn)
-			printTrace("New instance from string: \""+initializationString+"\" Type="+resultType, ignore);
+			printTrace("New instance from string: \""+initializationString+"\" Type="+resultType, ignore); //$NON-NLS-1$ //$NON-NLS-2$
 		try {
 			if (ignore)
 				return;
@@ -1208,7 +1208,7 @@ public class ExpressionProcesser {
 		try {
 			if (ignoreExpression != null || errorOccurred) {
 				if (traceOn)
-					printTrace("Prefix: \'"+operator+"\'", true);
+					printTrace("Prefix: \'"+operator+"\'", true); //$NON-NLS-1$ //$NON-NLS-2$
 				return;
 			}
 			
@@ -1216,7 +1216,7 @@ public class ExpressionProcesser {
 				return;	// Do nothing. "+" doesn't affect the result of the current top expression.
 	
 			if (traceOn)
-				printTrace("Prefix: \'"+operator+"\' ", false);
+				printTrace("Prefix: \'"+operator+"\' ", false); //$NON-NLS-1$ //$NON-NLS-2$
 	
 			try {
 				Object exp = popExpression();
@@ -1321,7 +1321,7 @@ public class ExpressionProcesser {
 	public final void pushAssignment() {
 		if (ignoreExpression != null || errorOccurred) {
 			if (traceOn) {
-				printTrace("Assignment", true);
+				printTrace("Assignment", true); //$NON-NLS-1$
 				printTraceEnd();
 			}
 			return;
@@ -1335,7 +1335,7 @@ public class ExpressionProcesser {
 			Class refType;
 			try {
 				if (traceOn)
-					printTrace("Assignment: ", false);				
+					printTrace("Assignment: ", false);			 //$NON-NLS-1$	
 				// The order on the stack is right then left operand.
 				// First the right operand
 				Object value = popExpression();
@@ -1380,7 +1380,7 @@ public class ExpressionProcesser {
 		boolean ignore = (ignoreExpression != null || errorOccurred);
 		try {
 			if (traceOn) {
-				printTrace("Assign to Proxy #"+proxy.getProxyID(), ignore);
+				printTrace("Assign to Proxy #"+proxy.getProxyID(), ignore); //$NON-NLS-1$
 			}
 			if (ignore)
 				return;
@@ -1491,14 +1491,14 @@ public class ExpressionProcesser {
 		else if (primitiveType == Short.TYPE)
 			return SHORT;
 		else
-			throw new IllegalArgumentException(primitiveType != null ? primitiveType.getName() : "null");
+			throw new IllegalArgumentException(primitiveType != null ? primitiveType.getName() : "null"); //$NON-NLS-1$
 	}
 	
 	private void throwInvalidPrefix(PrefixOperator operator, Object exp) throws IllegalArgumentException {
 		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfPrefixOperator_EXC_"), new Object[] {exp != null ? exp.toString() : null, operator.toString()})); //$NON-NLS-1$
 	}		
 	
-	private static final Object INFIX_IGNORE = "INFIX IGNORE";	// Flag for infix in ingore
+	private static final Object INFIX_IGNORE = "INFIX IGNORE";	// Flag for infix in ingore //$NON-NLS-1$
 	private int infixNesting = 0;	// Nesting of infix expressions.
 	private int infixIgnoreNestCount = 0;	// When ignoring infix expressions, ignore until this nest count.
 	/**
@@ -1535,7 +1535,7 @@ public class ExpressionProcesser {
 				ignore = false;
 			} finally {
 				if (traceOn)
-					printTrace("Infix: "+operator, ignore);
+					printTrace("Infix: "+operator, ignore); //$NON-NLS-1$
 			}
 			
 			try {
@@ -2141,7 +2141,7 @@ public class ExpressionProcesser {
 		boolean ignore = (ignoreExpression != null || errorOccurred);
 		
 		if (traceOn) {
-			printTrace("Array Access["+indexCount+']', ignore);
+			printTrace("Array Access["+indexCount+']', ignore); //$NON-NLS-1$
 		}
 		try {
 			if (ignore)
@@ -2208,7 +2208,7 @@ public class ExpressionProcesser {
 	public final void pushArrayCreation(Class arrayType, int dimensionCount) {
 		boolean ignore = (ignoreExpression != null || errorOccurred);
 		if (traceOn)
-			printTrace("Array Creation: "+arrayType.getName()+'['+dimensionCount+']', ignore);
+			printTrace("Array Creation: "+arrayType.getName()+'['+dimensionCount+']', ignore); //$NON-NLS-1$
 		
 		try {
 			if (ignore)
@@ -2271,7 +2271,7 @@ public class ExpressionProcesser {
 		boolean ignore = (ignoreExpression != null || errorOccurred);
 		
 		if (traceOn)
-			printTrace("Initialize Array: "+arrayType.getName()+'{'+expressionCount+'}', ignore);
+			printTrace("Initialize Array: "+arrayType.getName()+'{'+expressionCount+'}', ignore); //$NON-NLS-1$
 		
 		try {
 			if (ignore)
@@ -2280,7 +2280,7 @@ public class ExpressionProcesser {
 			try {
 				if (!arrayType.isArray()) {
 					// It is not an array type.
-					throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY_EXC_"), new Object[] {arrayType, "array"}));
+					throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY_EXC_"), new Object[] {arrayType, "array"})); //$NON-NLS-1$ //$NON-NLS-2$
 				} 
 				// Strip off the number of dimensions specified.
 				while(stripCount-->0) {
@@ -2403,7 +2403,7 @@ public class ExpressionProcesser {
 		boolean ignore = (ignoreExpression != null || errorOccurred);
 		
 		if (traceOn)
-			printTrace("Create Class: "+type+" (", ignore);
+			printTrace("Create Class: "+type+" (", ignore); //$NON-NLS-1$ //$NON-NLS-2$
 		try {
 			if (ignore)
 				return;
@@ -2430,7 +2430,7 @@ public class ExpressionProcesser {
 				} else {
 					// No args, just do default ctor.
 					if (traceOn) {
-						System.out.print("Default ctor)");
+						System.out.print("Default ctor)"); //$NON-NLS-1$
 					}
 					value = type.newInstance();
 				}
@@ -2470,12 +2470,12 @@ public class ExpressionProcesser {
 		try {
 			if (ignoreExpression != null || errorOccurred) {
 				if (traceOn)
-					printTrace("Field Access", true);
+					printTrace("Field Access", true); //$NON-NLS-1$
 				return;
 			}
 		
 			if (traceOn)
-				printTrace("Field Access: ", false);
+				printTrace("Field Access: ", false); //$NON-NLS-1$
 			try {
 				// Get the receiver off of the stack.
 				Object receiver = null;
@@ -2491,11 +2491,11 @@ public class ExpressionProcesser {
 				Object value = FieldAccessReference.createFieldAccessReference(reflectField, receiver);
 				Class valueType = reflectField.getType();
 				if (traceOn) {
-					System.out.print("Field: ");
+					System.out.print("Field: "); //$NON-NLS-1$
 					if (fieldIsString)
-						System.out.print("(looked up) ");
+						System.out.print("(looked up) "); //$NON-NLS-1$
 					System.out.print(reflectField);
-					System.out.print(">");
+					System.out.print(">"); //$NON-NLS-1$
 					printObjectAndType(value, valueType);
 				}
 					
@@ -2526,12 +2526,12 @@ public class ExpressionProcesser {
 		try {
 			if (ignoreExpression != null || errorOccurred) {
 				if (traceOn)
-					printTrace("Invoke", true);
+					printTrace("Invoke", true); //$NON-NLS-1$
 				return;
 			}
 			
 			if (traceOn)
-				printTrace("Invoke: ", false);
+				printTrace("Invoke: ", false); //$NON-NLS-1$
 			
 			try {
 				// We need to pull in the arguments. They are stacked in reverse order.
@@ -2558,16 +2558,16 @@ public class ExpressionProcesser {
 					reflectMethod = (Method) method;
 				
 				if (traceOn && reflectMethod != null) {
-					System.out.print("Method: ");
+					System.out.print("Method: "); //$NON-NLS-1$
 					if (methodIsString)
-						System.out.print("(looked up) ");
+						System.out.print("(looked up) "); //$NON-NLS-1$
 					System.out.print(reflectMethod);					
 				}
 				
 				Object value = reflectMethod.invoke(receiver, args);
 				
 				if (traceOn) {
-					System.out.print(" returns: ");
+					System.out.print(" returns: "); //$NON-NLS-1$
 					printObjectAndType(value, reflectMethod.getReturnType());
 				}
 				pushExpressionValue(value, reflectMethod.getReturnType());
@@ -2591,7 +2591,7 @@ public class ExpressionProcesser {
 			
 	}
 
-	private static final Object CONDITIONAL_IGNORE = "CONDITIONAL IGNORE";	// Flag for conditional in ingore
+	private static final Object CONDITIONAL_IGNORE = "CONDITIONAL IGNORE";	// Flag for conditional in ingore //$NON-NLS-1$
 	private int conditionalNesting = 0;	// Nesting of conditional expressions.
 	private int conditionalIgnoreNestCount = 0;	// When ignoring conditional expressions, ignore until this nest count.
 	private boolean skipTruePart;
@@ -2635,7 +2635,7 @@ public class ExpressionProcesser {
 				ignore = false;
 			} finally {
 				if (traceOn)
-					printTrace("Conditional "+expressionType, ignore);
+					printTrace("Conditional "+expressionType, ignore); //$NON-NLS-1$
 			}
 					
 			try {
@@ -2678,7 +2678,7 @@ public class ExpressionProcesser {
 		}
 	}
 	
-	private static final Object BLOCK_IGNORE = "BLOCK IGNORE";
+	private static final Object BLOCK_IGNORE = "BLOCK IGNORE"; //$NON-NLS-1$
 	private int[] blocks;	// Stack of block numbers currently evaluating.
 	private int topBlock = -1;	// Top block index.
 	private int breakBlock = -1;	// Block number we are breaking to.
@@ -2691,7 +2691,7 @@ public class ExpressionProcesser {
 	 */
 	public final void pushBlockBegin(int blockNumber) {
 		if (traceOn) {
-			printTrace("Begin Block #"+blockNumber, errorOccurred);
+			printTrace("Begin Block #"+blockNumber, errorOccurred); //$NON-NLS-1$
 			indent(true);
 		}
 		try {
@@ -2723,13 +2723,13 @@ public class ExpressionProcesser {
 		try {
 			if (traceOn) {
 				indent(false);
-				printTrace("End Block #"+blockNumber, errorOccurred);
+				printTrace("End Block #"+blockNumber, errorOccurred); //$NON-NLS-1$
 			}
 			if (errorOccurred)
 				return;
 			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
 			if (blocks == null || topBlock < 0 || blocks[topBlock] != blockNumber) {
-				processSyntaxException(new IllegalStateException("End Blocks received out of order."));
+				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushBlockEnd.ReceivedEndBlocksOutOfOrder_EXC_"))); //$NON-NLS-1$
 			} else {
 				topBlock--;
 				if (ignoreExpression == BLOCK_IGNORE && blockNumber == breakBlock) {
@@ -2751,7 +2751,7 @@ public class ExpressionProcesser {
 	public final void pushBlockBreak(int blockNumber) {
 		try {
 			if (traceOn)
-				printTrace("Break Block #"+blockNumber, errorOccurred);
+				printTrace("Break Block #"+blockNumber, errorOccurred); //$NON-NLS-1$
 			if (errorOccurred)
 				return;
 			if (ignoreExpression == null) {
@@ -2764,8 +2764,8 @@ public class ExpressionProcesser {
 		}
 	}
 	
-	private static final Object TRY_THROW_IGNORE = "TRY THROW IGNORE";
-	private static final Object TRY_FINAL_IGNORE = "TRY FINAL IGNORE";
+	private static final Object TRY_THROW_IGNORE = "TRY THROW IGNORE"; //$NON-NLS-1$
+	private static final Object TRY_FINAL_IGNORE = "TRY FINAL IGNORE"; //$NON-NLS-1$
 	private int[] trys;	// Stack of try numbers currently evaluating.
 	// Stack of trys in catch clause (i.e. starting executing a catch/final clause for the try). Corresponds with try from same index in trys. Contains the throwable for the catch.
 	// This is used to know we are executing a catch (entry not null) and for the rethrow short-hand to rethrow the same exception within the catch.
@@ -2783,7 +2783,7 @@ public class ExpressionProcesser {
 	public final void pushTryBegin(int tryNumber) {
 		try {
 			if (traceOn) {
-				printTrace("Begin Try #"+tryNumber, errorOccurred);
+				printTrace("Begin Try #"+tryNumber, errorOccurred); //$NON-NLS-1$
 				indent(true);
 			}
 	
@@ -2820,7 +2820,7 @@ public class ExpressionProcesser {
 		try {
 			boolean ignore = (ignoreExpression != null || errorOccurred);
 			if (traceOn)
-				printTrace("Throw exception: ", ignore);
+				printTrace("Throw exception: ", ignore); //$NON-NLS-1$
 			
 			if (ignore)
 				return;
@@ -2880,9 +2880,9 @@ public class ExpressionProcesser {
 			if (traceOn) {
 				indent(false);
 				if (expressionProxy == null)
-					printTrace("Catch Try #"+tryNumber+" ("+exceptionType+')', errorOccurred);
+					printTrace("Catch Try #"+tryNumber+" ("+exceptionType+')', errorOccurred); //$NON-NLS-1$ //$NON-NLS-2$
 				else
-					printTrace("Catch Try #"+tryNumber+" ("+exceptionType+") Return exception in proxy #"+expressionProxy.getProxyID(), errorOccurred);
+					printTrace("Catch Try #"+tryNumber+" ("+exceptionType+") Return exception in proxy #"+expressionProxy.getProxyID(), errorOccurred); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				indent(true);
 			}
 			
@@ -2891,7 +2891,7 @@ public class ExpressionProcesser {
 			
 			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
 			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException("Catch received out of order."));
+				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryCatchClause.CatchReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
 			} else {
 				if (ignoreExpression == null) {
 					// Normal flow, no throw in progress, so just ignore now until the finally or end try reached.
@@ -2910,7 +2910,7 @@ public class ExpressionProcesser {
 							allocateExpressionProxy(expressionProxy);
 						}
 						if (traceOn) {
-							System.out.print(" Caught: ");
+							System.out.print(" Caught: "); //$NON-NLS-1$
 							System.out.print(catchThrowable);
 						}
 						catchThrowable = null;
@@ -2936,14 +2936,14 @@ public class ExpressionProcesser {
 		try {
 			if (traceOn) {
 				indent(false);
-				printTrace("Finally Try #"+tryNumber, errorOccurred);
+				printTrace("Finally Try #"+tryNumber, errorOccurred); //$NON-NLS-1$
 				indent(true);
 			}
 			if (errorOccurred)
 				return;
 			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
 			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException("Finally received out of order."));
+				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryFinallyClause.FinallyReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
 			} else {
 				if (tryNumber == breakTry && (ignoreExpression == TRY_THROW_IGNORE || ignoreExpression == TRY_FINAL_IGNORE)) {
 					// We are here due to a throw occuring in this try block or a catch was reached (in which case all intervening catch's were ignored).
@@ -2953,7 +2953,7 @@ public class ExpressionProcesser {
 					trysInCatch[topTry] = FINAL_CATCH; // We are in the finally clause of a exception being thrown within this try.
 					breakTry = -1;
 					if (traceOn)
-						System.out.print(" Executing finally.");
+						System.out.print(" Executing finally."); //$NON-NLS-1$
 				}
 			}
 		} finally {
@@ -2974,17 +2974,17 @@ public class ExpressionProcesser {
 	 */
 	public final void pushTryRethrow(int tryNumber) {
 		if (traceOn)
-			printTrace("Rethrow Try #"+tryNumber, errorOccurred  || ignoreExpression != null);
+			printTrace("Rethrow Try #"+tryNumber, errorOccurred  || ignoreExpression != null); //$NON-NLS-1$
 		
 		try {
 			if (errorOccurred)
 				return;
 			// We are not checking ignore because we need to make sure this is not called out of order.
 			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException("Rethrow received out of order."));
+				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryRethrow.RethrowReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
 			} else if (ignoreExpression == null) {
 				if (trysInCatch[topTry] == null || trysInCatch[topTry] == FINAL_CATCH)
-					processSyntaxException(new IllegalStateException("Retry received outside of an executing catch clause"));
+					processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryRethrow.RetryReceivedOutOfExecutingCatchClause_EXC_"))); //$NON-NLS-1$
 				else {
 					throwException(trysInCatch[topTry]);
 				}
@@ -2998,14 +2998,14 @@ public class ExpressionProcesser {
 	public final void pushTryEnd(int tryNumber) {
 		if (traceOn) {
 			indent(false);
-			printTrace("End Try #"+tryNumber, errorOccurred);
+			printTrace("End Try #"+tryNumber, errorOccurred); //$NON-NLS-1$
 		}
 		try {
 			if (errorOccurred)
 				return;
 			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
 			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException("Try/end received out of order."));
+				processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryEnd.TryEndReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
 			} else {
 				boolean inCatch = trysInCatch[topTry] != null;
 				trysInCatch[topTry] = null;
@@ -3166,7 +3166,7 @@ public class ExpressionProcesser {
 	 */
 	public final void pushMark(int markNumber) {
 		if (traceOn)
-			printTrace("Mark#"+markNumber, false);
+			printTrace("Mark#"+markNumber, false); //$NON-NLS-1$
 		
 		if (saveStates == null)
 			saveStates = new ArrayList();
@@ -3191,7 +3191,7 @@ public class ExpressionProcesser {
 	 */
 	public final void pushEndmark(int markID, boolean restore) {
 		if (traceOn)
-			printTrace("End Mark#"+markID+" Restored="+restore, false);
+			printTrace("End Mark#"+markID+" Restored="+restore, false); //$NON-NLS-1$ //$NON-NLS-2$
 		
 		try {
 			if (saveStates != null) {
@@ -3207,7 +3207,7 @@ public class ExpressionProcesser {
 					}
 				}
 				// But to be safe, if we got here, this is bad. We tried restore a mark we didn't have.
-				processSyntaxException(new IllegalStateException("Tried to do an end mark on a non-existing markID (" + markID + ')'));
+				processSyntaxException(new IllegalStateException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.PushEndmark.EndMarkOnNonExistingID_EXC_"), new Object[]{new Integer(markID)}))); //$NON-NLS-1$
 			}
 		} finally {
 			if (traceOn)
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java
index 18e1ee050..f6346fe09 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ForExpression.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.2 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.initParser.tree;
 
@@ -27,28 +27,28 @@ public class ForExpression extends AbstractEnum {
 	 */
 	public static final int ROOTEXPRESSION_VALUE = 0;
 
-	public static final ForExpression ROOTEXPRESSION = new ForExpression(ROOTEXPRESSION_VALUE, "Root");
+	public static final ForExpression ROOTEXPRESSION = new ForExpression(ROOTEXPRESSION_VALUE, "Root"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the array expression for an array access (i.e. the array to access)
 	 */
 	public static final int ARRAYACCESS_ARRAY_VALUE = 1;
 
-	public static final ForExpression ARRAYACCESS_ARRAY = new ForExpression(ARRAYACCESS_ARRAY_VALUE, "Array Access: Array Operand");
+	public static final ForExpression ARRAYACCESS_ARRAY = new ForExpression(ARRAYACCESS_ARRAY_VALUE, "Array Access: Array Operand"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating an index expression for an array access (i.e. one of the expressions within the <code>[]</code>).
 	 */
 	public static final int ARRAYACCESS_INDEX_VALUE = 2;
 
-	public static final ForExpression ARRAYACCESS_INDEX = new ForExpression(ARRAYACCESS_INDEX_VALUE, "Array Access: Index");
+	public static final ForExpression ARRAYACCESS_INDEX = new ForExpression(ARRAYACCESS_INDEX_VALUE, "Array Access: Index"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating an dimension expression for an array creation (i.e. one of the expressions within the <code>[]</code>).
 	 */
 	public static final int ARRAYCREATION_DIMENSION_VALUE = 3;
 
-	public static final ForExpression ARRAYCREATION_DIMENSION = new ForExpression(ARRAYCREATION_DIMENSION_VALUE, "Array Access: Dimension");
+	public static final ForExpression ARRAYCREATION_DIMENSION = new ForExpression(ARRAYCREATION_DIMENSION_VALUE, "Array Access: Dimension"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating an expression for an array initializer (i.e. one of the expressions with the <code>{}</code>). Special case is that
@@ -56,14 +56,14 @@ public class ForExpression extends AbstractEnum {
 	 */
 	public static final int ARRAYINITIALIZER_EXPRESSION_VALUE = 4;
 
-	public static final ForExpression ARRAYINITIALIZER_EXPRESSION = new ForExpression(ARRAYINITIALIZER_EXPRESSION_VALUE, "Array Initializer");
+	public static final ForExpression ARRAYINITIALIZER_EXPRESSION = new ForExpression(ARRAYINITIALIZER_EXPRESSION_VALUE, "Array Initializer"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the expression for the cast (i.e. the expresion after the <code>(type)</code>).
 	 */
 	public static final int CAST_EXPRESSION_VALUE = 5;
 
-	public static final ForExpression CAST_EXPRESSION = new ForExpression(CAST_EXPRESSION_VALUE, "Cast");
+	public static final ForExpression CAST_EXPRESSION = new ForExpression(CAST_EXPRESSION_VALUE, "Cast"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the argument expression for the new instance.
@@ -71,84 +71,84 @@ public class ForExpression extends AbstractEnum {
 	public static final int CLASSINSTANCECREATION_ARGUMENT_VALUE = 6;
 
 	public static final ForExpression CLASSINSTANCECREATION_ARGUMENT = new ForExpression(CLASSINSTANCECREATION_ARGUMENT_VALUE,
-			"Class Instance Creation: Argument");
+			"Class Instance Creation: Argument"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the condition for a conditional expression.
 	 */
 	public static final int CONDITIONAL_CONDITION_VALUE = 7;
 
-	public static final ForExpression CONDITIONAL_CONDITION = new ForExpression(CONDITIONAL_CONDITION_VALUE, "Conditional: Condition");
+	public static final ForExpression CONDITIONAL_CONDITION = new ForExpression(CONDITIONAL_CONDITION_VALUE, "Conditional: Condition"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the true (then) expression for a conditional expression.
 	 */
 	public static final int CONDITIONAL_TRUE_VALUE = 8;
 
-	public static final ForExpression CONDITIONAL_TRUE = new ForExpression(CONDITIONAL_TRUE_VALUE, "Conditional: True");
+	public static final ForExpression CONDITIONAL_TRUE = new ForExpression(CONDITIONAL_TRUE_VALUE, "Conditional: True"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the false (else) condition for a conditional expression.
 	 */
 	public static final int CONDITIONAL_FALSE_VALUE = 9;
 
-	public static final ForExpression CONDITIONAL_FALSE = new ForExpression(CONDITIONAL_FALSE_VALUE, "Conditional: False");
+	public static final ForExpression CONDITIONAL_FALSE = new ForExpression(CONDITIONAL_FALSE_VALUE, "Conditional: False"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the receiver for a field access (i.e. the expression before the ".")
 	 */
 	public static final int FIELD_RECEIVER_VALUE = 10;
 
-	public static final ForExpression FIELD_RECEIVER = new ForExpression(FIELD_RECEIVER_VALUE, "Field Access: Receiver");
+	public static final ForExpression FIELD_RECEIVER = new ForExpression(FIELD_RECEIVER_VALUE, "Field Access: Receiver"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the left operand of an infix expression.
 	 */
 	public static final int INFIX_LEFT_VALUE = 11;
 
-	public static final ForExpression INFIX_LEFT = new ForExpression(INFIX_LEFT_VALUE, "Infix: Left");
+	public static final ForExpression INFIX_LEFT = new ForExpression(INFIX_LEFT_VALUE, "Infix: Left"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the right operand of an infix expression.
 	 */
 	public static final int INFIX_RIGHT_VALUE = 12;
 
-	public static final ForExpression INFIX_RIGHT = new ForExpression(INFIX_RIGHT_VALUE, "Infix: Right");
+	public static final ForExpression INFIX_RIGHT = new ForExpression(INFIX_RIGHT_VALUE, "Infix: Right"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating an extended operand of an infix expression.
 	 */
 	public static final int INFIX_EXTENDED_VALUE = 13;
 
-	public static final ForExpression INFIX_EXTENDED = new ForExpression(INFIX_EXTENDED_VALUE, "Infix: Extended");
+	public static final ForExpression INFIX_EXTENDED = new ForExpression(INFIX_EXTENDED_VALUE, "Infix: Extended"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the value expression of an instanceof.
 	 */
 	public static final int INSTANCEOF_VALUE_VALUE = 14;
 
-	public static final ForExpression INSTANCEOF_VALUE = new ForExpression(INSTANCEOF_VALUE_VALUE, "Instanceof");
+	public static final ForExpression INSTANCEOF_VALUE = new ForExpression(INSTANCEOF_VALUE_VALUE, "Instanceof"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating a receiver expression for a method invocation.
 	 */
 	public static final int METHOD_RECEIVER_VALUE = 15;
 
-	public static final ForExpression METHOD_RECEIVER = new ForExpression(METHOD_RECEIVER_VALUE, "Method Invoke: Receiver");
+	public static final ForExpression METHOD_RECEIVER = new ForExpression(METHOD_RECEIVER_VALUE, "Method Invoke: Receiver"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating an argument for a method invocation.
 	 */
 	public static final int METHOD_ARGUMENT_VALUE = 16;
 
-	public static final ForExpression METHOD_ARGUMENT = new ForExpression(METHOD_ARGUMENT_VALUE, "Method Invoke: Argument");
+	public static final ForExpression METHOD_ARGUMENT = new ForExpression(METHOD_ARGUMENT_VALUE, "Method Invoke: Argument"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the operand expression for a prefix operator.
 	 */
 	public static final int PREFIX_OPERAND_VALUE = 17;
 
-	public static final ForExpression PREFIX_OPERAND = new ForExpression(PREFIX_OPERAND_VALUE, "Prefix: Operand");
+	public static final ForExpression PREFIX_OPERAND = new ForExpression(PREFIX_OPERAND_VALUE, "Prefix: Operand"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the right operand of an assignment operator.
@@ -157,7 +157,7 @@ public class ForExpression extends AbstractEnum {
 	 */
 	public static final int ASSIGNMENT_RIGHT_VALUE = 18;
 
-	public static final ForExpression ASSIGNMENT_RIGHT = new ForExpression(ASSIGNMENT_RIGHT_VALUE, "Assignment: Right");
+	public static final ForExpression ASSIGNMENT_RIGHT = new ForExpression(ASSIGNMENT_RIGHT_VALUE, "Assignment: Right"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the left operand of an assignment operator.
@@ -166,35 +166,35 @@ public class ForExpression extends AbstractEnum {
 	 */
 	public static final int ASSIGNMENT_LEFT_VALUE = 19;
 
-	public static final ForExpression ASSIGNMENT_LEFT = new ForExpression(ASSIGNMENT_LEFT_VALUE, "Assignment: Left");
+	public static final ForExpression ASSIGNMENT_LEFT = new ForExpression(ASSIGNMENT_LEFT_VALUE, "Assignment: Left"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the throw operand of the throw expression.
 	 */
 	public static final int THROW_OPERAND_VALUE = 20;
 
-	public static final ForExpression THROW_OPERAND = new ForExpression(THROW_OPERAND_VALUE, "Throw operand");
+	public static final ForExpression THROW_OPERAND = new ForExpression(THROW_OPERAND_VALUE, "Throw operand"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the if conditional operand of the if expression.
 	 */
 	public static final int IF_CONDITION_VALUE = 21;
 
-	public static final ForExpression IF_CONDITION = new ForExpression(IF_CONDITION_VALUE, "If condition");
+	public static final ForExpression IF_CONDITION = new ForExpression(IF_CONDITION_VALUE, "If condition"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the if true clause of the if expression.
 	 */
 	public static final int IF_TRUE_VALUE = 22;
 
-	public static final ForExpression IF_TRUE = new ForExpression(IF_TRUE_VALUE, "If true clause");
+	public static final ForExpression IF_TRUE = new ForExpression(IF_TRUE_VALUE, "If true clause"); //$NON-NLS-1$
 
 	/**
 	 * forExpression: Creating the if else clause of the if expression.
 	 */
 	public static final int IF_ELSE_VALUE = 23;
 
-	public static final ForExpression IF_ELSE = new ForExpression(IF_ELSE_VALUE, "If else clause");
+	public static final ForExpression IF_ELSE = new ForExpression(IF_ELSE_VALUE, "If else clause"); //$NON-NLS-1$
 
 	
 	/**
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java
index f74f672ff..9fbe0034f 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: InfixOperator.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.2 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.initParser.tree;
 
@@ -26,133 +26,133 @@ public class InfixOperator extends AbstractEnum {
 	 */
 	public static final int IN_TIMES_VALUE = 0;
 
-	public static final InfixOperator IN_TIMES = new InfixOperator(IN_TIMES_VALUE, "Infix *");
+	public static final InfixOperator IN_TIMES = new InfixOperator(IN_TIMES_VALUE, "Infix *"); //$NON-NLS-1$
 
 	/**
 	 * Infix divide "/"
 	 */
 	public static final int IN_DIVIDE_VALUE = 1;
 
-	public static final InfixOperator IN_DIVIDE = new InfixOperator(IN_DIVIDE_VALUE, "Infix /");
+	public static final InfixOperator IN_DIVIDE = new InfixOperator(IN_DIVIDE_VALUE, "Infix /"); //$NON-NLS-1$
 
 	/**
 	 * Infix remainder "%"
 	 */
 	public static final int IN_REMAINDER_VALUE = 2;
 
-	public static final InfixOperator IN_REMAINDER = new InfixOperator(IN_REMAINDER_VALUE, "Infix %");
+	public static final InfixOperator IN_REMAINDER = new InfixOperator(IN_REMAINDER_VALUE, "Infix %"); //$NON-NLS-1$
 
 	/**
 	 * Infix plus "+"
 	 */
 	public static final int IN_PLUS_VALUE = 3;
 
-	public static final InfixOperator IN_PLUS = new InfixOperator(IN_PLUS_VALUE, "Infix +");
+	public static final InfixOperator IN_PLUS = new InfixOperator(IN_PLUS_VALUE, "Infix +"); //$NON-NLS-1$
 
 	/**
 	 * Infix minus "-"
 	 */
 	public static final int IN_MINUS_VALUE = 4;
 
-	public static final InfixOperator IN_MINUS = new InfixOperator(IN_MINUS_VALUE, "Infix -");
+	public static final InfixOperator IN_MINUS = new InfixOperator(IN_MINUS_VALUE, "Infix -"); //$NON-NLS-1$
 
 	/**
 	 * Infix left shift " < <"
 	 */
 	public static final int IN_LEFT_SHIFT_VALUE = 5;
 
-	public static final InfixOperator IN_LEFT_SHIFT = new InfixOperator(IN_LEFT_SHIFT_VALUE, "Infix <<");
+	public static final InfixOperator IN_LEFT_SHIFT = new InfixOperator(IN_LEFT_SHIFT_VALUE, "Infix <<"); //$NON-NLS-1$
 
 	/**
 	 * Infix right shift signed ">>"
 	 */
 	public static final int IN_RIGHT_SHIFT_SIGNED_VALUE = 6;
 
-	public static final InfixOperator IN_RIGHT_SHIFT_SIGNED = new InfixOperator(IN_RIGHT_SHIFT_SIGNED_VALUE, "Infix >>");
+	public static final InfixOperator IN_RIGHT_SHIFT_SIGNED = new InfixOperator(IN_RIGHT_SHIFT_SIGNED_VALUE, "Infix >>"); //$NON-NLS-1$
 
 	/**
 	 * Infix right shift unsigned ">>>"
 	 */
 	public static final int IN_RIGHT_SHIFT_UNSIGNED_VALUE = 7;
 
-	public static final InfixOperator IN_RIGHT_SHIFT_UNSIGNED = new InfixOperator(IN_RIGHT_SHIFT_UNSIGNED_VALUE, "Infix >>>");
+	public static final InfixOperator IN_RIGHT_SHIFT_UNSIGNED = new InfixOperator(IN_RIGHT_SHIFT_UNSIGNED_VALUE, "Infix >>>"); //$NON-NLS-1$
 
 	/**
 	 * Infix less " <"
 	 */
 	public static final int IN_LESS_VALUE = 8;
 
-	public static final InfixOperator IN_LESS = new InfixOperator(IN_LESS_VALUE, "Infix <");
+	public static final InfixOperator IN_LESS = new InfixOperator(IN_LESS_VALUE, "Infix <"); //$NON-NLS-1$
 
 	/**
 	 * Infix greater ">"
 	 */
 	public static final int IN_GREATER_VALUE = 9;
 
-	public static final InfixOperator IN_GREATER = new InfixOperator(IN_GREATER_VALUE, "Infix >");
+	public static final InfixOperator IN_GREATER = new InfixOperator(IN_GREATER_VALUE, "Infix >"); //$NON-NLS-1$
 
 	/**
 	 * Infix less than or equals " <="
 	 */
 	public static final int IN_LESS_EQUALS_VALUE = 10;
 
-	public static final InfixOperator IN_LESS_EQUALS = new InfixOperator(IN_LESS_EQUALS_VALUE, "Infix <=");
+	public static final InfixOperator IN_LESS_EQUALS = new InfixOperator(IN_LESS_EQUALS_VALUE, "Infix <="); //$NON-NLS-1$
 
 	/**
 	 * Infix Greater than or equlas ">="
 	 */
 	public static final int IN_GREATER_EQUALS_VALUE = 11;
 
-	public static final InfixOperator IN_GREATER_EQUALS = new InfixOperator(IN_GREATER_EQUALS_VALUE, "Infix >=");
+	public static final InfixOperator IN_GREATER_EQUALS = new InfixOperator(IN_GREATER_EQUALS_VALUE, "Infix >="); //$NON-NLS-1$
 
 	/**
 	 * Infix equals "=="
 	 */
 	public static final int IN_EQUALS_VALUE = 12;
 
-	public static final InfixOperator IN_EQUALS = new InfixOperator(IN_EQUALS_VALUE, "Infix ==");
+	public static final InfixOperator IN_EQUALS = new InfixOperator(IN_EQUALS_VALUE, "Infix =="); //$NON-NLS-1$
 
 	/**
 	 * Infix not equals "!="
 	 */
 	public static final int IN_NOT_EQUALS_VALUE = 13;
 
-	public static final InfixOperator IN_NOT_EQUALS = new InfixOperator(IN_NOT_EQUALS_VALUE, "Infix !=");
+	public static final InfixOperator IN_NOT_EQUALS = new InfixOperator(IN_NOT_EQUALS_VALUE, "Infix !="); //$NON-NLS-1$
 
 	/**
 	 * Infix exclusive or "^"
 	 */
 	public static final int IN_XOR_VALUE = 14;
 
-	public static final InfixOperator IN_XOR = new InfixOperator(IN_XOR_VALUE, "Infix ^");
+	public static final InfixOperator IN_XOR = new InfixOperator(IN_XOR_VALUE, "Infix ^"); //$NON-NLS-1$
 
 	/**
 	 * Infix bitwise and "&"
 	 */
 	public static final int IN_AND_VALUE = 15;
 
-	public static final InfixOperator IN_AND = new InfixOperator(IN_AND_VALUE, "Infix &");
+	public static final InfixOperator IN_AND = new InfixOperator(IN_AND_VALUE, "Infix &"); //$NON-NLS-1$
 
 	/**
 	 * Infix bitwise or "|"
 	 */
 	public static final int IN_OR_VALUE = 16;
 
-	public static final InfixOperator IN_OR = new InfixOperator(IN_OR_VALUE, "Infix |");
+	public static final InfixOperator IN_OR = new InfixOperator(IN_OR_VALUE, "Infix |"); //$NON-NLS-1$
 
 	/**
 	 * Infix Conditional logical and "&&"
 	 */
 	public static final int IN_CONDITIONAL_AND_VALUE = 17;
 
-	public static final InfixOperator IN_CONDITIONAL_AND = new InfixOperator(IN_CONDITIONAL_AND_VALUE, "Infix &&");
+	public static final InfixOperator IN_CONDITIONAL_AND = new InfixOperator(IN_CONDITIONAL_AND_VALUE, "Infix &&"); //$NON-NLS-1$
 
 	/**
 	 * Infix Conditional logical or "||"
 	 */
 	public static final int IN_CONDITIONAL_OR_VALUE = 18;
 
-	public static final InfixOperator IN_CONDITIONAL_OR = new InfixOperator(IN_CONDITIONAL_OR_VALUE, "Ifnix ||");
+	public static final InfixOperator IN_CONDITIONAL_OR = new InfixOperator(IN_CONDITIONAL_OR_VALUE, "Ifnix ||"); //$NON-NLS-1$
 
 	/**
 	 * Return the infix operator for the given enum value.
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java
index 372365183..406a2057d 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: InternalConditionalOperandType.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.2 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.initParser.tree;
 
@@ -27,7 +27,7 @@ public class InternalConditionalOperandType extends AbstractEnum {
 	public final static int CONDITIONAL_FALSE_VALUE = 0;
 
 	public final static InternalConditionalOperandType CONDITIONAL_FALSE = new InternalConditionalOperandType(CONDITIONAL_FALSE_VALUE,
-			"Conditional False Operand Flag");
+			"Conditional False Operand Flag"); //$NON-NLS-1$
 
 	/**
 	 * Used in Conditional processing. True operand on expression stack
@@ -35,7 +35,7 @@ public class InternalConditionalOperandType extends AbstractEnum {
 	public final static int CONDITIONAL_TRUE_VALUE = 1;
 
 	public final static InternalConditionalOperandType CONDITIONAL_TRUE = new InternalConditionalOperandType(CONDITIONAL_TRUE_VALUE,
-			"Conditional True Operand Flag");
+			"Conditional True Operand Flag"); //$NON-NLS-1$
 
 	/**
 	 * Used in Conditional processing. Test operand on expression stack
@@ -43,7 +43,7 @@ public class InternalConditionalOperandType extends AbstractEnum {
 	public final static int CONDITIONAL_TEST_VALUE = 2;
 
 	public final static InternalConditionalOperandType CONDITIONAL_TEST = new InternalConditionalOperandType(CONDITIONAL_TEST_VALUE,
-			"Conditional Test Operand Flag");
+			"Conditional Test Operand Flag"); //$NON-NLS-1$
 
 	/**
 	 * Return the enum for the given value.
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java
index b6ebbc9ac..667014156 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java
@@ -13,7 +13,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int ARRAY_ACCESS_EXPRESSION_VALUE = 1;
 
 	public final static InternalExpressionTypes ARRAY_ACCESS_EXPRESSION = new InternalExpressionTypes(ARRAY_ACCESS_EXPRESSION_VALUE,
-			"Array Access Expression");
+			"Array Access Expression"); //$NON-NLS-1$
 
 	/**
 	 * ARRAY CREATION Expression
@@ -21,7 +21,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int ARRAY_CREATION_EXPRESSION_VALUE = 2;
 
 	public final static InternalExpressionTypes ARRAY_CREATION_EXPRESSION = new InternalExpressionTypes(ARRAY_CREATION_EXPRESSION_VALUE,
-			"Array Creation Expression");
+			"Array Creation Expression"); //$NON-NLS-1$
 
 	/**
 	 * ARRAY INITIALIZER expression
@@ -29,14 +29,14 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int ARRAY_INITIALIZER_EXPRESSION_VALUE = 3;
 
 	public final static InternalExpressionTypes ARRAY_INITIALIZER_EXPRESSION = new InternalExpressionTypes(ARRAY_INITIALIZER_EXPRESSION_VALUE,
-			"Array Initializer Expression");
+			"Array Initializer Expression"); //$NON-NLS-1$
 
 	/**
 	 * CAST Expression.
 	 */
 	public final static int CAST_EXPRESSION_VALUE = 4;
 
-	public final static InternalExpressionTypes CAST_EXPRESSION = new InternalExpressionTypes(CAST_EXPRESSION_VALUE, "Cast Expression");
+	public final static InternalExpressionTypes CAST_EXPRESSION = new InternalExpressionTypes(CAST_EXPRESSION_VALUE, "Cast Expression"); //$NON-NLS-1$
 
 	/**
 	 * CONDITIONAL expression
@@ -44,7 +44,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int CONDITIONAL_EXPRESSION_VALUE = 5;
 
 	public final static InternalExpressionTypes CONDITIONAL_EXPRESSION = new InternalExpressionTypes(CONDITIONAL_EXPRESSION_VALUE,
-			"Conditional Expression");
+			"Conditional Expression"); //$NON-NLS-1$
 
 	/**
 	 * CLASS INSTANCE CREATION expression
@@ -52,7 +52,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int CLASS_INSTANCE_CREATION_EXPRESSION_VALUE = 6;
 
 	public final static InternalExpressionTypes CLASS_INSTANCE_CREATION_EXPRESSION = new InternalExpressionTypes(
-			CLASS_INSTANCE_CREATION_EXPRESSION_VALUE, "Class Instance Creation Expression");
+			CLASS_INSTANCE_CREATION_EXPRESSION_VALUE, "Class Instance Creation Expression"); //$NON-NLS-1$
 
 	/**
 	 * FIELD ACCESS expression.
@@ -60,7 +60,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int FIELD_ACCESS_EXPRESSION_VALUE = 7;
 
 	public final static InternalExpressionTypes FIELD_ACCESS_EXPRESSION = new InternalExpressionTypes(FIELD_ACCESS_EXPRESSION_VALUE,
-			"Field Access Expression");
+			"Field Access Expression"); //$NON-NLS-1$
 
 	/**
 	 * INSTANCEOF Expression.
@@ -68,28 +68,28 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int INSTANCEOF_EXPRESSION_VALUE = 8;
 
 	public final static InternalExpressionTypes INSTANCEOF_EXPRESSION = new InternalExpressionTypes(INSTANCEOF_EXPRESSION_VALUE,
-			"Instanceof Expression");
+			"Instanceof Expression"); //$NON-NLS-1$
 
 	/**
 	 * Infix expression
 	 */
 	public final static int INFIX_EXPRESSION_VALUE = 9;
 
-	public final static InternalExpressionTypes INFIX_EXPRESSION = new InternalExpressionTypes(INFIX_EXPRESSION_VALUE, "Infix Expression");
+	public final static InternalExpressionTypes INFIX_EXPRESSION = new InternalExpressionTypes(INFIX_EXPRESSION_VALUE, "Infix Expression"); //$NON-NLS-1$
 
 	/**
 	 * Method expression.
 	 */
 	public final static int METHOD_EXPRESSION_VALUE = 10;
 
-	public final static InternalExpressionTypes METHOD_EXPRESSION = new InternalExpressionTypes(METHOD_EXPRESSION_VALUE, "Method Invoke Expression");
+	public final static InternalExpressionTypes METHOD_EXPRESSION = new InternalExpressionTypes(METHOD_EXPRESSION_VALUE, "Method Invoke Expression"); //$NON-NLS-1$
 
 	/**
 	 * Prefix expression
 	 */
 	public final static int PREFIX_EXPRESSION_VALUE = 11;
 
-	public final static InternalExpressionTypes PREFIX_EXPRESSION = new InternalExpressionTypes(PREFIX_EXPRESSION_VALUE, "Prefix Expression");
+	public final static InternalExpressionTypes PREFIX_EXPRESSION = new InternalExpressionTypes(PREFIX_EXPRESSION_VALUE, "Prefix Expression"); //$NON-NLS-1$
 
 	/**
 	 * Push to proxy expression.
@@ -97,7 +97,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int PUSH_TO_PROXY_EXPRESSION_VALUE = 12;
 
 	public final static InternalExpressionTypes PUSH_TO_PROXY_EXPRESSION = new InternalExpressionTypes(PUSH_TO_PROXY_EXPRESSION_VALUE,
-			"Push to Proxy Expression");
+			"Push to Proxy Expression"); //$NON-NLS-1$
 
 	/**
 	 * Push BeanType expression proxy expression.
@@ -105,7 +105,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE = 13;
 	
 	public final static InternalExpressionTypes PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE,
-			"Push BeanType ExpressionProxy Expression");
+			"Push BeanType ExpressionProxy Expression"); //$NON-NLS-1$
 
 	
 	/**
@@ -114,7 +114,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int TYPERECEIVER_EXPRESSION_VALUE = 14;
 
 	public final static InternalExpressionTypes TYPERECEIVER_EXPRESSION = new InternalExpressionTypes(TYPERECEIVER_EXPRESSION_VALUE,
-			"Type Receiver Expression");
+			"Type Receiver Expression"); //$NON-NLS-1$
 
 	/**
 	 * Assignment to an ExpressionProxy expression.
@@ -122,7 +122,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int ASSIGNMENT_PROXY_EXPRESSION_VALUE = 15;
 
 	public final static InternalExpressionTypes ASSIGNMENT_PROXY_EXPRESSION = new InternalExpressionTypes(ASSIGNMENT_PROXY_EXPRESSION_VALUE,
-			"Assignment to Proxy Expression");
+			"Assignment to Proxy Expression"); //$NON-NLS-1$
 
 	/**
 	 * Push expression proxy value expression.
@@ -130,7 +130,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE = 16;
 
 	public final static InternalExpressionTypes PUSH_TO_EXPRESSION_PROXY_EXPRESSION = new InternalExpressionTypes(
-			PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE, "Push to Expression Proxy Expression");
+			PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE, "Push to Expression Proxy Expression"); //$NON-NLS-1$
 
 	/**
 	 * Assignment expression.
@@ -138,7 +138,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int ASSIGNMENT_EXPRESSION_VALUE = 17;
 
 	public final static InternalExpressionTypes ASSIGNMENT_EXPRESSION = new InternalExpressionTypes(ASSIGNMENT_EXPRESSION_VALUE,
-			"Assignment Expression");
+			"Assignment Expression"); //$NON-NLS-1$
 
 	/**
 	 * Block End expression.
@@ -146,7 +146,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int BLOCK_BEGIN_EXPRESSION_VALUE = 18;
 	
 	public final static InternalExpressionTypes BLOCK_BEGIN_EXPRESSION = new InternalExpressionTypes(BLOCK_BEGIN_EXPRESSION_VALUE,
-			"Begin block Expression");
+			"Begin block Expression"); //$NON-NLS-1$
 
 	/**
 	 * Block End expression.
@@ -154,7 +154,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int BLOCK_BREAK_EXPRESSION_VALUE = 19;
 	
 	public final static InternalExpressionTypes BLOCK_BREAK_EXPRESSION = new InternalExpressionTypes(BLOCK_BREAK_EXPRESSION_VALUE,
-			"Break block Expression");
+			"Break block Expression"); //$NON-NLS-1$
 
 	/**
 	 * Block End expression.
@@ -162,7 +162,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int BLOCK_END_EXPRESSION_VALUE = 20;
 	
 	public final static InternalExpressionTypes BLOCK_END_EXPRESSION = new InternalExpressionTypes(BLOCK_END_EXPRESSION_VALUE,
-			"End block Expression");
+			"End block Expression"); //$NON-NLS-1$
 
 	/**
 	 * Try Begin expression.
@@ -170,7 +170,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int TRY_BEGIN_EXPRESSION_VALUE = 21;
 	
 	public final static InternalExpressionTypes TRY_BEGIN_EXPRESSION = new InternalExpressionTypes(TRY_BEGIN_EXPRESSION_VALUE,
-			"Begin try Expression");
+			"Begin try Expression"); //$NON-NLS-1$
 
 	/**
 	 * Try Catch expression.
@@ -178,7 +178,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int TRY_CATCH_EXPRESSION_VALUE = 22;
 	
 	public final static InternalExpressionTypes TRY_CATCH_EXPRESSION = new InternalExpressionTypes(TRY_CATCH_EXPRESSION_VALUE,
-			"Try catch Expression");
+			"Try catch Expression"); //$NON-NLS-1$
 	
 	/**
 	 * Try Finally expression.
@@ -186,7 +186,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int TRY_FINALLY_EXPRESSION_VALUE = 23;
 	
 	public final static InternalExpressionTypes TRY_FINALLY_EXPRESSION = new InternalExpressionTypes(TRY_FINALLY_EXPRESSION_VALUE,
-			"Try finally Expression");
+			"Try finally Expression"); //$NON-NLS-1$
 
 	/**
 	 * Try End expression.
@@ -194,7 +194,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int TRY_END_EXPRESSION_VALUE = 24;
 	
 	public final static InternalExpressionTypes TRY_END_EXPRESSION = new InternalExpressionTypes(TRY_END_EXPRESSION_VALUE,
-			"End try Expression");
+			"End try Expression"); //$NON-NLS-1$
 	
 	/**
 	 * Throw expression.
@@ -202,7 +202,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int THROW_EXPRESSION_VALUE = 25;
 	
 	public final static InternalExpressionTypes THROW_EXPRESSION = new InternalExpressionTypes(THROW_EXPRESSION_VALUE,
-			"Throw Expression");
+			"Throw Expression"); //$NON-NLS-1$
 
 	/**
 	 * Rethrow expression.
@@ -210,7 +210,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int RETHROW_EXPRESSION_VALUE = 26;
 	
 	public final static InternalExpressionTypes RETHROW_EXPRESSION = new InternalExpressionTypes(RETHROW_EXPRESSION_VALUE,
-			"Rethrow Expression");
+			"Rethrow Expression"); //$NON-NLS-1$
 
 	/**
 	 * Push Method Lookup expression proxy expression.
@@ -218,7 +218,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE = 27;
 	
 	public final static InternalExpressionTypes PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE,
-			"Push Method ExpressionProxy Expression");
+			"Push Method ExpressionProxy Expression"); //$NON-NLS-1$
 
 	/**
 	 * Push Field Lookup expression proxy expression.
@@ -226,7 +226,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE = 28;
 	
 	public final static InternalExpressionTypes PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE,
-			"Push Field ExpressionProxy Expression");
+			"Push Field ExpressionProxy Expression"); //$NON-NLS-1$
 
 	/**
 	 * Push If/else (the clauses) expression proxy expression.
@@ -234,7 +234,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int IF_ELSE_EXPRESSION_VALUE = 29;
 	
 	public final static InternalExpressionTypes IF_ELSE_EXPRESSION = new InternalExpressionTypes(IF_ELSE_EXPRESSION_VALUE,
-			"Push If/else Expression");
+			"Push If/else Expression"); //$NON-NLS-1$
 
 	/**
 	 * Push If/else condition test expression proxy expression.
@@ -242,7 +242,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int IF_TEST_EXPRESSION_VALUE = 30;
 	
 	public final static InternalExpressionTypes IF_TEST_EXPRESSION = new InternalExpressionTypes(IF_TEST_EXPRESSION_VALUE,
-			"Push If Test Expression");
+			"Push If Test Expression"); //$NON-NLS-1$
 
 
 	/**
@@ -251,7 +251,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int NEW_INSTANCE_VALUE = 31;
 	
 	public final static InternalExpressionTypes NEW_INSTANCE = new InternalExpressionTypes(NEW_INSTANCE_VALUE,
-			"Push New Instance Expression");
+			"Push New Instance Expression"); //$NON-NLS-1$
 
 
 	/**
@@ -260,7 +260,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int MARK_VALUE = 32;
 	
 	public final static InternalExpressionTypes MARK = new InternalExpressionTypes(MARK_VALUE,
-			"Push Mark Expression");
+			"Push Mark Expression"); //$NON-NLS-1$
 
 	/**
 	 * Push end mark proxy expression.
@@ -268,7 +268,7 @@ public class InternalExpressionTypes extends AbstractEnum {
 	public final static int ENDMARK_VALUE = 33;
 	
 	public final static InternalExpressionTypes ENDMARK = new InternalExpressionTypes(ENDMARK_VALUE,
-			"Push End Mark Expression");
+			"Push End Mark Expression"); //$NON-NLS-1$
 
 	private InternalExpressionTypes(int value, String name) {
 		super(value, name);
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java
index 8707a2737..c048a4dd1 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: InternalIfElseOperandType.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.2 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.initParser.tree;
 
@@ -27,7 +27,7 @@ public class InternalIfElseOperandType extends AbstractEnum {
 	public final static int ELSE_CLAUSE_VALUE = 0;
 
 	public final static InternalIfElseOperandType ELSE_CLAUSE = new InternalIfElseOperandType(ELSE_CLAUSE_VALUE,
-			"Else Clause Flag");
+			"Else Clause Flag"); //$NON-NLS-1$
 
 	/**
 	 * Used in If/else processing. If operand on expression stack
@@ -35,7 +35,7 @@ public class InternalIfElseOperandType extends AbstractEnum {
 	public final static int TRUE_CLAUSE_VALUE = 1;
 
 	public final static InternalIfElseOperandType TRUE_CLAUSE = new InternalIfElseOperandType(TRUE_CLAUSE_VALUE,
-			"If True Clause Flag");
+			"If True Clause Flag"); //$NON-NLS-1$
 
 	/**
 	 * Return the enum for the given value.
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java
index e4b2e89ab..bef20d502 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: InternalInfixOperandType.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.2 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.initParser.tree;
  
@@ -25,18 +25,18 @@ public class InternalInfixOperandType extends AbstractEnum {
 	 * Used in Infix processing. Left operand on expression stack
 	 */
 	public final static int INFIX_LEFT_OPERAND_VALUE = 0;
-	public final static InternalInfixOperandType INFIX_LEFT_OPERAND = new InternalInfixOperandType(INFIX_LEFT_OPERAND_VALUE, "Infix Left Operand Flag");
+	public final static InternalInfixOperandType INFIX_LEFT_OPERAND = new InternalInfixOperandType(INFIX_LEFT_OPERAND_VALUE, "Infix Left Operand Flag"); //$NON-NLS-1$
 	/**
 	 * Used in Infix processing. Other operand (but not last) on expression stack
 	 */
 	public final static int INFIX_OTHER_OPERAND_VALUE = 1;
 	public final static InternalInfixOperandType INFIX_OTHER_OPERAND = new InternalInfixOperandType(INFIX_OTHER_OPERAND_VALUE,
-	"Infix Other Operand Flag");
+	"Infix Other Operand Flag"); //$NON-NLS-1$
 	/**
 	 * Used in Infix processing. Rightmost (last) operand on expression stack
 	 */
 	public final static int INFIX_LAST_OPERAND_VALUE = 2;
-	public final static InternalInfixOperandType INFIX_LAST_OPERAND = new InternalInfixOperandType(INFIX_LAST_OPERAND_VALUE, "Infix Last Operand Flag");
+	public final static InternalInfixOperandType INFIX_LAST_OPERAND = new InternalInfixOperandType(INFIX_LAST_OPERAND_VALUE, "Infix Last Operand Flag"); //$NON-NLS-1$
 
 	/**
 	 * Return the enum for the given value.
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java
index 6cc2a9cfe..a1e0a3021 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: PrefixOperator.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.2 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.initParser.tree;
 
@@ -26,28 +26,28 @@ public class PrefixOperator extends AbstractEnum {
 	 */
 	public static final int PRE_PLUS_VALUE = 0;
 
-	public static final PrefixOperator PRE_PLUS = new PrefixOperator(PRE_PLUS_VALUE, "Prefix +");
+	public static final PrefixOperator PRE_PLUS = new PrefixOperator(PRE_PLUS_VALUE, "Prefix +"); //$NON-NLS-1$
 
 	/**
 	 * Prefix minus "-"
 	 */
 	public static final int PRE_MINUS_VALUE = 1;
 
-	public static final PrefixOperator PRE_MINUS = new PrefixOperator(PRE_MINUS_VALUE, "Prefix -");
+	public static final PrefixOperator PRE_MINUS = new PrefixOperator(PRE_MINUS_VALUE, "Prefix -"); //$NON-NLS-1$
 
 	/**
 	 * Prefix bitwise complement "~"
 	 */
 	public static final int PRE_COMPLEMENT_VALUE = 2;
 
-	public static final PrefixOperator PRE_COMPLEMENT = new PrefixOperator(PRE_COMPLEMENT_VALUE, "Prefix ~");
+	public static final PrefixOperator PRE_COMPLEMENT = new PrefixOperator(PRE_COMPLEMENT_VALUE, "Prefix ~"); //$NON-NLS-1$
 
 	/**
 	 * Prefix logical not "!"
 	 */
 	public static final int PRE_NOT_VALUE = 3;
 
-	public static final PrefixOperator PRE_NOT = new PrefixOperator(PRE_NOT_VALUE, "Prefix !");
+	public static final PrefixOperator PRE_NOT = new PrefixOperator(PRE_NOT_VALUE, "Prefix !"); //$NON-NLS-1$
 
 	/**
 	 * Return the prefix operator for the given enum value.
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties
index c3f193e01..8723936c8 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties
@@ -10,7 +10,19 @@
 ###############################################################################
 ExpressionProcesser.CannotCastXToY_EXC_                           = IWAV0156E Cannot cast "{0}" to be "{1}".
 ExpressionProcesser.InvalidOperandOfPrefixOperator_EXC_           = IWAV0157E {0} not valid as the operand of prefix operator "{1}".
+ExpressionProcesser.PopExpressionType.ExpressionVoid_EXC_=Expression was void.
 ExpressionProcesser.InvalidOperandOfOperator_EXC_                 = IWAV0158E {0} not valid as the operand of operator "{1}".
 ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray_EXC_  = IWAV0159E {0} is greater then number of dimensions ({1}) in the array
+ExpressionProcesser.CreateArrayAccessReference.OutOfBounds_EXC_=Index: {0} size:{1}
+ExpressionProcesser.PushTryEnd.TryEndReceivedOutOfOrder_EXC_=Try/end received out of order.
+ExpressionProcesser.PushEndmark.EndMarkOnNonExistingID_EXC_=Tried to do an end mark on a non-existing markID ({0})
 ExpressionProcesser.NotAnArray_EXC_                               = IWAV0160E "{0}" is not an array.
 ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested_EXC_ = IWAV0161E Arraytype "{0}" has fewer dimensions than creation requested ({1}).
+ExpressionProcesser.CreateFieldAccessReference.FieldsTypesNotMatching_EXC_=Field receiver does not match the type of the field: Field: {0} receiver: {1}
+ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyNotSet_EXC_=Expression Proxy never set.
+ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyDoesntExist_EXC_=Expression proxy doesn't exist.
+ExpressionProcesser.PushBlockEnd.ReceivedEndBlocksOutOfOrder_EXC_=End Blocks received out of order.
+ExpressionProcesser.PushTryCatchClause.CatchReceivedOutOfOrder_EXC_=Catch received out of order.
+ExpressionProcesser.PushTryFinallyClause.FinallyReceivedOutOfOrder_EXC_=Finally received out of order.
+ExpressionProcesser.PushTryRethrow.RethrowReceivedOutOfOrder_EXC_=Rethrow received out of order.
+ExpressionProcesser.PushTryRethrow.RetryReceivedOutOfExecutingCatchClause_EXC_=Retry received outside of an executing catch clause
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java
index 606fd76b5..9cff4bc77 100644
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java
+++ b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: Expression.java,v $
- *  $Revision: 1.8 $  $Date: 2005/05/18 18:41:20 $ 
+ *  $Revision: 1.9 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.core;
 
@@ -132,7 +132,7 @@ public abstract class Expression implements IExpression {
 	 */
 	private static final Integer ARRAY_CREATION_DIMENSION_1 = new Integer(1);	// Use in normal case of one dimension. Save object creation.
 	private static final Integer ARRAY_CREATION_DIMENSION_0 = new Integer(0);	// Use in normal case of initializer. Save object creation.
-	private static final ForExpression ARRAY_INITIALIZER = new ExpressionEnum(Integer.MIN_VALUE+1, "Array Initializer Internal");
+	private static final ForExpression ARRAY_INITIALIZER = new ExpressionEnum(Integer.MIN_VALUE+1, "Array Initializer Internal"); //$NON-NLS-1$
 	
 	/*
 	 * ARRAY INITIALIZER expression
@@ -348,20 +348,20 @@ public abstract class Expression implements IExpression {
 	}
 	
 	// This is pushed onto the next expression stack, and when it is popped, then the expression is complete and ready to be pushed to the proxy side.
-	private static final ForExpression PROCESS_EXPRESSION = new ExpressionEnum(Integer.MIN_VALUE, "Process Expression");
+	private static final ForExpression PROCESS_EXPRESSION = new ExpressionEnum(Integer.MIN_VALUE, "Process Expression"); //$NON-NLS-1$
 	
 	// This is pushed onto the next expression stack for end block and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression BLOCKEND_EXPRESSION = new ExpressionEnum(PROCESS_EXPRESSION.getValue()-2, "End Block Expression");
+	private static final ForExpression BLOCKEND_EXPRESSION = new ExpressionEnum(PROCESS_EXPRESSION.getValue()-2, "End Block Expression"); //$NON-NLS-1$
 
 	// This is pushed onto the next expression stack for end try and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression TRYEND_EXPRESSION = new ExpressionEnum(BLOCKEND_EXPRESSION.getValue()-1, "End Try Expression");
+	private static final ForExpression TRYEND_EXPRESSION = new ExpressionEnum(BLOCKEND_EXPRESSION.getValue()-1, "End Try Expression"); //$NON-NLS-1$
 
 	// This is pushed onto the next expression stack for catch and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression TRYCATCH_EXPRESSION = new ExpressionEnum(TRYEND_EXPRESSION.getValue()-1, "Catch Expression");
+	private static final ForExpression TRYCATCH_EXPRESSION = new ExpressionEnum(TRYEND_EXPRESSION.getValue()-1, "Catch Expression"); //$NON-NLS-1$
 	
 
 	// This is pushed onto the next expression stack for begin thread transfer and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression THREADTRANSFER_EXPRESSION = new ExpressionEnum(TRYCATCH_EXPRESSION.getValue()-1, "Catch Expression");
+	private static final ForExpression THREADTRANSFER_EXPRESSION = new ExpressionEnum(TRYCATCH_EXPRESSION.getValue()-1, "Catch Expression"); //$NON-NLS-1$
 
 	/**
 	 * Check the for expression, and if legal, set to the next valid for expression type,
@@ -1597,7 +1597,7 @@ public abstract class Expression implements IExpression {
 		try {
 			checkForExpression(forExpression);
 			if (!proxy.isValidForReassignment())
-				throw new IllegalArgumentException("Invalid expression type for reassignment:"+proxy.toString());
+				throw new IllegalArgumentException(MessageFormat.format(ProxyMessages.getString("Expression.CreateProxyReassignmentExpression.InvalidForReassignment_EXC_"), new Object[]{proxy.toString()})); //$NON-NLS-1$
 			push(proxy);
 			push(InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION);
 
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java
index 9b816ab8c..83ff500c2 100644
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java
+++ b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ExpressionProxy.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.2 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.core;
 
@@ -334,6 +334,6 @@ public class ExpressionProxy implements IProxy {
 	 * @see java.lang.Object#toString()
 	 */
 	public String toString() {
-		return super.toString()+": "+getProxyID();
+		return super.toString()+": "+getProxyID(); //$NON-NLS-1$
 	}
 }
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java
index 3d64cc38d..6960eaa7a 100644
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java
+++ b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: IProxyConstants.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:53:46 $ 
+ *  $Revision: 1.4 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.core;
  
@@ -24,7 +24,7 @@ public interface IProxyConstants {
 	/**
 	 * Launch group id for proxy launch configurations.
 	 */	
-	public static final String ID_PROXY_LAUNCH_GROUP = "org.eclipse.jem.proxy";
+	public static final String ID_PROXY_LAUNCH_GROUP = "org.eclipse.jem.proxy"; //$NON-NLS-1$
 	
 	/**
 	 * Launch configuration type for local proxy. It is local in that it is on the same machine, but a different
@@ -32,7 +32,7 @@ public interface IProxyConstants {
 	 * 
 	 * It here because this is the default config type when no launch config specified for a project.
 	 */
-	public static final String LOCAL_LAUNCH_TYPE = "org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType";
+	public static final String LOCAL_LAUNCH_TYPE = "org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"; //$NON-NLS-1$
 	
 	/**
 	 * Attribute on Proxy Launch Configuration:
@@ -43,7 +43,7 @@ public interface IProxyConstants {
 	 *
 	 * The default value for this attribute is "true", so it should be set only to "false".
 	 */
-	public static final String ATTRIBUTE_AWT_SWING = "org.eclipse.jem.proxy.AWT/Swing";
+	public static final String ATTRIBUTE_AWT_SWING = "org.eclipse.jem.proxy.AWT/Swing"; //$NON-NLS-1$
 	
 	/**
 	 * Attribute on Proxy Launch Configuration:
@@ -54,7 +54,7 @@ public interface IProxyConstants {
 	 * Not to be set by contributors. This will be set only by the ProxyLaunchSupport start implementation methods.
 	 * It is here only because external developer's launch configurations will need to be able to access this.
 	 */
-	public static final String ATTRIBUTE_LAUNCH_KEY = "org.eclipse.jem.proxy.LaunchKey";
+	public static final String ATTRIBUTE_LAUNCH_KEY = "org.eclipse.jem.proxy.LaunchKey"; //$NON-NLS-1$
 	
 	/**
 	 * Attribute on Proxy Launch Configuration:
@@ -64,6 +64,6 @@ public interface IProxyConstants {
 	 * Not to be set by contributors. This will be set only by the ProxyLaunchSupport start implementation methods.
 	 * It is here only because external developer's launch configurations will need to be able to access this.
 	 */
-	public static final String ATTRIBUTE_VM_TITLE = "org.eclipse.jem.proxy.vmtitle";
+	public static final String ATTRIBUTE_VM_TITLE = "org.eclipse.jem.proxy.vmtitle"; //$NON-NLS-1$
 
 }
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java
index 997675e40..5fb297bce 100644
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java
+++ b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: PDEContributeClasspathInstance.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
+ *  $Revision: 1.3 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.core;
 
@@ -35,9 +35,9 @@ class PDEContributeClasspathInstance {
 	 * @since 1.0.2
 	 */
 	public static IPDEContributeClasspath getInstance() {
-		if (Platform.getBundle("org.eclipse.pde.core") != null) {
+		if (Platform.getBundle("org.eclipse.pde.core") != null) { //$NON-NLS-1$
 			try {
-				Class pdeClass = Class.forName("org.eclipse.jem.internal.proxy.core.PDEContributeClasspath");
+				Class pdeClass = Class.forName("org.eclipse.jem.internal.proxy.core.PDEContributeClasspath"); //$NON-NLS-1$
 				return (IPDEContributeClasspath) pdeClass.newInstance();
 			} catch (ClassNotFoundException e) {
 				// PDE not available, this is ok.
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java
index 312a2557b..ebc0770cb 100644
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java
+++ b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.core;
 /*
  *  $RCSfile: ProxyFactoryRegistry.java,v $
- *  $Revision: 1.9 $  $Date: 2005/04/20 18:50:13 $ 
+ *  $Revision: 1.10 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 
@@ -328,9 +328,9 @@ public abstract class ProxyFactoryRegistry {
 		
 		fRegisteredConstants.clear();
 		
-		TimerTests.basicTest.startStep("Registry Terminated");
+		TimerTests.basicTest.startStep("Registry Terminated"); //$NON-NLS-1$
 		registryTerminated(wait);
-		TimerTests.basicTest.stopStep("Registry Terminated");
+		TimerTests.basicTest.stopStep("Registry Terminated"); //$NON-NLS-1$
 		
 //		TimerTests.basicTest.startStep("Registry Terminated Notification");
 		fireRegistryTerminated();	// Let everyone know that we are gone. This is fired even if wait is false because at this point in time the registry is invalid.
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java
index df36db4c6..878867974 100644
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java
+++ b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ProxyLaunchSupport.java,v $
- *  $Revision: 1.22 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.23 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.core;
 
@@ -54,14 +54,14 @@ public class ProxyLaunchSupport {
 	// If the property is trully not set, then there is no default and there are no configurations for it.
 	public static final String NOT_SET = "...not..set..";	  //$NON-NLS-1$
 		
-	public static final String EXPRESSION_TRACING = "/debug/traceexpressions";	// Trace IExpressions.
+	public static final String EXPRESSION_TRACING = "/debug/traceexpressions";	// Trace IExpressions. //$NON-NLS-1$
 	
 	/**
 	 * Timer threshold for indicating any expressions that took longer than this.
 	 * If not set, then threshold will default to 100ms.
 	 * It will only be used if traceexpressions is true.
 	 */
-	public static final String EXPRESSION_TRACEING_TIMER_THRESHOLD = "/debug/traceexpressionstimethreshold";	
+	public static final String EXPRESSION_TRACEING_TIMER_THRESHOLD = "/debug/traceexpressionstimethreshold";	 //$NON-NLS-1$
 	
 	/*
 	 * Registry of launch key to LaunchInfo classes.
@@ -355,13 +355,13 @@ public class ProxyLaunchSupport {
 
 		if (pm == null)
 			pm = new NullProgressMonitor();
-		String stepId = "Pre-launch VM ( " + vmTitle + " )";
+		String stepId = "Pre-launch VM ( " + vmTitle + " )"; //$NON-NLS-1$ //$NON-NLS-2$
 		TimerTests.basicTest.startStep(stepId);
-		if (vmTitle.equals("Beaninfo"))
+		if (vmTitle.equals("Beaninfo")) //$NON-NLS-1$
 			PerformanceMonitorUtil.getMonitor().snapshot(125);
 		final ILaunchConfigurationWorkingCopy configwc = config.getWorkingCopy();
 		
-		pm.beginTask("", 400);
+		pm.beginTask("", 400); //$NON-NLS-1$
 		pm.subTask(ProxyMessages.getString("ProxyLaunch"));	//$NON-NLS-1$
 		if (waitForBuild) {
 			// See if build needed or waiting or inprogress, if so, wait for it to complete. We've
@@ -468,7 +468,7 @@ public class ProxyLaunchSupport {
 		}	
 		
 		pm.done();
-		if (vmTitle.equals("Beaninfo"))
+		if (vmTitle.equals("Beaninfo")) //$NON-NLS-1$
 			PerformanceMonitorUtil.getMonitor().snapshot(126);
 		TimerTests.basicTest.stopStep(stepId);
 		return launchInfo.resultRegistry;
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java
index 72801a59d..16be53fa3 100644
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java
+++ b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.core;
 /*
  *  $RCSfile: ProxyPlugin.java,v $
- *  $Revision: 1.49 $  $Date: 2005/04/22 14:33:08 $ 
+ *  $Revision: 1.50 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 
@@ -56,8 +56,8 @@ public class ProxyPlugin extends Plugin {
 	}
 	
 	private static ProxyPlugin PROXY_PLUGIN = null;
-	public static final String PREFERENCES_VM_NOVERIFY_KEY = "JEM_PREFERENCES_VM_NOVERIFY_KEY"; // Key for NOVERIFY option of VM
-	public static final String PDE_NATURE_ID = "org.eclipse.pde.PluginNature" ;
+	public static final String PREFERENCES_VM_NOVERIFY_KEY = "JEM_PREFERENCES_VM_NOVERIFY_KEY"; // Key for NOVERIFY option of VM //$NON-NLS-1$
+	public static final String PDE_NATURE_ID = "org.eclipse.pde.PluginNature" ; //$NON-NLS-1$
 		
 	// If this is set to true, then in development mode and it will try for proxy jars in directories.
 	private boolean devMode;
@@ -255,12 +255,12 @@ public class ProxyPlugin extends Plugin {
 		// If the filenameWithinBundle begins with one of these special characters,
 		// it might be in a fragment.
 		if (filenameWithinBundle.charAt(0) == '$'
-				&& (filenameWithinBundle.regionMatches(true, 0, "$nl$", 0, "$nl$".length())
-						|| filenameWithinBundle.regionMatches(true, 0, "$os$", 0, "$os$".length()) || filenameWithinBundle.regionMatches(true, 0,
-						"$ws$", 0, "$ws$".length())))
+				&& (filenameWithinBundle.regionMatches(true, 0, "$nl$", 0, "$nl$".length()) //$NON-NLS-1$ //$NON-NLS-2$
+						|| filenameWithinBundle.regionMatches(true, 0, "$os$", 0, "$os$".length()) || filenameWithinBundle.regionMatches(true, 0, //$NON-NLS-1$ //$NON-NLS-2$
+						"$ws$", 0, "$ws$".length()))) //$NON-NLS-1$ //$NON-NLS-2$
 			return urlLocalizeFromBundleAndFragments(bundle, filenameWithinBundle);
 		try {
-			URL pvm = new URL(bundle.getEntry("/"), filenameWithinBundle);
+			URL pvm = new URL(bundle.getEntry("/"), filenameWithinBundle); //$NON-NLS-1$
 			pvm = verifyFound(Platform.asLocalURL(pvm));
 			if (pvm != null)
 				return pvm;
@@ -332,8 +332,8 @@ public class ProxyPlugin extends Plugin {
 						props.load(ios);
 						String pathString = props.getProperty(filenameWithinBundle.toString());
 						if (pathString != null) {
-							URL url = Platform.resolve(bundle.getEntry("/"));	// It is assumed that if in debug mode, then this plugin is an imported plugin within the developement workspace.
-							if (url.getProtocol().equals("file")) {
+							URL url = Platform.resolve(bundle.getEntry("/"));	// It is assumed that if in debug mode, then this plugin is an imported plugin within the developement workspace. //$NON-NLS-1$
+							if (url.getProtocol().equals("file")) { //$NON-NLS-1$
 								File file = new File(url.getFile()).getParentFile();	// This gets us to workspace root of development workspace.
 								file = new File(file, pathString);
 								return file.toURL();
@@ -589,7 +589,7 @@ public class ProxyPlugin extends Plugin {
 				for (int i = 0; i < configs.length; i++) {
 					if (IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configs[i].getCategory())
 						&& (ProxyLaunchSupport.ATTR_PRIVATE == null || !configs[i].getAttribute(ProxyLaunchSupport.ATTR_PRIVATE, false)))
-						projectNames.add(configs[i].getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""));
+						projectNames.add(configs[i].getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "")); //$NON-NLS-1$
 				}
 
 				IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
@@ -885,7 +885,7 @@ public class ProxyPlugin extends Plugin {
 						expandProject(entry.getPath(), containerIds, containers, pluginIds, projects, visible && entry.isExported(), false);
 					break;
 				case IClasspathEntry.CPE_CONTAINER:
-					if (!first && "org.eclipse.jdt.launching.JRE_CONTAINER".equals(entry.getPath().segment(0)))
+					if (!first && "org.eclipse.jdt.launching.JRE_CONTAINER".equals(entry.getPath().segment(0))) //$NON-NLS-1$
 						break;	// The first project determines the JRE, so any subsequent ones can be ignored.
 					currentFlag = (Boolean) containerIds.get(entry.getPath().segment(0));
 					newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());					
@@ -994,9 +994,9 @@ public class ProxyPlugin extends Plugin {
 	IPDEProcessForPlugin getPDEProcessForPlugin() {
 		if (!triedPDEProcess) {
 			triedPDEProcess = true;
-			if (Platform.getBundle("org.eclipse.pde.core") != null) {
+			if (Platform.getBundle("org.eclipse.pde.core") != null) { //$NON-NLS-1$
 				try {
-					Class classPDEProcess = Class.forName("org.eclipse.jem.internal.proxy.core.PDEProcessForPlugin");
+					Class classPDEProcess = Class.forName("org.eclipse.jem.internal.proxy.core.PDEProcessForPlugin"); //$NON-NLS-1$
 					pdeProcessForPlugin = (IPDEProcessForPlugin) classPDEProcess.newInstance();
 				} catch (ClassNotFoundException e) {
 					// Not found, do nothing.
@@ -1040,7 +1040,7 @@ public class ProxyPlugin extends Plugin {
 		// Found it, so let's try to find which bundle/fragment it was found in.
 		String jarString = jarURL.toExternalForm();
 		// First the bundle itself.
-		String installLoc = bundle.getEntry("/").toExternalForm();
+		String installLoc = bundle.getEntry("/").toExternalForm(); //$NON-NLS-1$
 		URL sourceURL = null;
 		if (jarString.startsWith(installLoc))
 			sourceURL = getSrcFrom(bundle, installLoc, jarString);
@@ -1048,7 +1048,7 @@ public class ProxyPlugin extends Plugin {
 			// Now look in the fragments.
 			Bundle[] frags = Platform.getFragments(bundle);
 			for (int i = 0; i < frags.length; i++) {
-				installLoc = frags[i].getEntry("/").toExternalForm();
+				installLoc = frags[i].getEntry("/").toExternalForm(); //$NON-NLS-1$
 				if (jarString.startsWith(installLoc)) {
 					sourceURL = getSrcFrom(frags[i], installLoc, jarString);
 					break;
@@ -1063,20 +1063,20 @@ public class ProxyPlugin extends Plugin {
 		// "bundlename_bundleversion/pathOfJar/jarnamesrc.zip". However there is no way to know
 		// which extension has the source in it, so we need to search them all.
 		
-		IPath srcPath = new Path(bundle.getSymbolicName()+"_"+ (String) bundle.getHeaders("").get(Constants.BUNDLE_VERSION)); //$NON-NLS-1$ $NON-NLS-2$
+		IPath srcPath = new Path(bundle.getSymbolicName()+"_"+ (String) bundle.getHeaders("").get(Constants.BUNDLE_VERSION)); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
 		srcPath = srcPath.append(new Path(jarString.substring(installLoc.length())));
 		if (srcPath.segmentCount() < 2)
 			return null;	// Something is not right. No jar name.
 		srcPath = srcPath.removeFileExtension();	// Remove the .jar.
 		String jarName = srcPath.lastSegment();	// This should be the jar name.
-		srcPath = srcPath.removeLastSegments(1).append(jarName+"src.zip");
+		srcPath = srcPath.removeLastSegments(1).append(jarName+"src.zip"); //$NON-NLS-1$
 		
 		// Now look through all of the src extensions. Can't tell if the extension is from a fragment or a bundle, so we need to
 		// use Platform.find() to look in the bundle and fragment. So we may get a dup search if there is a fragment source 
 		// (for example platform source and win32 platform source (which is a fragment of platform source).
-		IConfigurationElement[] ces = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.pde.core.source");
+		IConfigurationElement[] ces = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.pde.core.source"); //$NON-NLS-1$
 		for (int i = 0; i < ces.length; i++) {
-			IPath srcsrch = new Path(ces[i].getAttributeAsIs("path")).append(srcPath);
+			IPath srcsrch = new Path(ces[i].getAttributeAsIs("path")).append(srcPath); //$NON-NLS-1$
 			Bundle srcBundle = Platform.getBundle(ces[i].getDeclaringExtension().getNamespace());
 			URL srcUrl = Platform.find(srcBundle, srcsrch);
 			if (srcUrl != null) {
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties
index df25b76eb..52aef51a6 100644
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties
+++ b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 #
 # $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties,v $
-# $Revision: 1.8 $  $Date: 2005/05/11 19:01:12 $
+# $Revision: 1.9 $  $Date: 2005/05/18 23:11:26 $
 #
 
 
@@ -45,3 +45,4 @@ Expression.MethodsNeedReceiver_EXC_                         = IWAV0167E Access b
 Expression.InvalidMarkNesting                               = IWAV0168E Improper nesting of mark statements in Expression. Tried to pop or endMark to before current mark. Tried to go past Mark# {0}.
 ProxyPlugin.CleanupDefaultProxyLaunchConfigurations         = Clean up default proxy launch configurations.
 ProxyLaunchSupport.RegistryCouldNotStartForSomeReason_WARN_ = IWAV0168W Registry could not be started for some reason.
+Expression.CreateProxyReassignmentExpression.InvalidForReassignment_EXC_=Invalid expression type for reassignment: {0}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java
index b59e9d74e..08ad42277 100644
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java
+++ b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: MapTypes.java,v $
- *  $Revision: 1.4 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.5 $  $Date: 2005/05/18 23:11:27 $ 
  */
 package org.eclipse.jem.internal.proxy.common;
 
@@ -111,11 +111,11 @@ public class MapTypes {
 				if (type != null) {
 					fName.append(type.getName());
 				} else
-					return "";	// Invalid if no 'L' and not a primitive.
+					return "";	// Invalid if no 'L' and not a primitive. //$NON-NLS-1$
 			} else
-				return "";	// Invalid, must be either a primitive or 'L' type.
+				return "";	// Invalid, must be either a primitive or 'L' type. //$NON-NLS-1$
 			while(dims-- > 0) {
-				fName.append("[]");
+				fName.append("[]"); //$NON-NLS-1$
 			}
 			return fName.toString();
 		} else if (jniName.length() == 1) {
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java
index f62bf49f0..9aa7b6b6f 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: LocalFileConfigurationContributorController.java,v $
- *  $Revision: 1.9 $  $Date: 2005/04/06 22:28:02 $ 
+ *  $Revision: 1.10 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.remote;
 
@@ -218,7 +218,7 @@ public class LocalFileConfigurationContributorController implements IConfigurati
 			URL contribution = ProxyPlugin.getPlugin().urlLocalizeFromBundleAndFragments(bundle, relativePath);
 			if (contribution == null) {
 				// PDE is not here to help us extract that @#$ dll
-			    JEMUtilPlugin.getLogger().log("No free lunch!");
+			    JEMUtilPlugin.getLogger().log("No free lunch!"); //$NON-NLS-1$
 			}
 			contributeClasspath(contribution, typeFlag);
 		}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java
index b0eca3b10..be473cee4 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java
@@ -9,19 +9,15 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 /*
- * $RCSfile: LocalProxyLaunchDelegate.java,v $ $Revision: 1.23 $ $Date: 2005/05/13 21:11:21 $
+ * $RCSfile: LocalProxyLaunchDelegate.java,v $ $Revision: 1.24 $ $Date: 2005/05/18 23:11:26 $
  */
 package org.eclipse.jem.internal.proxy.remote;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.*;
-import java.net.ConnectException;
-import java.net.Socket;
 import java.text.MessageFormat;
 import java.util.*;
-import java.util.Map;
-import java.util.Random;
 import java.util.logging.Level;
 
 import org.eclipse.core.runtime.*;
@@ -71,11 +67,11 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel
 		IJavaProject project = getJavaProject(configuration);
 		String name = configuration.getAttribute(IProxyConstants.ATTRIBUTE_VM_TITLE, (String) null);
 		if (name == null)
-			name = MessageFormat.format(ProxyRemoteMessages.getString("ProxyRemoteVMName"), new Object[] { project != null ? project.getProject().getName() : "" }); //$NON-NLS-1$
+			name = MessageFormat.format(ProxyRemoteMessages.getString("ProxyRemoteVMName"), new Object[] { project != null ? project.getProject().getName() : "" }); //$NON-NLS-1$ //$NON-NLS-2$
 		else
-			name = MessageFormat.format(ProxyRemoteMessages.getString("ProxyRemoteVMNameWithComment"), new Object[] { project != null ? project.getProject().getName() : "", name }); //$NON-NLS-1$
+			name = MessageFormat.format(ProxyRemoteMessages.getString("ProxyRemoteVMNameWithComment"), new Object[] { project != null ? project.getProject().getName() : "", name }); //$NON-NLS-1$ //$NON-NLS-2$
 
-		String stepId = "Launch VM ( " + name + " )";
+		String stepId = "Launch VM ( " + name + " )"; //$NON-NLS-1$ //$NON-NLS-2$
 		TimerTests.basicTest.startStep(stepId);
 		// Problem with launch, can't have double-quotes in vmName.
 		if (name.indexOf('"') != -1)
@@ -185,12 +181,12 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel
 //TODO: this is a temporary solution for the fact that spaces
 //      are not allowed in the libPath
 		for (int i = 0; i < evmArgs.length; i++) {
-			if (evmArgs[i].startsWith("-Djava.library.path")) {
+			if (evmArgs[i].startsWith("-Djava.library.path")) { //$NON-NLS-1$
 				StringBuffer b = new StringBuffer(evmArgs[i]);
-				int idx=b.indexOf("%20");
+				int idx=b.indexOf("%20"); //$NON-NLS-1$
 				while (idx>=0) {
-					b.replace(idx,idx+3," ");
-					idx=b.indexOf("%20");
+					b.replace(idx,idx+3," "); //$NON-NLS-1$
+					idx=b.indexOf("%20"); //$NON-NLS-1$
 				}
 				evmArgs[i]=b.toString();
 			}			
@@ -202,7 +198,7 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel
 		if(useNoverify)
 			extraArgs++; // An extra arg added for '-noverify' flag (if number changes below, this must change).
 		
-		boolean useExpressionTracing = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACING));
+		boolean useExpressionTracing = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACING)); //$NON-NLS-1$
 		long expressionTracingThreshold = -1;
 		if (useExpressionTracing) {
 			extraArgs++;
@@ -244,9 +240,9 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel
 			cvmArgs[cvmArgsCount++] = "-noverify"; //$NON-NLS-1$
 		
 		if (useExpressionTracing) {
-			cvmArgs[cvmArgsCount++] = "-D"+ExpressionCommands.EXPRESSIONTRACE+"=true";
+			cvmArgs[cvmArgsCount++] = "-D"+ExpressionCommands.EXPRESSIONTRACE+"=true"; //$NON-NLS-1$ //$NON-NLS-2$
 			if (expressionTracingThreshold != -1)
-				cvmArgs[cvmArgsCount++] = "-D"+ExpressionCommands.EXPRESSIONTRACE_TIMER_THRESHOLD+'='+String.valueOf(expressionTracingThreshold);
+				cvmArgs[cvmArgsCount++] = "-D"+ExpressionCommands.EXPRESSIONTRACE_TIMER_THRESHOLD+'='+String.valueOf(expressionTracingThreshold); //$NON-NLS-1$
 		}
 
 		// If in debug mode, we need to find a port for it to use.
@@ -342,10 +338,10 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel
 				StringBuffer gatheredText = new StringBuffer(100);
 				{
 					logger = ProxyPlugin.getPlugin().getLogger();
-					printJob = new Job("") {
+					printJob = new Job("") { //$NON-NLS-1$
 
 						protected IStatus run(IProgressMonitor monitor) {
-							monitor.beginTask("Print remote vm trace output", 1);
+							monitor.beginTask(ProxyRemoteMessages.getString("LocalProxyLaunchDelegate.Monitor.PrintRemoteTrace.Text"), 1); //$NON-NLS-1$
 							while(true) {
 								String output = null;
 								synchronized (gatheredText) {
@@ -365,7 +361,7 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel
 				}
 				
 				public StreamListener(String type, Level level, Logger logger) {
-					tracePrefix = traceName + ':' + type + '>' + System.getProperty("line.separator");
+					tracePrefix = traceName + ':' + type + '>' + System.getProperty("line.separator"); //$NON-NLS-1$
 					gatheredText.append(tracePrefix);
 					this.level = level;
 					this.logger = logger;
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java
index 61a2e503e..4139cc09e 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: REMAbstractBeanTypeProxy.java,v $
- *  $Revision: 1.13 $  $Date: 2005/05/18 18:41:20 $ 
+ *  $Revision: 1.14 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.remote;
 
@@ -649,9 +649,9 @@ public abstract class REMAbstractBeanTypeProxy implements IREMBeanTypeProxy {
 			return (IConstructorProxy) findCompatibleMethod.invokeWithParms(this, getParms);
 		} catch (ThrowableProxy e) {
 			try {
-				if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.NoSuchMethodException")))
+				if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.NoSuchMethodException"))) //$NON-NLS-1$
 					throw new NoSuchMethodException(e.getProxyLocalizedMessage());
-				else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException")))
+				else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException"))) //$NON-NLS-1$
 					throw new AmbiguousMethodException(e.getProxyLocalizedMessage());
 				ProxyPlugin.getPlugin().getLogger().log(e);
 				return null;
@@ -675,9 +675,9 @@ public abstract class REMAbstractBeanTypeProxy implements IREMBeanTypeProxy {
 			return (IMethodProxy) findCompatibleMethod.invokeWithParms(this, getParms);
 		} catch (ThrowableProxy e) {
 			try {
-				if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.NoSuchMethodException")))
+				if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.NoSuchMethodException"))) //$NON-NLS-1$
 					throw new NoSuchMethodException(e.getProxyLocalizedMessage());
-				else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException")))
+				else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException"))) //$NON-NLS-1$
 					throw new AmbiguousMethodException(e.getProxyLocalizedMessage());
 				ProxyPlugin.getPlugin().getLogger().log(e);
 				return null;
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java
index 9d46eaa08..2f449a3bf 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.remote;
 /*
  *  $RCSfile: REMCallbackInputStream.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 22:41:24 $ 
+ *  $Revision: 1.7 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 import java.io.*;
@@ -67,7 +67,7 @@ public class REMCallbackInputStream extends InputStream {
 			try {
 				close(false);
 			} catch (IOException e1) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e1));	// Error during close, just log it.
+				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e1));	// Error during close, just log it. //$NON-NLS-1$
 			}
 			throw new IOCommandException(e);
 		}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java
index 5fc40be07..1be0e62eb 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.remote;
 /*
  *  $RCSfile: REMConnection.java,v $
- *  $Revision: 1.17 $  $Date: 2005/05/16 19:11:23 $ 
+ *  $Revision: 1.18 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 
@@ -33,8 +33,8 @@ import org.eclipse.jem.util.TimerTests;
  */
 public class REMConnection implements IREMConnection, IREMExpressionConnection {
 	
-	public final static String INVOKE_STEP = "Invoke";
-	public final static String INVOKE_METHOD_STEP = "Invoke Method";
+	public final static String INVOKE_STEP = "Invoke"; //$NON-NLS-1$
+	public final static String INVOKE_METHOD_STEP = "Invoke Method"; //$NON-NLS-1$
 	protected Socket fSocket = null;
 	protected DataInputStream in = null;
 	protected DataOutputStream out = null;
@@ -52,7 +52,7 @@ public class REMConnection implements IREMConnection, IREMExpressionConnection {
 			out = new DataOutputStream(new BufferedOutputStream(fSocket.getOutputStream(), bufSize.intValue()));	// It didn't take the hint, so we will buffer it.
 			in = new DataInputStream(new BufferedInputStream(fSocket.getInputStream(), bufSize.intValue()));	// It didn't take the hint, so we will buffer it.
 		} catch (IOException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 			
 			if (out != null)
 				try {
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java
index c87318656..6e9acf6ae 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java
@@ -10,14 +10,12 @@
  *******************************************************************************/
 /*
  *  $RCSfile: REMExpression.java,v $
- *  $Revision: 1.10 $  $Date: 2005/05/18 18:41:20 $ 
+ *  $Revision: 1.11 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.remote;
 
 import java.io.*;
 import java.util.*;
-import java.util.Iterator;
-import java.util.List;
 import java.util.logging.Level;
 
 import org.eclipse.jem.internal.proxy.common.CommandException;
@@ -1026,7 +1024,7 @@ public class REMExpression extends Expression {
 		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
 		 */
 		public String toString() {
-			return super.toString()+" - "+getTypeName();
+			return super.toString()+" - "+getTypeName(); //$NON-NLS-1$
 		}
 		
 		
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java
index 24a307827..bc4e4d1e7 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.remote;
 /*
  *  $RCSfile: REMMasterServerThread.java,v $
- *  $Revision: 1.6 $  $Date: 2005/02/15 22:56:10 $ 
+ *  $Revision: 1.7 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 import java.io.*;
@@ -51,9 +51,9 @@ class REMMasterServerThread extends Thread {
 			if (LINUX_1_3)
 				masterServerSocket.setSoTimeout(1000);	// Linux 1.3 bug, see comment on LINUX_1_3
 		} catch (SocketException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	// This is bad. Should be no exceptions creating a socket.
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	// This is bad. Should be no exceptions creating a socket. //$NON-NLS-1$
 		} catch (IOException e) {				
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	// This is bad. Should be no exceptions creating a socket.
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	// This is bad. Should be no exceptions creating a socket. //$NON-NLS-1$
 		}			
 	}
 
@@ -90,7 +90,7 @@ class REMMasterServerThread extends Thread {
 			}
 		} catch (Exception e) {
 			if (!shuttingDown)
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 		}
 		
 		shutdown();	// Either a bad exception or we were closed. Either way is shutdown.
@@ -148,7 +148,7 @@ class REMMasterServerThread extends Thread {
 					break;
 			}
 		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	 //$NON-NLS-1$
 		} finally {
 			if (close) {
 				try {
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java
index bff069314..449d4fc40 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: REMProxyConstants.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.6 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.remote;
 
@@ -243,48 +243,48 @@ public class REMProxyConstants {
 	public static void println(){
 		
 		if (GATHER_COUNTS) {
-			System.out.println("--------------------------------------------------");
-			System.out.println("Method proxies invokes = " + METHODPROXYINVOKECOUNT);
-			System.out.println("Invoke invokes = " + INVOKEINVOKECOUNT);
-			System.out.println("..................................................");
-			System.out.println("Methods retrieved = " + REMMETHODCOUNT + "(" + UNIQUEMETHODCOUNT + ")");
-			System.out.println("Invokes retrieved = " + REMINVOKABLECOUNT + "(" + UNIQUEINVOKABLECOUNT + ")");
-			System.out.println("Fields retrieved = " + REMFIELDCOUNT + "(" + UNIQUEFIELDCOUNT + ")");
-			System.out.println("Constructor calls = " + REMCONSTRUCTORCALLED);
-			System.out.println("--------------------------------------------------");
-			System.out.println("-Count of methods invoked-------------------------");
-			System.out.println("--------------------------------------------------");
+			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
+			System.out.println("Method proxies invokes = " + METHODPROXYINVOKECOUNT); //$NON-NLS-1$
+			System.out.println("Invoke invokes = " + INVOKEINVOKECOUNT); //$NON-NLS-1$
+			System.out.println(".................................................."); //$NON-NLS-1$
+			System.out.println("Methods retrieved = " + REMMETHODCOUNT + "(" + UNIQUEMETHODCOUNT + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			System.out.println("Invokes retrieved = " + REMINVOKABLECOUNT + "(" + UNIQUEINVOKABLECOUNT + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			System.out.println("Fields retrieved = " + REMFIELDCOUNT + "(" + UNIQUEFIELDCOUNT + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			System.out.println("Constructor calls = " + REMCONSTRUCTORCALLED); //$NON-NLS-1$
+			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
+			System.out.println("-Count of methods invoked-------------------------"); //$NON-NLS-1$
+			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
 
 			// Collate the methods called
 			Iterator entries = METHODCOUNTMAP.entrySet().iterator();
 			while (entries.hasNext()) {
 				Map.Entry entry = (Entry) entries.next();
 				REMMethodProxy methodProxy = (REMMethodProxy) entry.getKey();
-				System.out.println(methodProxy.getClassType().getTypeName() + "," + methodProxy.getName() + "," + entry.getValue());
+				System.out.println(methodProxy.getClassType().getTypeName() + "," + methodProxy.getName() + "," + entry.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 
-			System.out.println("--------------------------------------------------");
-			System.out.println("-Count of fields get called ----------------------");
-			System.out.println("--------------------------------------------------");
+			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
+			System.out.println("-Count of fields get called ----------------------"); //$NON-NLS-1$
+			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
 
 			// Collate the fields accessed
 			entries = FIELDCOUNTMAP.entrySet().iterator();
 			while (entries.hasNext()) {
 				Map.Entry entry = (Entry) entries.next();
 				REMFieldProxy fieldProxy = (REMFieldProxy) entry.getKey();
-				System.out.println(fieldProxy.toBeanString() + "," + entry.getValue());
+				System.out.println(fieldProxy.toBeanString() + "," + entry.getValue()); //$NON-NLS-1$
 			}
 
-			System.out.println("--------------------------------------------------");
-			System.out.println("-Count of fields set called ----------------------");
-			System.out.println("--------------------------------------------------");
+			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
+			System.out.println("-Count of fields set called ----------------------"); //$NON-NLS-1$
+			System.out.println("--------------------------------------------------"); //$NON-NLS-1$
 
 			// Collate the fields set
 			entries = FIELDSETCOUNTMAP.entrySet().iterator();
 			while (entries.hasNext()) {
 				Map.Entry entry = (Entry) entries.next();
 				REMFieldProxy fieldProxy = (REMFieldProxy) entry.getKey();
-				System.out.println(fieldProxy.toBeanString() + "," + entry.getValue());
+				System.out.println(fieldProxy.toBeanString() + "," + entry.getValue()); //$NON-NLS-1$
 			} 
 		}
 		
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java
index ff4104995..4e8932e13 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.remote;
 /*
  *  $RCSfile: REMProxyFactoryRegistry.java,v $
- *  $Revision: 1.17 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.18 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 
@@ -22,8 +22,6 @@ import java.util.Iterator;
 import java.util.Stack;
 
 import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.debug.core.*;
 import org.eclipse.debug.core.model.IProcess;
@@ -195,7 +193,7 @@ public class REMProxyFactoryRegistry extends ProxyFactoryRegistry {
 		private IProcess process;
 		
 		public TerminateProcess(IProcess process) {
-			super("Terminate the remote vm process.");	
+			super(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.Job.TerminateProcess.Title"));	 //$NON-NLS-1$
 			this.process = process;
 		}
 		
@@ -375,7 +373,7 @@ public class REMProxyFactoryRegistry extends ProxyFactoryRegistry {
 								sc.close();	// We are no longer waiting on this thread so close the socket since no one will use it.
 						}
 					} catch (IOException e) {
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 					}
 				}
 			});
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java
index 4d2df2173..1b125dc60 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.remote;
 /*
  *  $RCSfile: REMStandardBeanProxyConstants.java,v $
- *  $Revision: 1.7 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.8 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 
@@ -224,7 +224,7 @@ public IMethodProxy getAccessibleIsAccessible() {
 
 public IMethodProxy getAccessibleSetAccessible() {
 	if (fAccessibleSetAccessible == null)
-		fAccessibleSetAccessible = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.AccessibleObject", "setAccessible", new String[] {"boolean"}); //$NON-NLS-1$ //$NON-NLS-2$
+		fAccessibleSetAccessible = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.AccessibleObject", "setAccessible", new String[] {"boolean"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	return fAccessibleSetAccessible;
 }
 
@@ -455,13 +455,13 @@ public IMethodProxy getClassGetDeclaredField() {
 public IMethodProxy getClassGetDeclaredFields() {
 
 	if (fClassGetDeclaredFields == null)
-			fClassGetDeclaredFields = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredFields", null); //$NON-NLS-1$
+			fClassGetDeclaredFields = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredFields", null); //$NON-NLS-1$ //$NON-NLS-2$
 	return fClassGetDeclaredFields;
 }
 public IMethodProxy getClassGetFields() {
 
 	if (fClassGetFields == null)
-			fClassGetFields = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getFields", null); //$NON-NLS-1$
+			fClassGetFields = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getFields", null); //$NON-NLS-1$ //$NON-NLS-2$
 	return fClassGetFields;
 }
 
@@ -473,7 +473,7 @@ public IMethodProxy getClassGetFields() {
  */
 public IMethodProxy getClassMethods() {
 	if (fClassGetMethods == null)
-		fClassGetMethods = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getMethods", null); //$NON-NLS-1$
+		fClassGetMethods = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getMethods", null); //$NON-NLS-1$ //$NON-NLS-2$
 	return fClassGetMethods;
 }
 
@@ -484,7 +484,7 @@ public IMethodProxy getClassMethods() {
  */
 public IMethodProxy getClassDeclaredMethods() {
 	if (fClassGetDeclaredMethods == null)
-		fClassGetDeclaredMethods = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredMethods", null); //$NON-NLS-1$
+		fClassGetDeclaredMethods = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredMethods", null); //$NON-NLS-1$ //$NON-NLS-2$
 	return fClassGetDeclaredMethods;
 }
 
@@ -502,7 +502,7 @@ public IMethodProxy getFindCompatibleConstructorMethod() {
 
 public IMethodProxy getFindCompatibleMethodMethod() {
 	if (fMethodHelperFindCompatibleMethod == null)
-		fMethodHelperFindCompatibleMethod = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.common.MethodHelper", "findCompatibleMethod", new String[] {"java.lang.Class", "java.lang.String", "[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		fMethodHelperFindCompatibleMethod = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.common.MethodHelper", "findCompatibleMethod", new String[] {"java.lang.Class", "java.lang.String", "[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
 	return fMethodHelperFindCompatibleMethod;
 }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java
index e2b8d20d4..0b1548395 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java
@@ -12,7 +12,7 @@ package org.eclipse.jem.internal.proxy.remote;
 
 /*
  *  $RCSfile: REMStandardBeanTypeProxyFactory.java,v $
- *  $Revision: 1.11 $  $Date: 2005/05/16 19:11:23 $ 
+ *  $Revision: 1.12 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 import java.text.MessageFormat;
@@ -138,7 +138,7 @@ public final class REMStandardBeanTypeProxyFactory implements IStandardBeanTypeP
 		IBeanTypeProxy throwableClass = new REMThrowableBeanTypeProxy(fFactoryRegistry, new Integer(Commands.THROWABLE_CLASS), Throwable.class
 				.getName(), objectClass);
 		IBeanTypeProxy threadClass = objectClass.newBeanTypeForClass(new Integer(Commands.THREAD_CLASS), Thread.class.getName(), false);
-		IBeanTypeProxy expressionProcessorControllerClass = objectClass.newBeanTypeForClass(new Integer(Commands.EXPRESSIONPROCESSERCONTROLLER_CLASS), "org.eclipse.jem.internal.proxy.vm.remote.ExpressionProcesserController", false);
+		IBeanTypeProxy expressionProcessorControllerClass = objectClass.newBeanTypeForClass(new Integer(Commands.EXPRESSIONPROCESSERCONTROLLER_CLASS), "org.eclipse.jem.internal.proxy.vm.remote.ExpressionProcesserController", false); //$NON-NLS-1$
 
 		// Initialize the hashtable with the primitives, their lang equivalents, and also common classes like String
 
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRegisterAWT.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRegisterAWT.java
index f32af80ac..e1fdfb6cd 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRegisterAWT.java
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRegisterAWT.java
@@ -11,7 +11,7 @@ package org.eclipse.jem.internal.proxy.remote.awt;
  *******************************************************************************/
 /*
  *  $RCSfile: REMRegisterAWT.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.4 $  $Date: 2005/05/18 23:11:27 $ 
  */
 
 import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
@@ -28,9 +28,9 @@ public final class REMRegisterAWT {
 		
 		// If we are doing AWT, get the AWT event queue going. This is trying to be a time-saver
 		// by having it up right away.
-		IBeanTypeProxy starterBeanType = registry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.vm.remote.AWTStarter");
+		IBeanTypeProxy starterBeanType = registry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.vm.remote.AWTStarter"); //$NON-NLS-1$
 		if (starterBeanType != null) {
-			IMethodProxy starter = starterBeanType.getMethodProxy("startAWT");
+			IMethodProxy starter = starterBeanType.getMethodProxy("startAWT"); //$NON-NLS-1$
 			if (starter != null)
 				starter.invokeCatchThrowableExceptions(null);
 		}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties
index 6b2e13dba..970889d61 100644
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties
+++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 #
 # $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties,v $
-# $Revision: 1.10 $  $Date: 2005/02/24 21:56:34 $
+# $Revision: 1.11 $  $Date: 2005/05/18 23:11:26 $
 #
 
 
@@ -59,6 +59,8 @@ CleanupJob.title                                                      = Remote V
 
 REMProxyFactoryRegistry.CallbackConnectionNotWorking_EXC_             = IWAV0169E Callback connection is not working.
 REMProxyFactoryRegistry.ConnectionCreationFailed_INFO_                = IWAV0170I Connection creation failed.
+REMProxyFactoryRegistry.Job.TerminateProcess.Title=Terminate the remote vm process.
 REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM_EXC_ = IWAV0171E Could not create a socket connection to remote vm.
 REMExpression.IOExceptionSeeLog_INFO_                                 = IWAV0172I I/O Exception occurred. See .log file for details.
 REMExpression.CommandExceptionSeeLog_INFO_                            = IWAV0173I Command Exception occurred. See .log file for details.
+LocalProxyLaunchDelegate.Monitor.PrintRemoteTrace.Text=Print remote vm trace output
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanProxy.java
index 41df5e8fc..6928efb30 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanProxy.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanProxy.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.ide;
 /*
  *  $RCSfile: IDEArrayBeanProxy.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:57:26 $ 
+ *  $Revision: 1.8 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 import org.eclipse.jem.internal.proxy.core.*;
@@ -223,7 +223,7 @@ public int getLength() {
 		try {
 			return get(index);
 		} catch ( ThrowableProxy exc ) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));			
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));			 //$NON-NLS-1$
 			return null;
 		}
 	}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanTypeProxy.java
index 6f98a43a2..997d3c403 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanTypeProxy.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanTypeProxy.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 /*
- * $RCSfile: IDEBeanTypeProxy.java,v $ $Revision: 1.12 $ $Date: 2005/05/18 18:41:20 $
+ * $RCSfile: IDEBeanTypeProxy.java,v $ $Revision: 1.13 $ $Date: 2005/05/18 23:11:26 $
  */
 package org.eclipse.jem.internal.proxy.ide;
 
@@ -99,7 +99,7 @@ public class IDEBeanTypeProxy extends IDEBeanProxy implements IBeanTypeProxy {
 			Method aMethod = fClass.getMethod(methodName, new Class[0]);
 			return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethodProxy(aMethod);
 		} catch (Exception exc) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
 		}
 		return null;
 
@@ -179,8 +179,8 @@ public class IDEBeanTypeProxy extends IDEBeanProxy implements IBeanTypeProxy {
 			argClasses[i] = btFactory.getBeanTypeProxy(argTypeNames[i]);
 			if (argClasses[i] == null) {
 				ProxyPlugin.getPlugin().getLogger().log(
-						new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Constructor not found - "
-								+ fClass.getName() + " args=" + argTypeNames, null));
+						new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Constructor not found - " //$NON-NLS-1$
+								+ fClass.getName() + " args=" + argTypeNames, null)); //$NON-NLS-1$
 				return null;
 			}
 		}
@@ -211,8 +211,8 @@ public class IDEBeanTypeProxy extends IDEBeanProxy implements IBeanTypeProxy {
 			argClasses[i] = btFactory.getBeanTypeProxy(argTypeNames[i]);
 			if (argClasses[i] == null) {
 				ProxyPlugin.getPlugin().getLogger().log(
-						new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Constructor not found - "
-								+ fClass.getName() + " args=" + argTypeNames, null));
+						new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Constructor not found - " //$NON-NLS-1$
+								+ fClass.getName() + " args=" + argTypeNames, null)); //$NON-NLS-1$
 				return null;
 			}
 		}
@@ -273,8 +273,8 @@ public class IDEBeanTypeProxy extends IDEBeanProxy implements IBeanTypeProxy {
 			return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getFieldProxy(field);
 		} catch (NoSuchFieldException exc) {
 			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Field not found " + fClass.getName()
-							+ " - " + fieldName, exc));
+					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Field not found " + fClass.getName() //$NON-NLS-1$
+							+ " - " + fieldName, exc)); //$NON-NLS-1$
 			return null;
 		}
 	}
@@ -285,8 +285,8 @@ public class IDEBeanTypeProxy extends IDEBeanProxy implements IBeanTypeProxy {
 			return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getFieldProxy(field);
 		} catch (NoSuchFieldException exc) {
 			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Field not found " + fClass.getName()
-							+ " - " + fieldName, exc));
+					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Field not found " + fClass.getName() //$NON-NLS-1$
+							+ " - " + fieldName, exc)); //$NON-NLS-1$
 			return null;
 		}
 	}
@@ -303,7 +303,7 @@ public class IDEBeanTypeProxy extends IDEBeanProxy implements IBeanTypeProxy {
 		try {
 			aConstructor = fClass.getConstructor(parameterTypes);
 		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 		}
 		// If we have a constructor return it
 		if (aConstructor != null) {
@@ -336,7 +336,7 @@ public class IDEBeanTypeProxy extends IDEBeanProxy implements IBeanTypeProxy {
 			aConstructor = fClass.getConstructor(null);
 			return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getConstructorProxy(aConstructor);
 		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 			return null;
 		}
 
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECallbackRegistry.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECallbackRegistry.java
index 3dbeb3350..cbb5e943a 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECallbackRegistry.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECallbackRegistry.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.ide;
 /*
  *  $RCSfile: IDECallbackRegistry.java,v $
- *  $Revision: 1.7 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.8 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 import java.io.*;
@@ -43,7 +43,7 @@ IDECallbackRegistry(IDEProxyFactoryRegistry aRegistry){
 	vmServerProxy = aRegistry.getBeanProxy(fVMServer.getClass(), fVMServer);
 	
 	try {
-		Method initializeCallbackMethod = org.eclipse.jem.internal.proxy.common.ICallback.class.getMethod("initializeCallback", new Class[] {org.eclipse.jem.internal.proxy.common.IVMServer.class, Integer.TYPE});
+		Method initializeCallbackMethod = org.eclipse.jem.internal.proxy.common.ICallback.class.getMethod("initializeCallback", new Class[] {org.eclipse.jem.internal.proxy.common.IVMServer.class, Integer.TYPE}); //$NON-NLS-1$
 		initializeCallbackMethodProxy = (IProxyMethod) aRegistry.getBeanProxy(Method.class, initializeCallbackMethod);
 	} catch (SecurityException e) {
 		e.printStackTrace();
@@ -97,7 +97,7 @@ OutputStream requestStream(final int aCallbackID, final int aMsgID){
 	try {
 		tempStream = new PipedInputStream(result);	
 	} catch ( IOException exc ) {
-		ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
+		ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
 		return null;
 	}
 	final PipedInputStream inputStream = tempStream;
@@ -111,7 +111,7 @@ OutputStream requestStream(final int aCallbackID, final int aMsgID){
 					try {
 						inputStream.close();	// Make sure it's closed.
 					} catch ( IOException  exc ){
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
+						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
 					}
 				}			
 			}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorProxy.java
index 03fb443e0..0cd8fabf2 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorProxy.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorProxy.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.ide;
 /*
  *  $RCSfile: IDEConstructorProxy.java,v $
- *  $Revision: 1.8 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.9 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 import java.lang.reflect.Constructor;
@@ -60,7 +60,7 @@ class IDEConstructorProxy extends IDEAccessibleObjectProxy implements IConstruct
 			return getNewIDEBeanProxy(result);
 		} catch (Exception e) {
 			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 			return null;
 		}
 
@@ -90,7 +90,7 @@ class IDEConstructorProxy extends IDEAccessibleObjectProxy implements IConstruct
 			result = ((Constructor) getBean()).newInstance(creationObjects);
 		} catch (Exception e) {
 			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 		}
 
 		// If we have a non-null result create an IDEBeanProxy and return it
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExpression.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExpression.java
index c780f8914..638f5493c 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExpression.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExpression.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 /*
- * $RCSfile: IDEExpression.java,v $ $Revision: 1.7 $ $Date: 2005/05/18 18:41:20 $
+ * $RCSfile: IDEExpression.java,v $ $Revision: 1.8 $ $Date: 2005/05/18 23:11:26 $
  */
 package org.eclipse.jem.internal.proxy.ide;
 
@@ -32,7 +32,7 @@ public class IDEExpression extends Expression {
 	private final IDEStandardBeanTypeProxyFactory beantypefactory;
 	protected final ExpressionProcesser eproc;
 	{
-		boolean useTracing = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACING));
+		boolean useTracing = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACING)); //$NON-NLS-1$
 		long threshold = Long.getLong(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACEING_TIMER_THRESHOLD), -1L).longValue();
 		eproc = new ExpressionProcesser(useTracing, threshold);
 	}
@@ -395,7 +395,7 @@ public class IDEExpression extends Expression {
 		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
 		 */
 		public String toString() {
-			return super.toString()+" - "+getTypeName();
+			return super.toString()+" - "+getTypeName(); //$NON-NLS-1$
 		}
 
 		/**
@@ -490,7 +490,7 @@ public class IDEExpression extends Expression {
 		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
 		 */
 		public String toString() {
-			return super.toString()+" - "+methodName;
+			return super.toString()+" - "+methodName; //$NON-NLS-1$
 		}
 
 		/**
@@ -557,7 +557,7 @@ public class IDEExpression extends Expression {
 		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
 		 */
 		public String toString() {
-			return super.toString()+" - "+fieldName;
+			return super.toString()+" - "+fieldName; //$NON-NLS-1$
 		}
 
 		/**
@@ -873,7 +873,7 @@ public class IDEExpression extends Expression {
 			}
 			IDEMethodProxy methodProxy = ((IDEMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(declaringClass, methodName, parameterClasses);
 			if (methodProxy == null) {
-				String parms = "";
+				String parms = ""; //$NON-NLS-1$
 				if (parameterTypes != null || parameterTypes.length > 0) {
 					StringBuffer st = new StringBuffer(100);
 					for (int i = 0; i < parameterClasses.length; i++) {
@@ -883,7 +883,7 @@ public class IDEExpression extends Expression {
 					}
 					parms = st.toString();
 				}
-				throw new IDEThrowableProxy(new NoSuchMethodException("No method: "+declaringType+'.'+methodName+"("+parms+')'),
+				throw new IDEThrowableProxy(new NoSuchMethodException("No method: "+declaringType+'.'+methodName+"("+parms+')'), //$NON-NLS-1$ //$NON-NLS-2$
 					getIDEBeanTypeFactory().getBeanTypeProxy(NoSuchMethodException.class));
 			}
 			
@@ -986,7 +986,7 @@ public class IDEExpression extends Expression {
 			// We resolve immediately. Any expression proxies should also be resolved at this point too.
 			IDEFieldProxy fieldProxy = (IDEFieldProxy) getIDEBeanTypeProxy(declaringType).getFieldProxy(fieldName);
 			if (fieldProxy == null) {
-			throw new IDEThrowableProxy(new NoSuchFieldException("No field: "+declaringType+'.'+fieldName),
+			throw new IDEThrowableProxy(new NoSuchFieldException("No field: "+declaringType+'.'+fieldName), //$NON-NLS-1$
 					getIDEBeanTypeFactory().getBeanTypeProxy(NoSuchFieldException.class));
 			}
 			
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldProxy.java
index 3ab03d16b..1cd7c5eef 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldProxy.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldProxy.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.ide;
 /*
  *  $RCSfile: IDEFieldProxy.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:57:26 $ 
+ *  $Revision: 1.8 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 import java.lang.reflect.Field;
@@ -49,7 +49,7 @@ public class IDEFieldProxy extends IDEAccessibleObjectProxy implements IFieldPro
 			result = ((Field) getBean()).get(aSubject != null ? ((IIDEBeanProxy) aSubject).getBean() : null);
 		} catch (Exception e) {
 			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 		}
 
 		// If we have a non null result wrap it in an IBeanProxy and return it
@@ -73,7 +73,7 @@ public class IDEFieldProxy extends IDEAccessibleObjectProxy implements IFieldPro
 				argument != null ? ((IIDEBeanProxy) argument).getBean() : null);
 		} catch (Exception e) {
 			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 		}
 	}
 	/**
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxy.java
index 9ce7b1f61..71482bef7 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxy.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxy.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.ide;
 /*
  *  $RCSfile: IDEMethodProxy.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:57:26 $ 
+ *  $Revision: 1.8 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 import java.lang.reflect.InvocationTargetException;
@@ -92,7 +92,7 @@ public class IDEMethodProxy extends IDEAccessibleObjectProxy implements IMethodP
 			return invoke(subject);
 		} catch (ThrowableProxy exc) {
 			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
+				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
 		}
 		return null;
 	}
@@ -135,7 +135,7 @@ public class IDEMethodProxy extends IDEAccessibleObjectProxy implements IMethodP
 			return invoke(subject, argument);
 		} catch (ThrowableProxy exc) {
 			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
+				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
 		}
 		return null;
 	}
@@ -181,7 +181,7 @@ public class IDEMethodProxy extends IDEAccessibleObjectProxy implements IMethodP
 			return invoke(subject, arguments);
 		} catch (ThrowableProxy exc) {
 			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
+				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
 		}
 		return null;
 	}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxyFactory.java
index 0ada52c0a..1164ec0e7 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxyFactory.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxyFactory.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 /*
- * $RCSfile: IDEMethodProxyFactory.java,v $ $Revision: 1.10 $ $Date: 2005/05/11 19:01:12 $
+ * $RCSfile: IDEMethodProxyFactory.java,v $ $Revision: 1.11 $ $Date: 2005/05/18 23:11:26 $
  */
 package org.eclipse.jem.internal.proxy.ide;
 
@@ -163,7 +163,7 @@ public class IDEMethodProxyFactory implements IMethodProxyFactory {
 			Class aClass = fProxyFactoryRegistry.loadClass(className);
 			return getMethodProxy(aClass, methodName, parameterTypes);
 		} catch (ClassNotFoundException exc) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
 			return null;
 		}
 	}
@@ -234,9 +234,9 @@ public class IDEMethodProxyFactory implements IMethodProxyFactory {
 			}
 			return getMethodProxy(cls.getMethod(methodName, parmClasses));
 		} catch (ClassNotFoundException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 		} catch (NoSuchMethodException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 		}
 		return null;
 	}
@@ -255,9 +255,9 @@ public class IDEMethodProxyFactory implements IMethodProxyFactory {
 			}
 			return getMethodProxy(cls.getDeclaredMethod(methodName, parmClasses));
 		} catch (ClassNotFoundException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 		} catch (NoSuchMethodException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 		}
 		return null;
 	}	
@@ -268,8 +268,8 @@ public class IDEMethodProxyFactory implements IMethodProxyFactory {
 			return getMethodProxy(method);
 		} catch (NoSuchMethodException exc) {
 			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Unable to find method " + aClass.getName()
-							+ ":" + methodName + " args=" + args, exc));
+					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Unable to find method " + aClass.getName() //$NON-NLS-1$
+							+ ":" + methodName + " args=" + args, exc)); //$NON-NLS-1$ //$NON-NLS-2$
 			return null;
 		}
 	}
@@ -280,8 +280,8 @@ public class IDEMethodProxyFactory implements IMethodProxyFactory {
 			return getMethodProxy(method);
 		} catch (NoSuchMethodException exc) {
 			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Unable to find method " + aClass.getName()
-							+ ":" + methodName + " args=" + args, exc));
+					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Unable to find method " + aClass.getName() //$NON-NLS-1$
+							+ ":" + methodName + " args=" + args, exc)); //$NON-NLS-1$ //$NON-NLS-2$
 			return null;
 		}
 	}	
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java
index 981c3f227..b44cbd86f 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jem.internal.proxy.ide;
 /*
- * $RCSfile: IDEStandardBeanProxyFactory.java,v $ $Revision: 1.8 $ $Date: 2005/02/15 22:57:26 $
+ * $RCSfile: IDEStandardBeanProxyFactory.java,v $ $Revision: 1.9 $ $Date: 2005/05/18 23:11:26 $
  */
 
 import org.eclipse.core.runtime.IStatus;
@@ -189,7 +189,7 @@ public class IDEStandardBeanProxyFactory implements IStandardBeanProxyFactory {
 			return newValue != null ? aTypeProxy.newBeanProxy(newValue) : null;
 		} catch (Exception exc) {
 			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
+				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
 			return null;
 		}
 	}
@@ -208,7 +208,7 @@ public class IDEStandardBeanProxyFactory implements IStandardBeanProxyFactory {
 			return aTypeProxy.newBeanProxy(!(aTypeProxy.isPrimitive()) ? beanType.newInstance() : null);
 		} catch (Exception exc) {
 			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
+				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
 			return null;
 		}
 	}
@@ -247,7 +247,7 @@ public class IDEStandardBeanProxyFactory implements IStandardBeanProxyFactory {
 				return null;
 		} catch (Exception exc) {
 			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
+					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
 			return null;
 		}
 	}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanTypeProxyFactory.java
index 018bf5e56..ad885debf 100644
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanTypeProxyFactory.java
+++ b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanTypeProxyFactory.java
@@ -7,7 +7,7 @@
 package org.eclipse.jem.internal.proxy.ide;
 
 /*
- * $RCSfile: IDEStandardBeanTypeProxyFactory.java,v $ $Revision: 1.9 $ $Date: 2005/05/11 19:01:12 $
+ * $RCSfile: IDEStandardBeanTypeProxyFactory.java,v $ $Revision: 1.10 $ $Date: 2005/05/18 23:11:26 $
  */
 
 import java.lang.reflect.Array;
@@ -222,15 +222,15 @@ public class IDEStandardBeanTypeProxyFactory implements IStandardBeanTypeProxyFa
 				if (beanTypeProxy == null)
 					beanTypeProxy = new IDEBeanTypeProxy(fFactoryRegistry, ideClass);
 			} catch (ClassNotFoundException e) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.INFO, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.INFO, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 				String msg = MessageFormat.format("{0}({1})", new Object[] { e.getClass(), e.getMessage()}); //$NON-NLS-1$
 				beanTypeProxy = new IDEInitErrorBeanTypeProxy(fFactoryRegistry, typeName, msg);
 			} catch (ExceptionInInitializerError e) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 				String msg = MessageFormat.format("{0}({1})", new Object[] { e.getClass(), e.getMessage()}); //$NON-NLS-1$
 				beanTypeProxy = new IDEInitErrorBeanTypeProxy(fFactoryRegistry, typeName, msg);
 			} catch (LinkageError e) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
+				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
 				String msg = MessageFormat.format("{0}({1})", new Object[] { e.getClass(), e.getMessage()}); //$NON-NLS-1$
 				beanTypeProxy = new IDEInitErrorBeanTypeProxy(fFactoryRegistry, typeName, msg);
 			}
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/CommandErrorException.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/CommandErrorException.java
index c3042e7f4..73c1fc7e6 100644
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/CommandErrorException.java
+++ b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/CommandErrorException.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.common.remote;
 /*
  *  $RCSfile: CommandErrorException.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.6 $  $Date: 2005/05/18 23:11:26 $ 
  */
 
 import org.eclipse.jem.internal.proxy.common.CommandException;
@@ -64,7 +64,7 @@ public class CommandErrorException extends CommandException {
 	 * @see java.lang.Object#toString()
 	 */
 	public String toString() {
-		return super.toString() + "-- Error code:"+getErrorCode() + (getValue() != null ? " Value data:\"" + getValue().getAsObject() + "\"" : " ") + (fErrorObject != null ? " Error object:\""+fErrorObject.toString()+"\"" : " ");
+		return super.toString() + "-- Error code:"+getErrorCode() + (getValue() != null ? " Value data:\"" + getValue().getAsObject() + "\"" : " ") + (fErrorObject != null ? " Error object:\""+fErrorObject.toString()+"\"" : " "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
 	}
 
 }
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/ExpressionCommands.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/ExpressionCommands.java
index da893ac26..838e95d98 100644
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/ExpressionCommands.java
+++ b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/ExpressionCommands.java
@@ -10,13 +10,11 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ExpressionCommands.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/16 19:11:23 $ 
+ *  $Revision: 1.6 $  $Date: 2005/05/18 23:11:26 $ 
  */
 package org.eclipse.jem.internal.proxy.common.remote;
 
 import java.io.*;
-import java.io.DataOutputStream;
-import java.io.IOException;
 
 import org.eclipse.jem.internal.proxy.common.CommandException;
 
@@ -46,8 +44,8 @@ public class ExpressionCommands {
 		EXPRESSIONPROXY_VOIDTYPE = 0,	// Expression proxy resolves to void type.
 		EXPRESSIONPROXY_NOTRESOLVED = 1;	// Expression proxy not resolved.
 
-	public static final String EXPRESSIONTRACE = "proxyvm.expressionTrace";	// The system property for turning on expression tracing.
-	public static final String EXPRESSIONTRACE_TIMER_THRESHOLD = "proxyvm.expressionTraceTimerThreshold";	// The system property for timer threshold.
+	public static final String EXPRESSIONTRACE = "proxyvm.expressionTrace";	// The system property for turning on expression tracing. //$NON-NLS-1$
+	public static final String EXPRESSIONTRACE_TIMER_THRESHOLD = "proxyvm.expressionTraceTimerThreshold";	// The system property for timer threshold. //$NON-NLS-1$
 	
 	/*
 	 * The format of the commands are:
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ExpressionProcesserController.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ExpressionProcesserController.java
index de89505f9..b3d7ef659 100644
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ExpressionProcesserController.java
+++ b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ExpressionProcesserController.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ExpressionProcesserController.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 19:01:12 $ 
+ *  $Revision: 1.7 $  $Date: 2005/05/18 23:11:27 $ 
  */
 package org.eclipse.jem.internal.proxy.vm.remote;
 
@@ -98,7 +98,7 @@ public class ExpressionProcesserController {
 	 * 
 	 * @since 1.0.0
 	 */
-	private static final List PRIMITIVE_NAMES = Arrays.asList(new String[] {"byte", "char", "short", "int", "long", "float", "double"});
+	private static final List PRIMITIVE_NAMES = Arrays.asList(new String[] {"byte", "char", "short", "int", "long", "float", "double"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
 	private static final Class[] PRIMITIVE_TYPES = new Class[] {Byte.TYPE, Character.TYPE, Short.TYPE, Integer.TYPE, Long.TYPE, Float.TYPE, Double.TYPE};
 	/**
 	 * Load the class given the name. If not found, return null.
@@ -111,7 +111,7 @@ public class ExpressionProcesserController {
 	protected Class loadClass(String className) throws ClassNotFoundException {
 		if (className == null)
 			return null;
-		else if (className.endsWith("[]")) {
+		else if (className.endsWith("[]")) { //$NON-NLS-1$
 			// We have an array request instead. This is trickier.
 			return loadClass(MapTypes.getJNIFormatName(className));
 		} else {
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMServerThread.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMServerThread.java
index 755738648..9ef348c2a 100644
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMServerThread.java
+++ b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMServerThread.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.proxy.vm.remote;
 /*
  *  $RCSfile: RemoteVMServerThread.java,v $
- *  $Revision: 1.8 $  $Date: 2005/05/16 19:11:23 $ 
+ *  $Revision: 1.9 $  $Date: 2005/05/18 23:11:27 $ 
  */
 
 
@@ -414,7 +414,7 @@ public class RemoteVMServerThread extends Thread implements IVMServer {
 			try {
 				threadsArray[i].join(10000);	// Wait ten seconds, if longer, just go on to next one.
 				if (threadsArray[i].isAlive())
-					System.out.println("*** Connection "+i+" did not die.");
+					System.out.println("*** Connection "+i+" did not die."); //$NON-NLS-1$ //$NON-NLS-2$
 			} catch (InterruptedException e) {
 			}
 	
@@ -422,7 +422,7 @@ public class RemoteVMServerThread extends Thread implements IVMServer {
 			try {	
 				safeClean.join(10000);
 				if (safeClean.isAlive())
-					System.out.println("*** Cleanup thread did not die.");
+					System.out.println("*** Cleanup thread did not die."); //$NON-NLS-1$
 			} catch (InterruptedException e) {
 			}
 		}