NLS Translations
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 9e5d4c7..4674f2b 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.3 $  $Date: 2004/06/02 19:58:29 $ 
+ *  $Revision: 1.4 $  $Date: 2004/06/04 23:26:02 $ 
  */
 package org.eclipse.jem.internal.proxy.initParser.tree;
 
@@ -404,7 +404,7 @@
 	}
 	
 	private void throwClassCast(Class returnType, Object bean) throws ClassCastException {
-		throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY"), new Object[] {bean != null ? bean.getClass().getName() : null, returnType.getName()})); //$NON-NLS-1$
+		throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY_EXC_"), new Object[] {bean != null ? bean.getClass().getName() : null, returnType.getName()})); //$NON-NLS-1$
 	}
 
 	/**
@@ -623,7 +623,7 @@
 	}
 	
 	private void throwInvalidPrefix(int operator, Object exp) throws IllegalArgumentException {
-		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfPrefixOperator"), new Object[] {exp != null ? exp.toString() : null, PRE_OPER_TO_STRING[operator]})); //$NON-NLS-1$
+		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfPrefixOperator_EXC_"), new Object[] {exp != null ? exp.toString() : null, PRE_OPER_TO_STRING[operator]})); //$NON-NLS-1$
 	}
 
 	private static final String[] IN_OPER_TO_STRING;
@@ -1168,7 +1168,7 @@
 	}
 	
 	private void throwInvalidInfix(int operator, Object value) throws IllegalArgumentException {
-		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfOperator"), new Object[] {value != null ? value.toString() : null, IN_OPER_TO_STRING[operator]})); //$NON-NLS-1$
+		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfOperator_EXC_"), new Object[] {value != null ? value.toString() : null, IN_OPER_TO_STRING[operator]})); //$NON-NLS-1$
 	}
 	
 	private void testValidBitType(Class type, int operator) {
@@ -1264,7 +1264,7 @@
 			}
 			
 			if (dimcount < indexCount)
-				throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray"), new Object[] {new Integer(indexCount), new Integer(dimcount)})); //$NON-NLS-1$
+				throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray_EXC_"), new Object[] {new Integer(indexCount), new Integer(dimcount)})); //$NON-NLS-1$
 			
 			// Now start accessing one index at a time.
 			Object value = array;	// Final value, start with full array. 
@@ -1273,7 +1273,7 @@
 			}
 			pushExpressionValue(value, componentTypes[indexCount-1]);
 		}  else
-			throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.NotAnArray"), new Object[] {arrayType})); //$NON-NLS-1$
+			throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.NotAnArray_EXC_"), new Object[] {arrayType})); //$NON-NLS-1$
 	}
 	
 	/**
@@ -1304,7 +1304,7 @@
 			for(int i=0; i < dimensionCount && componentType != null; i++)
 				componentType = componentType.getComponentType();
 			if (componentType == null)
-				throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested"), new Object[] {arrayType, new Integer(dimensionCount)})); //$NON-NLS-1$
+				throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested_EXC_"), new Object[] {arrayType, new Integer(dimensionCount)})); //$NON-NLS-1$
 			
 			// We need to pull in the dimension initializers. They are stacked in reverse order.
 			int[] dimInit = new int[dimensionCount];
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 5783551..0d778a1 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
@@ -1,6 +1,6 @@
-ExpressionProcesser.CannotCastXToY=Cannot cast "{0}" to be "{1}".
-ExpressionProcesser.InvalidOperandOfPrefixOperator={0} not valid as the operand of prefix operator "{1}".
-ExpressionProcesser.InvalidOperandOfOperator={0} not valid as the operand of operator "{1}".
-ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray={0} is greater then number of dimensions ({1}) in the array
-ExpressionProcesser.NotAnArray="{0}" is not an array.
-ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested=Arraytype "{0}" has fewer dimensions than creation requested ({1}).
+ExpressionProcesser.CannotCastXToY_EXC_=Cannot cast "{0}" to be "{1}".
+ExpressionProcesser.InvalidOperandOfPrefixOperator_EXC_={0} not valid as the operand of prefix operator "{1}".
+ExpressionProcesser.InvalidOperandOfOperator_EXC_={0} not valid as the operand of operator "{1}".
+ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray_EXC_={0} is greater then number of dimensions ({1}) in the array
+ExpressionProcesser.NotAnArray_EXC_="{0}" is not an array.
+ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested_EXC_=Arraytype "{0}" has fewer dimensions than creation requested ({1}).
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 c0c4191..efbb51c 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.3 $  $Date: 2004/06/02 19:58:49 $ 
+ *  $Revision: 1.4 $  $Date: 2004/06/04 23:26:02 $ 
  */
 package org.eclipse.jem.internal.proxy.core;
 
@@ -365,13 +365,13 @@
 			else if (nextForExpressionStack[nextForExpressionStackPos--] == forExpression)
 				return;	// Valid, the top expression matched.
 		} else {
-			String expMsg = invalidMsg != null ? MessageFormat.format(ProxyMessages.getString("Expression.InInvalidStateDueTo"), new Object[] {invalidMsg}) : ProxyMessages.getString("Expression.InInvalidState"); //$NON-NLS-1$ //$NON-NLS-2$
+			String expMsg = invalidMsg != null ? MessageFormat.format(ProxyMessages.getString("Expression.InInvalidStateDueTo_EXC_"), new Object[] {invalidMsg}) : ProxyMessages.getString("Expression.InInvalidState_EXC_"); //$NON-NLS-1$ //$NON-NLS-2$
 			throw new IllegalStateException(expMsg);
 		}
 		
 		// If we got here, then invalid.
 		nextForExpressionStackPos = INVALID;
-		throw new IllegalStateException(ProxyMessages.getString("Expression.TypeSentInInvalidOrder")); //$NON-NLS-1$
+		throw new IllegalStateException(ProxyMessages.getString("Expression.TypeSentInInvalidOrder_EXC_")); //$NON-NLS-1$
 	}
 	
 	/**
@@ -683,12 +683,12 @@
 				String at = (String) arrayType;
 				int i = at.lastIndexOf("[]"); //$NON-NLS-1$
 				if (i == -1)
-					throw new IllegalArgumentException(MessageFormat.format(ProxyMessages.getString("Expression.ArrayTypeNotAnArray"), new Object[] {arrayType})); //$NON-NLS-1$
+					throw new IllegalArgumentException(MessageFormat.format(ProxyMessages.getString("Expression.ArrayTypeNotAnArray_EXC_"), new Object[] {arrayType})); //$NON-NLS-1$
 				arrayType = at.substring(0, i);
 			} else if (arrayType instanceof IArrayBeanTypeProxy) {
 				arrayType = ((IArrayBeanTypeProxy) arrayType).getComponentType();
 			} else
-				throw new IllegalArgumentException(MessageFormat.format(ProxyMessages.getString("Expression.ArrayTypeNotAnArray"), new Object[] {arrayType})); //$NON-NLS-1$
+				throw new IllegalArgumentException(MessageFormat.format(ProxyMessages.getString("Expression.ArrayTypeNotAnArray_EXC_"), new Object[] {arrayType})); //$NON-NLS-1$
 			push(arrayType);
 			push(ARRAYINITIALIZER);
 			
@@ -839,7 +839,7 @@
 		try {
 			checkForExpression(forExpression);
 			if (!hasReceiver)
-				throw new IllegalArgumentException(ProxyMessages.getString("Expression.CannotHandleNoReceiveOnFieldAccess")); //$NON-NLS-1$
+				throw new IllegalArgumentException(ProxyMessages.getString("Expression.CannotHandleNoReceiveOnFieldAccess_EXC_")); //$NON-NLS-1$
 			
 			push(hasReceiver ? Boolean.TRUE : Boolean.FALSE);	// We have a receiver
 			push(fieldName);
@@ -948,7 +948,7 @@
 		try {
 			checkForExpression(forExpression);
 			if (!hasReceiver)
-				throw new IllegalArgumentException(MessageFormat.format(ProxyMessages.getString("Expression.MethodsNeedReceiver"), new Object[] {name})); //$NON-NLS-1$
+				throw new IllegalArgumentException(MessageFormat.format(ProxyMessages.getString("Expression.MethodsNeedReceiver_EXC_"), new Object[] {name})); //$NON-NLS-1$
 
 			switch (argumentCount) {
 				case 0 :
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 ee5450b..0120c87 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.10 $  $Date: 2004/06/04 15:29:38 $ 
+ *  $Revision: 1.11 $  $Date: 2004/06/04 23:26:02 $ 
  */
 package org.eclipse.jem.internal.proxy.core;
 
@@ -481,7 +481,7 @@
 			
 			final ProxyFactoryRegistry reg = launchInfo.resultRegistry;
 			if (reg == null)
-				throw new CoreException(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString("ProxyLaunchSupport.RegistryCouldNotStartForSomeReason"), null)); //$NON-NLS-1$
+				throw new CoreException(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString("ProxyLaunchSupport.RegistryCouldNotStartForSomeReason_WARN_"), null)); //$NON-NLS-1$
 			
 			for (int i = 0; i < contribs.length; i++) {
 				final int ii = i;
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 1e59182..14875e5 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.3 $  $Date: 2004/06/02 19:58:49 $
+# $Revision: 1.4 $  $Date: 2004/06/04 23:26:02 $
 #
 
 
@@ -36,11 +36,11 @@
 
 ProxyLaunch = Launching Local Proxy VM
 ProxyWaitForBuild = Waiting for build to complete
-Expression.InInvalidStateDueTo=Expression is in invalid state due to "{0}"
-Expression.InInvalidState=Expression is in invalid state
-Expression.TypeSentInInvalidOrder=Expression type sent in invalid order
-Expression.ArrayTypeNotAnArray=ArrayType "{0}" is not an array.
-Expression.CannotHandleNoReceiveOnFieldAccess=Currently cannot handle no receiver on field access.
-Expression.MethodsNeedReceiver=Currently methods need receiver ({0})
+Expression.InInvalidStateDueTo_EXC_=Expression is in invalid state due to "{0}"
+Expression.InInvalidState_EXC_=Expression is in invalid state
+Expression.TypeSentInInvalidOrder_EXC_=Expression type sent in invalid order
+Expression.ArrayTypeNotAnArray_EXC_=ArrayType "{0}" is not an array.
+Expression.CannotHandleNoReceiveOnFieldAccess_EXC_=Currently cannot handle no receiver on field access.
+Expression.MethodsNeedReceiver_EXC_=Currently methods need receiver ({0})
 ProxyPlugin.CleanupDefaultProxyLaunchConfigurations=Clean up default proxy launch configurations.
-ProxyLaunchSupport.RegistryCouldNotStartForSomeReason=Registry could not be started for some reason.
+ProxyLaunchSupport.RegistryCouldNotStartForSomeReason_WARN_=Registry could not be started for some reason.
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 454aee4..6db5ef8 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,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: REMExpression.java,v $
- *  $Revision: 1.4 $  $Date: 2004/06/02 19:59:11 $ 
+ *  $Revision: 1.5 $  $Date: 2004/06/04 23:26:02 $ 
  */
 package org.eclipse.jem.internal.proxy.remote;
 
@@ -53,9 +53,9 @@
 	/**
 	 * General IOException occurred msg.
 	 */
-	protected static final String IO_EXCEPTION_MSG = ProxyRemoteMessages.getString("REMExpression.IOExceptionSeeLog"); //$NON-NLS-1$
+	protected static final String IO_EXCEPTION_MSG = ProxyRemoteMessages.getString("REMExpression.IOExceptionSeeLog_INFO_"); //$NON-NLS-1$
 	
-	protected static final String COMMAND_EXCEPTION_MSG = ProxyRemoteMessages.getString("REMExpression.CommandExceptionSeeLog"); //$NON-NLS-1$
+	protected static final String COMMAND_EXCEPTION_MSG = ProxyRemoteMessages.getString("REMExpression.CommandExceptionSeeLog_INFO_"); //$NON-NLS-1$
 	
 	/**
 	 * Throw an an illegal state exception if some general error, in particular an I/O or Command Exception
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 410a36c..715d4ab 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 @@
  *******************************************************************************/
 /*
  *  $RCSfile: REMProxyFactoryRegistry.java,v $
- *  $Revision: 1.8 $  $Date: 2004/06/02 19:59:11 $ 
+ *  $Revision: 1.9 $  $Date: 2004/06/04 23:26:02 $ 
  */
 
 
@@ -300,7 +300,7 @@
 			if (c.isConnected())
 				return c;
 			else
-				throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CallbackConnectionNotWorking")); //$NON-NLS-1$
+				throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CallbackConnectionNotWorking_EXC_")); //$NON-NLS-1$
 		}
 		synchronized(fConnectionPool) {
 			if (!fConnectionPool.isEmpty())
@@ -355,8 +355,8 @@
 			
 			if (scArray[0] == null)  {
 				// Log where we are at so we can know where it was we down.
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", new RuntimeException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.ConnectionCreationFailed"))));	//$NON-NLS-1$ //$NON-NLS-2$
-				throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM"));	// Couldn't get one, probably server is down. //$NON-NLS-1$
+				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", new RuntimeException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.ConnectionCreationFailed_INFO_"))));	//$NON-NLS-1$ //$NON-NLS-2$
+				throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM_EXC_"));	// Couldn't get one, probably server is down. //$NON-NLS-1$
 			}
 
 			REMConnection connection = new REMConnection(scArray[0], fNoTimeouts);
@@ -371,7 +371,7 @@
 		} else
 			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "No Server to retrieve a connection.", null));	///$NON-NLS-1$
 		
-		throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM")); //$NON-NLS-1$
+		throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM_EXC_")); //$NON-NLS-1$
 	}
 		 
 	/**
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 12b115e..7b33743 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.5 $  $Date: 2004/06/02 19:59:11 $
+# $Revision: 1.6 $  $Date: 2004/06/04 23:26:02 $
 #
 
 
@@ -60,8 +60,8 @@
 
 CleanupJob.title=Remote VM Cleanup GC'd Proxies Job
 
-REMProxyFactoryRegistry.CallbackConnectionNotWorking=Callback connection is not working.
-REMProxyFactoryRegistry.ConnectionCreationFailed=Connection creation failed.
-REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM=Could not create a socket connection to remote vm.
-REMExpression.IOExceptionSeeLog=I/O Exception occurred. See .log file for details.
-REMExpression.CommandExceptionSeeLog=Command Exception occurred. See .log file for details.
+REMProxyFactoryRegistry.CallbackConnectionNotWorking_EXC_=Callback connection is not working.
+REMProxyFactoryRegistry.ConnectionCreationFailed_INFO_=Connection creation failed.
+REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM_EXC_=Could not create a socket connection to remote vm.
+REMExpression.IOExceptionSeeLog_INFO_=I/O Exception occurred. See .log file for details.
+REMExpression.CommandExceptionSeeLog_INFO_=Command Exception occurred. See .log file for details.
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchProjectTab.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchProjectTab.java
index c3fe573..a12fcbd 100644
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchProjectTab.java
+++ b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchProjectTab.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: LocalLaunchProjectTab.java,v $
- *  $Revision: 1.1 $  $Date: 2004/03/04 16:14:29 $ 
+ *  $Revision: 1.2 $  $Date: 2004/06/04 23:26:20 $ 
  */
 package org.eclipse.jem.internal.ui.proxy.remote;
 
@@ -218,15 +218,15 @@
 			if (status.isOK()) {
 				IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(name);
 				if (!project.exists()) {
-					setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.ProjectNotExist"), new String[] {name})); //$NON-NLS-1$
+					setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.ProjectNotExist_ERROR_"), new String[] {name})); //$NON-NLS-1$
 					return false;
 				}
 				if (!project.isOpen()) {
-					setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.ProjectNotOpen"), new String[] {name})); //$NON-NLS-1$
+					setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.ProjectNotOpen_ERROR_"), new String[] {name})); //$NON-NLS-1$
 					return false;
 				}
 			} else {
-				setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.ProjectValidateError"), new String[]{status.getMessage()})); //$NON-NLS-1$
+				setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.ProjectValidateError_ERROR_"), new String[]{status.getMessage()})); //$NON-NLS-1$
 				return false;
 			}
 		}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/messages.properties b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/messages.properties
index 44dea58..1afcda6 100644
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/messages.properties
+++ b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/messages.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 #
 # $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/Attic/messages.properties,v $
-# $Revision: 1.1 $  $Date: 2004/03/04 16:14:29 $
+# $Revision: 1.2 $  $Date: 2004/06/04 23:26:20 $
 #
 
 LocalLaunchProjectTab.name=&Project
@@ -18,6 +18,6 @@
 LocalLaunchProjectTab.Browse=&Browse...
 LocalLaunchProjectTab.Project_Selection=Project Selection
 LocalLaunchProjectTab.ChooseProject=Choose a &project to for the launch:
-LocalLaunchProjectTab.ProjectNotExist=Project "{0}" doesn't exist.
-LocalLaunchProjectTab.ProjectNotOpen=Project "{0}" is not open.
-LocalLaunchProjectTab.ProjectValidateError=Project validation error. Msg is "{0}."
\ No newline at end of file
+LocalLaunchProjectTab.ProjectNotExist_ERROR_=Project "{0}" doesn't exist.
+LocalLaunchProjectTab.ProjectNotOpen_ERROR_=Project "{0}" is not open.
+LocalLaunchProjectTab.ProjectValidateError_ERROR_=Project validation error. Msg is "{0}."
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java
index eef9811..bd96d21 100644
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java
+++ b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ParseTreeCreationFromAST.java,v $
- *  $Revision: 1.8 $  $Date: 2004/06/04 18:38:39 $ 
+ *  $Revision: 1.9 $  $Date: 2004/06/04 23:26:40 $ 
  */
 package org.eclipse.jem.workbench.utility;
 
@@ -180,7 +180,7 @@
 			expression = null;
 			astExpression.accept(this);
 			if (expression == null)
-				throw new InvalidExpressionException(MessageFormat.format(WorkbenchUtilityMessages.getString("ParseTreeCreationFromAST.ExpressionTooComplicated"), new Object[] {astExpression.toString()})); //$NON-NLS-1$
+				throw new InvalidExpressionException(MessageFormat.format(WorkbenchUtilityMessages.getString("ParseTreeCreationFromAST.ExpressionTooComplicated_EXC_"), new Object[] {astExpression.toString()})); //$NON-NLS-1$
 			return expression;
 		} else
 			return null;	// This is ok. It means an optional expression was being processed and the expression didn't exist.
@@ -280,7 +280,7 @@
 	 */
 	public boolean visit(ClassInstanceCreation node) {
 		if (node.getAnonymousClassDeclaration() != null) {
-			throw new InvalidExpressionException(WorkbenchUtilityMessages.getString("ParseTreeCreationFromAST.CannotProcessAnonymousDeclarations.")); //$NON-NLS-1$
+			throw new InvalidExpressionException(WorkbenchUtilityMessages.getString("ParseTreeCreationFromAST.CannotProcessAnonymousDeclarations_EXC_")); //$NON-NLS-1$
 		}
 		PTClassInstanceCreation cic = InstantiationFactory.eINSTANCE.createPTClassInstanceCreation();
 		// If ast level = 2, then you must use getName, but the name needs to be turned into a type
@@ -361,7 +361,7 @@
 		if (inoper == null) {
 			// It is not one we can handle.
 			throw new InvalidExpressionException(
-					MessageFormat.format(WorkbenchUtilityMessages.getString("ParseTreeCreationFromAST.OperatorTooComplicatedToHandle"), new Object[] { node.getOperator().toString() })); //$NON-NLS-1$
+					MessageFormat.format(WorkbenchUtilityMessages.getString("ParseTreeCreationFromAST.OperatorTooComplicatedToHandle_EXC_"), new Object[] { node.getOperator().toString() })); //$NON-NLS-1$
 		}
 		inf.setOperator(inoper);
 		inf.setRightOperand(perform(node.getRightOperand()));
@@ -475,7 +475,7 @@
 		if (ptoper == null) {
 			// It is not one we can handle.
 			throw new InvalidExpressionException(
-				MessageFormat.format(WorkbenchUtilityMessages.getString("ParseTreeCreationFromAST.OperatorTooComplicatedToHandle"), new Object[] { node.getOperator().toString() })); //$NON-NLS-1$
+				MessageFormat.format(WorkbenchUtilityMessages.getString("ParseTreeCreationFromAST.OperatorTooComplicatedToHandle_EXC_"), new Object[] { node.getOperator().toString() })); //$NON-NLS-1$
 		}
 		pe.setOperator(ptoper);
 		expression = pe;
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties
index 3a1c9b8..387a330 100644
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties
+++ b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties
@@ -1,4 +1,4 @@
 ParseTreeCreationFromAST.0={0} - {1}
-ParseTreeCreationFromAST.ExpressionTooComplicated=Expression "{0}" is too complicated.
-ParseTreeCreationFromAST.CannotProcessAnonymousDeclarations.=Cannot process anonymous declarations.
-ParseTreeCreationFromAST.OperatorTooComplicatedToHandle=Operator "{0}" is too complicated to handle.
+ParseTreeCreationFromAST.ExpressionTooComplicated_EXC_=Expression "{0}" is too complicated.
+ParseTreeCreationFromAST.CannotProcessAnonymousDeclarations_EXC_=Cannot process anonymous declarations.
+ParseTreeCreationFromAST.OperatorTooComplicatedToHandle_EXC_=Operator "{0}" is too complicated to handle.
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java
index 3b6973e..51d81f1 100644
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: ParseTreeAllocationInstantiationVisitor.java,v $
- *  $Revision: 1.2 $  $Date: 2004/06/02 19:41:38 $ 
+ *  $Revision: 1.3 $  $Date: 2004/06/04 23:25:40 $ 
  */
 package org.eclipse.jem.internal.instantiation.base;
 
@@ -557,7 +557,7 @@
 	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTThisLiteral)
 	 */
 	public boolean visit(PTThisLiteral node) {
-		throw new IllegalArgumentException(InstantiationBaseMessages.getString("ParseTreeAllocationInstantiationVisitor.CurrentlyThisNotSupported")); //$NON-NLS-1$
+		throw new IllegalArgumentException(InstantiationBaseMessages.getString("ParseTreeAllocationInstantiationVisitor.CurrentlyThisNotSupported_EXC_")); //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties
index 2a7855e..94a6041 100644
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties
@@ -1 +1 @@
-ParseTreeAllocationInstantiationVisitor.CurrentlyThisNotSupported=Currently "this" is not supported
+ParseTreeAllocationInstantiationVisitor.CurrentlyThisNotSupported_EXC_=Currently "this" is not supported