86479 : [perf] Convert msg. bundles to use instance variables

21 files changed, 171 insertions, 232 deletions

diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java
index d67efc7b3..2b49711d4 100644
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java
+++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java
@@ -1,42 +1,31 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-/*
- *  $RCSfile: BeanInfoAdapterMessages.java,v $
- *  $Revision: 1.5 $  $Date: 2005/06/21 19:08:29 $ 
- */
 package org.eclipse.jem.internal.beaninfo.adapters;
 
+import org.eclipse.osgi.util.NLS;
 
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-/**
- * 
- * 
- * @since 1.0.0
- */
-public class BeanInfoAdapterMessages {
+public final class BeanInfoAdapterMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.adapters.messages";	//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
+	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.adapters.messages";//$NON-NLS-1$
 
 	private BeanInfoAdapterMessages() {
+		// Do not instantiate
 	}
 
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
+	public static String INTROSPECT_FAILED_EXC_;
+	public static String BeaninfoClassAdapter_ClassNotFound;
+	public static String BeaninfoNature_InvalidProject;
+	public static String UICreateRegistryJobHandler_StartBeaninfoRegistry;
+
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, BeanInfoAdapterMessages.class);
 	}
-}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
index 82aaf66a9..1fced213b 100644
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
+++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.beaninfo.adapters;
 /*
  *  $RCSfile: BeaninfoClassAdapter.java,v $
- *  $Revision: 1.38 $  $Date: 2005/06/21 19:08:29 $ 
+ *  $Revision: 1.39 $  $Date: 2005/06/21 19:17:03 $ 
  */
 
 import java.io.FileNotFoundException;
@@ -478,7 +478,7 @@ public class BeaninfoClassAdapter extends AdapterImpl implements IIntrospectionA
 						BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(),
 						0,
 						MessageFormat.format(
-							BeanInfoAdapterMessages.getString("INTROSPECT_FAILED_EXC_"), //$NON-NLS-1$
+							BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, 
 							new Object[] { getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
 						e));
 			} finally {
@@ -758,8 +758,7 @@ public class BeaninfoClassAdapter extends AdapterImpl implements IIntrospectionA
 										} catch (ThrowableProxy e) {
 											BeaninfoPlugin.getPlugin().getLogger().log(
 													new Status(IStatus.WARNING, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0,
-															MessageFormat.format(BeanInfoAdapterMessages
-																	.getString("INTROSPECT_FAILED_EXC_"), new Object[] { //$NON-NLS-1$
+															MessageFormat.format(BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { //$NON-NLS-1$
 																	getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
 																	e));
 										}
@@ -768,17 +767,16 @@ public class BeaninfoClassAdapter extends AdapterImpl implements IIntrospectionA
 										BeaninfoPlugin.getPlugin().getLogger()
 										.log(
 												new Status(IStatus.WARNING, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0,
-														MessageFormat.format(BeanInfoAdapterMessages
-																.getString("INTROSPECT_FAILED_EXC_"), new Object[] { //$NON-NLS-1$
+														MessageFormat.format(BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { //$NON-NLS-1$
 																getJavaClass().getJavaName(), targetType.getInitializationError()}), null));
 									}
 								} else {
 									// The class itself could not be found. Just log it, but treat as no proxy.
 									BeaninfoPlugin.getPlugin().getLogger().log(
 											new Status(IStatus.INFO, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0, MessageFormat.format(
-													BeanInfoAdapterMessages.getString("INTROSPECT_FAILED_EXC_"), new Object[] { //$NON-NLS-1$
+													BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { 
 															getJavaClass().getJavaName(),
-															BeanInfoAdapterMessages.getString("BeaninfoClassAdapter.ClassNotFound")}), //$NON-NLS-1$
+															BeanInfoAdapterMessages.BeaninfoClassAdapter_ClassNotFound}), 
 															null));
 								}
 								
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
index bd8ef2d1b..807c095fe 100644
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
+++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.beaninfo.adapters;
 /*
  *  $RCSfile: BeaninfoNature.java,v $
- *  $Revision: 1.31 $  $Date: 2005/06/21 19:08:29 $ 
+ *  $Revision: 1.32 $  $Date: 2005/06/21 19:17:03 $ 
  */
 
 import java.io.*;
@@ -138,8 +138,8 @@ public class BeaninfoNature implements IProjectNature {
 					BeaninfoPlugin.PI_BEANINFO_PLUGINID,
 					0,
 					MessageFormat.format(
-						BeanInfoAdapterMessages.getString("INTROSPECT_FAILED_EXC_"), //$NON-NLS-1$
-						new Object[] { project.getName(), BeanInfoAdapterMessages.getString("BeaninfoNature.InvalidProject")}), //$NON-NLS-1$
+						BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, 
+						new Object[] { project.getName(), BeanInfoAdapterMessages.BeaninfoNature_InvalidProject}), 
 					null));
 
 		addNatureToProject(project, NATURE_ID);
@@ -478,7 +478,7 @@ public class BeaninfoNature implements IProjectNature {
 	 * done when build not in progress and serial access.
 	 */
 	void createRegistry(IProgressMonitor pm) {
-		pm.beginTask(BeanInfoAdapterMessages.getString("UICreateRegistryJobHandler.StartBeaninfoRegistry"), 100); //$NON-NLS-1$		
+		pm.beginTask(BeanInfoAdapterMessages.UICreateRegistryJobHandler_StartBeaninfoRegistry, 100); 
 		if (isRegistryCreated()) {
 			pm.done();
 			return; // It had already been created. Could of been because threads were racing to do the creation, and one got there first.
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
index 23dcc5e3e..6bb67893c 100644
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
+++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: CreateRegistryJobHandler.java,v $
- *  $Revision: 1.12 $  $Date: 2005/05/18 20:59:17 $ 
+ *  $Revision: 1.13 $  $Date: 2005/06/21 19:17:03 $ 
  */
 package org.eclipse.jem.internal.beaninfo.adapters;
 
@@ -118,7 +118,7 @@ class CreateRegistryJobHandler {
 		
 		if (!gotRuleLocally) {
 			// Spawn off to a job and wait for it. Hopefully we don't have a deadlock somewhere.
-			Job doCreateJob = new Job(BeanInfoAdapterMessages.getString("UICreateRegistryJobHandler.StartBeaninfoRegistry")) { //$NON-NLS-1$
+			Job doCreateJob = new Job(BeanInfoAdapterMessages.UICreateRegistryJobHandler_StartBeaninfoRegistry) { 
 
 				protected IStatus run(IProgressMonitor monitor) {
 					doCreateRegistry(nature, monitor);
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
index 87e9d20a5..de422ed05 100644
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
+++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
@@ -10,10 +10,10 @@
 ###############################################################################
 #
 # $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties,v $
-# $Revision: 1.4 $  $Date: 2005/02/15 22:44:20 $
+# $Revision: 1.5 $  $Date: 2005/06/21 19:17:03 $
 #
 
 INTROSPECT_FAILED_EXC_                           = IWAV0155E Introspection failed on class "{0}." msg="{1}."
-BeaninfoClassAdapter.ClassNotFound               = Class not found
-BeaninfoNature.InvalidProject                    = Invalid project
-UICreateRegistryJobHandler.StartBeaninfoRegistry = Start Beaninfo registry
+BeaninfoClassAdapter_ClassNotFound               = Class not found
+BeaninfoNature_InvalidProject                    = Invalid project
+UICreateRegistryJobHandler_StartBeaninfoRegistry = Start Beaninfo registry
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java
index 1f1ea0668..3c5de26c8 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java
@@ -11,7 +11,7 @@ package org.eclipse.jem.internal.proxy.initParser;
  *******************************************************************************/
 /*
  *  $RCSfile: CharLiteral.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
+ *  $Revision: 1.3 $  $Date: 2005/06/21 19:21:07 $ 
  */
 
 import java.text.MessageFormat;
@@ -38,7 +38,7 @@ public Object evaluate() throws Exception {
 		return new Character(valueBuffer.charAt(0));
 	else
 		throw new EvaluationException(
-			new IllegalArgumentException(MessageFormat.format(ProxyInitParserMessages.getString("CharTooComplicated_EXC_"), //$NON-NLS-1$
+			new IllegalArgumentException(MessageFormat.format(ProxyInitParserMessages.CharTooComplicated_EXC_, 
 				new Object[] {valueBuffer.toString()})));
 }
 
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java
index 5544ceaf3..976b7dce3 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java
@@ -11,7 +11,7 @@ package org.eclipse.jem.internal.proxy.initParser;
  *******************************************************************************/
 /*
  *  $RCSfile: Field.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
+ *  $Revision: 1.3 $  $Date: 2005/06/21 19:21:07 $ 
  */
 
 
@@ -114,7 +114,7 @@ public Expression push(char[] token, char tokenDelimiter) {
 	// Ignore spaces as this maybe padding between the field and the next valid token
 	if(token.length == 0 && tokenDelimiter == ' ') return this;
 
-	throw new RuntimeException(java.text.MessageFormat.format(ProxyInitParserMessages.getString(ProxyInitParserMessages.UNEXPECTED_TOKEN), new Object[] {new StringBuffer(token.length+1).append(token).append(tokenDelimiter).toString()}));
+	throw new RuntimeException(java.text.MessageFormat.format(ProxyInitParserMessages.UnexpectedToken_EXC_, new Object[] {new StringBuffer(token.length+1).append(token).append(tokenDelimiter).toString()})); 
 	
 }
 public String toString(){
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 cee683277..24c4f6149 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
@@ -17,7 +17,7 @@ import java.text.MessageFormat;
  *******************************************************************************/
 /*
  *  $RCSfile: PrimitiveOperation.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/18 23:11:27 $ 
+ *  $Revision: 1.4 $  $Date: 2005/06/21 19:21:07 $ 
  */
 
 public class PrimitiveOperation extends Expression {
@@ -41,7 +41,7 @@ public class PrimitiveOperation extends Expression {
 				return new Integer(((Integer)leftHandSide).intValue() & ((Integer)rightHandSide).intValue());				
 			}
 		}
-		throw new RuntimeException(MessageFormat.format(ProxyInitParserMessages.getString("PrimitiveOperation.Evaluate.InvalidOperator_EXC_"), new Object[]{getOperDescription(), leftHandSide, rightHandSide}));		 //$NON-NLS-1$
+		throw new RuntimeException(MessageFormat.format(ProxyInitParserMessages.PrimitiveOperation_Evaluate_InvalidOperator_EXC_, new Object[]{getOperDescription(), leftHandSide, rightHandSide}));		 
 	}
 	protected String getOperDescription(){
 		if(operation == BitOR) return "|"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java
index 6372fae60..ff64c4629 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java
@@ -1,46 +1,32 @@
-package org.eclipse.jem.internal.proxy.initParser;
 /*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-/*
- *  $RCSfile: ProxyInitParserMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
+package org.eclipse.jem.internal.proxy.initParser;
 
+import org.eclipse.osgi.util.NLS;
 
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-/**
- * General Proxy NLS Constants
- * Creation date: (4/13/00 10:46:58 AM)
- * @author: Administrator
- */
-public class ProxyInitParserMessages {
-	// Resource Bundle to use for basic Proxy NLS resources.
-	static private final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle("org.eclipse.jem.internal.proxy.initParser.messages"); //$NON-NLS-1$
+public final class ProxyInitParserMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.initParser.messages";//$NON-NLS-1$
 
-	// Keys for messages/strings within the resource bundle.
-	static public final String
-		UNEXPECTED_TOKEN = "UnexpectedToken_EXC_", //$NON-NLS-1$
-		STATEMENT_UNEXPECTED_EXECUTION = "Statement.UnexpectedExecution_EXC_", //$NON-NLS-1$
-		STATEMENT_UNEXPECTED_EVALUATION = "Statement.UnexpectedEvaluation_EXC_"		; //$NON-NLS-1$
-		
 	private ProxyInitParserMessages() {
+		// Do not instantiate
 	}
 
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}		
+	public static String UnexpectedToken_EXC_;
+	public static String Statement_UnexpectedExecution_EXC_;
+	public static String Statement_UnexpectedEvaluation_EXC_;
+	public static String CharTooComplicated_EXC_;
+	public static String PrimitiveOperation_Evaluate_InvalidOperator_EXC_;
 
-}
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, ProxyInitParserMessages.class);
+	}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java
index 00c3df95b..9c6b6e1b4 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java
@@ -11,7 +11,7 @@ package org.eclipse.jem.internal.proxy.initParser;
  *******************************************************************************/
 /*
  *  $RCSfile: Statement.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
+ *  $Revision: 1.3 $  $Date: 2005/06/21 19:21:07 $ 
  */
 
 
@@ -39,7 +39,7 @@ public Object evaluate() throws Exception {
 	if ( currentExpression != null ) {
 		return currentExpression.evaluate();
 	} else {
-		throw new RuntimeException(ProxyInitParserMessages.getString(ProxyInitParserMessages.STATEMENT_UNEXPECTED_EXECUTION));	// This is not an evaluation error, it shouldn't of occured, so it is a parser error.
+		throw new RuntimeException(ProxyInitParserMessages.Statement_UnexpectedExecution_EXC_);	// This is not an evaluation error, it shouldn't of occured, so it is a parser error. //$NON-NLS-1$
 	}
 }
 /**
@@ -195,7 +195,7 @@ public boolean isPrimitive() throws Exception {
 	if ( currentExpression != null ) {
 		return currentExpression.isPrimitive();
 	} else {
-		throw new RuntimeException(ProxyInitParserMessages.getString(ProxyInitParserMessages.STATEMENT_UNEXPECTED_EXECUTION));
+		throw new RuntimeException(ProxyInitParserMessages.Statement_UnexpectedExecution_EXC_); 
 	}
 }
 }
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 f9b1ccbca..6db6ab6ae 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.3 $  $Date: 2005/05/18 23:11:27 $
+# $Revision: 1.4 $  $Date: 2005/06/21 19:21:07 $
 #
 
 
@@ -18,7 +18,7 @@
 # Properties for the Proxy Base VM Support
 #
 UnexpectedToken_EXC_                = IWAV0127E Unexpected Token "{0}".
-Statement.UnexpectedExecution_EXC_  = IWAV0128E Statement was executed unexpectedly.
-Statement.UnexpectedEvaluation_EXC_ = IWAV0129E Statements should not be evaluated.
+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}
+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 94d1182bc..d3e691545 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.12 $  $Date: 2005/06/15 20:19:11 $ 
+ *  $Revision: 1.13 $  $Date: 2005/06/21 19:24:21 $ 
  */
 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(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CreateFieldAccessReference.FieldsTypesNotMatching_EXC_"), new Object[]{field.getType(), (receiver!=null ? receiver.getClass() : null)})); //$NON-NLS-1$
+					throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.ExpressionProcesser_CreateFieldAccessReference_FieldsTypesNotMatching_EXC_, new Object[]{field.getType(), (receiver!=null ? receiver.getClass() : null)})); 
 			}
 			field.setAccessible(true);	// Make it always accessible. Trust it. 
 			return new FieldAccessReference(field, receiver);
@@ -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(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CreateArrayAccessReference.OutOfBounds_EXC_"), new Object[]{new Integer(index), new Integer(len)})); //$NON-NLS-1$
+				throw new ArrayIndexOutOfBoundsException(MessageFormat.format(InitparserTreeMessages.ExpressionProcesser_CreateArrayAccessReference_OutOfBounds_EXC_, new Object[]{new Integer(index), new Integer(len)})); 
 			return new ArrayAccessReference(array, index);
 		}
 		/**
@@ -423,7 +423,7 @@ public class ExpressionProcesser {
 		try {
 			Class result = (Class) expressionTypeStack.remove(expressionTypeStack.size()-1);
 			if (!allowVoid && result == Void.TYPE)
-				throw new NoExpressionValueException(InitparserTreeMessages.getString("ExpressionProcesser.PopExpressionType.ExpressionVoid_EXC_")); //$NON-NLS-1$
+				throw new NoExpressionValueException(InitparserTreeMessages.ExpressionProcesser_PopExpressionType_ExpressionVoid_EXC_); 
 			return result;
 				
 		} catch (IndexOutOfBoundsException e) {
@@ -728,7 +728,7 @@ public class ExpressionProcesser {
 				} else {
 					if (doTrace)
 						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$
+					NoExpressionValueException e = new NoExpressionValueException(InitparserTreeMessages.ExpressionProcesser_GetExpressionProxyValue_ExpressionProxyNotSet_EXC_); 
 					if (pull)
 						throw e;
 					else
@@ -738,7 +738,7 @@ public class ExpressionProcesser {
 			} else {
 				if (doTrace)
 					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$
+				NoExpressionValueException e = new NoExpressionValueException(InitparserTreeMessages.ExpressionProcesser_GetExpressionProxyValue_ExpressionProxyDoesntExist_EXC_); 
 				if (pull)
 					throw e;
 				else
@@ -946,7 +946,7 @@ public class ExpressionProcesser {
 	}
 	
 	private void throwClassCast(Class returnType, Object bean) throws ClassCastException {
-		throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY_EXC_"), new Object[] {bean != null ? bean.getClass().getName() : null, returnType.getName()})); //$NON-NLS-1$
+		throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.ExpressionProcesser_CannotCastXToY_EXC_, new Object[] {bean != null ? bean.getClass().getName() : null, returnType.getName()})); 
 	}
 
 	/**
@@ -1495,7 +1495,7 @@ public class ExpressionProcesser {
 	}
 	
 	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$
+		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.ExpressionProcesser_InvalidOperandOfPrefixOperator_EXC_, new Object[] {exp != null ? exp.toString() : null, operator.toString()})); 
 	}		
 	
 	private static final Object INFIX_IGNORE = "INFIX IGNORE";	// Flag for infix in ingore //$NON-NLS-1$
@@ -2071,7 +2071,7 @@ public class ExpressionProcesser {
 	}
 	
 	private void throwInvalidInfix(InfixOperator operator, Object value) throws IllegalArgumentException {
-		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfOperator_EXC_"), new Object[] {value != null ? value.toString() : null, operator.toString()})); //$NON-NLS-1$
+		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.ExpressionProcesser_InvalidOperandOfOperator_EXC_, new Object[] {value != null ? value.toString() : null, operator.toString()})); 
 	}
 	
 	private void testValidBitType(Class type, InfixOperator operator) {
@@ -2172,7 +2172,7 @@ public class ExpressionProcesser {
 					}
 					
 					if (dimcount < indexCount)
-						throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray_EXC_"), new Object[] {new Integer(indexCount), new Integer(dimcount)})); //$NON-NLS-1$
+						throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.ExpressionProcesser_XIsGreaterThanNumberOfDimensionsInArray_EXC_, new Object[] {new Integer(indexCount), new Integer(dimcount)})); 
 					
 					// Now start accessing one index at a time, stop just before the last one. The last one will be turned into an ArrayAccessReference.
 					Object value = array;	// Final value, start with full array.
@@ -2185,7 +2185,7 @@ public class ExpressionProcesser {
 						printObjectAndType(arrayValue, componentTypes[pullCount]);
 					pushExpressionValue(arrayValue, componentTypes[pullCount]);
 				}  else
-					 throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.NotAnArray_EXC_"), new Object[] {arrayType})); //$NON-NLS-1$
+					 throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.ExpressionProcesser_NotAnArray_EXC_, new Object[] {arrayType})); 
 	
 			} catch (NoExpressionValueException e) {
 				processSyntaxException(e);
@@ -2230,7 +2230,7 @@ public class ExpressionProcesser {
 					for(int i=0; i < dimensionCount && componentType != null; i++)
 						componentType = componentType.getComponentType();
 					if (componentType == null)
-						throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested_EXC_"), new Object[] {arrayType, new Integer(dimensionCount)})); //$NON-NLS-1$
+						throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.ExpressionProcesser_ArraytypeHasFewerDimensionsThanRequested_EXC_, new Object[] {arrayType, new Integer(dimensionCount)})); 
 					
 					// We need to pull in the dimension initializers. They are stacked in reverse order.
 					int[] dimInit = new int[dimensionCount];
@@ -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"})); //$NON-NLS-1$ //$NON-NLS-2$
+					throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.ExpressionProcesser_CannotCastXToY_EXC_, new Object[] {arrayType, "array"})); 
 				} 
 				// Strip off the number of dimensions specified.
 				while(stripCount-->0) {
@@ -2732,7 +2732,7 @@ public class ExpressionProcesser {
 				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(InitparserTreeMessages.getString("ExpressionProcesser.PushBlockEnd.ReceivedEndBlocksOutOfOrder_EXC_"))); //$NON-NLS-1$
+				processSyntaxException(new IllegalStateException(InitparserTreeMessages.ExpressionProcesser_PushBlockEnd_ReceivedEndBlocksOutOfOrder_EXC_)); 
 			} else {
 				topBlock--;
 				if (ignoreExpression == BLOCK_IGNORE && blockNumber == breakBlock) {
@@ -2894,7 +2894,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(InitparserTreeMessages.getString("ExpressionProcesser.PushTryCatchClause.CatchReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
+				processSyntaxException(new IllegalStateException(InitparserTreeMessages.ExpressionProcesser_PushTryCatchClause_CatchReceivedOutOfOrder_EXC_)); 
 			} else {
 				if (ignoreExpression == null) {
 					// Normal flow, no throw in progress, so just ignore now until the finally or end try reached.
@@ -2946,7 +2946,7 @@ public class ExpressionProcesser {
 				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(InitparserTreeMessages.getString("ExpressionProcesser.PushTryFinallyClause.FinallyReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
+				processSyntaxException(new IllegalStateException(InitparserTreeMessages.ExpressionProcesser_PushTryFinallyClause_FinallyReceivedOutOfOrder_EXC_)); 
 			} 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).
@@ -2984,10 +2984,10 @@ public class ExpressionProcesser {
 				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(InitparserTreeMessages.getString("ExpressionProcesser.PushTryRethrow.RethrowReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
+				processSyntaxException(new IllegalStateException(InitparserTreeMessages.ExpressionProcesser_PushTryRethrow_RethrowReceivedOutOfOrder_EXC_)); 
 			} else if (ignoreExpression == null) {
 				if (trysInCatch[topTry] == null || trysInCatch[topTry] == FINAL_CATCH)
-					processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryRethrow.RetryReceivedOutOfExecutingCatchClause_EXC_"))); //$NON-NLS-1$
+					processSyntaxException(new IllegalStateException(InitparserTreeMessages.ExpressionProcesser_PushTryRethrow_RetryReceivedOutOfExecutingCatchClause_EXC_)); 
 				else {
 					throwException(trysInCatch[topTry]);
 				}
@@ -3008,7 +3008,7 @@ public class ExpressionProcesser {
 				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(InitparserTreeMessages.getString("ExpressionProcesser.PushTryEnd.TryEndReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
+				processSyntaxException(new IllegalStateException(InitparserTreeMessages.ExpressionProcesser_PushTryEnd_TryEndReceivedOutOfOrder_EXC_)); 
 			} else {
 				boolean inCatch = trysInCatch[topTry] != null;
 				trysInCatch[topTry] = null;
@@ -3210,7 +3210,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(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.PushEndmark.EndMarkOnNonExistingID_EXC_"), new Object[]{new Integer(markID)}))); //$NON-NLS-1$
+				processSyntaxException(new IllegalStateException(MessageFormat.format(InitparserTreeMessages.ExpressionProcesser_PushEndmark_EndMarkOnNonExistingID_EXC_, new Object[]{new Integer(markID)}))); 
 			}
 		} finally {
 			if (traceOn)
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java
index ee9f24da0..aa58bddc3 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java
@@ -1,43 +1,45 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-/*
- *  $RCSfile: InitparserTreeMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
 package org.eclipse.jem.internal.proxy.initParser.tree;
 
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.eclipse.osgi.util.NLS;
 
-/**
- * @author sri
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class InitparserTreeMessages {
+public final class InitparserTreeMessages extends NLS {
 
 	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.initParser.tree.messages";//$NON-NLS-1$
 
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
 	private InitparserTreeMessages() {
+		// Do not instantiate
 	}
 
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
+	public static String ExpressionProcesser_CannotCastXToY_EXC_;
+	public static String ExpressionProcesser_InvalidOperandOfPrefixOperator_EXC_;
+	public static String ExpressionProcesser_PopExpressionType_ExpressionVoid_EXC_;
+	public static String ExpressionProcesser_InvalidOperandOfOperator_EXC_;
+	public static String ExpressionProcesser_XIsGreaterThanNumberOfDimensionsInArray_EXC_;
+	public static String ExpressionProcesser_CreateArrayAccessReference_OutOfBounds_EXC_;
+	public static String ExpressionProcesser_PushTryEnd_TryEndReceivedOutOfOrder_EXC_;
+	public static String ExpressionProcesser_PushEndmark_EndMarkOnNonExistingID_EXC_;
+	public static String ExpressionProcesser_NotAnArray_EXC_;
+	public static String ExpressionProcesser_ArraytypeHasFewerDimensionsThanRequested_EXC_;
+	public static String ExpressionProcesser_CreateFieldAccessReference_FieldsTypesNotMatching_EXC_;
+	public static String ExpressionProcesser_GetExpressionProxyValue_ExpressionProxyNotSet_EXC_;
+	public static String ExpressionProcesser_GetExpressionProxyValue_ExpressionProxyDoesntExist_EXC_;
+	public static String ExpressionProcesser_PushBlockEnd_ReceivedEndBlocksOutOfOrder_EXC_;
+	public static String ExpressionProcesser_PushTryCatchClause_CatchReceivedOutOfOrder_EXC_;
+	public static String ExpressionProcesser_PushTryFinallyClause_FinallyReceivedOutOfOrder_EXC_;
+	public static String ExpressionProcesser_PushTryRethrow_RethrowReceivedOutOfOrder_EXC_;
+	public static String ExpressionProcesser_PushTryRethrow_RetryReceivedOutOfExecutingCatchClause_EXC_;
+
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, InitparserTreeMessages.class);
 	}
 }
\ No newline at end of file
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 8723936c8..d4f67a836 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
@@ -4,25 +4,25 @@
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-# 
+#
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-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
+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.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoEntrySearchpathDialog.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoEntrySearchpathDialog.java
index c0c7f6400..a6b2dceb9 100644
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoEntrySearchpathDialog.java
+++ b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoEntrySearchpathDialog.java
@@ -11,49 +11,28 @@
 package org.eclipse.jem.internal.beaninfo.ui;
 /*
  *  $RCSfile: BeaninfoEntrySearchpathDialog.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 23:02:54 $ 
+ *  $Revision: 1.6 $  $Date: 2005/06/21 19:08:31 $ 
  */
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
+import java.util.*;
 import java.util.List;
 
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
+import org.eclipse.jdt.core.*;
 import org.eclipse.jdt.internal.ui.util.PixelConverter;
 import org.eclipse.jdt.internal.ui.wizards.TypedViewerFilter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
+import org.eclipse.jdt.internal.ui.wizards.dialogfields.*;
 import org.eclipse.jdt.ui.JavaElementLabelProvider;
+import org.eclipse.jface.dialogs.*;
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.*;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
+import org.eclipse.ui.dialogs.ISelectionStatusValidator;
 
 import org.eclipse.jem.internal.beaninfo.core.BeaninfoEntry;
 import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
@@ -101,9 +80,9 @@ public class BeaninfoEntrySearchpathDialog extends Dialog {
 
 		String[] buttonLabels = new String[] {
 			/* 0 */
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_UP),
+			BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.searchpath.up.button"), //$NON-NLS-1$
 			/* 1 */
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_DOWN),
+			BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.searchpath.down.button"), //$NON-NLS-1$
 			/* 2 */
 			null,
 			/* 3 */
@@ -224,10 +203,10 @@ public class BeaninfoEntrySearchpathDialog extends Dialog {
 			ILabelProvider labelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
 			ElementTreeSelectionDialog dialog =
 				new ElementTreeSelectionDialog(getShell(), labelProvider, provider);
-			dialog.setTitle(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_ADDSEARCHPATH_TITLE));
+			dialog.setTitle(BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.addsearchpath.title")); //$NON-NLS-1$
 
 			dialog.setValidator(validator);
-			dialog.setMessage(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_ADDSEARCHPATH_DESC));
+			dialog.setMessage(BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.addsearchpath.description")); //$NON-NLS-1$
 			dialog.addFilter(filter);
 			dialog.setInput(Arrays.asList(getBeaninfoRoots()));
 
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java
index 141be74a8..54f420f61 100644
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java
+++ b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: BeaninfoPathsBlock.java,v $
- *  $Revision: 1.8 $  $Date: 2005/04/06 22:24:40 $ 
+ *  $Revision: 1.9 $  $Date: 2005/06/21 19:08:31 $ 
  */
 package org.eclipse.jem.internal.beaninfo.ui;
 
@@ -74,9 +74,9 @@ public class BeaninfoPathsBlock {
 
 		String[] buttonLabels = new String[] {
 			/* 0 */
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_UP),
+			BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.searchpath.up.button"), //$NON-NLS-1$
 			/* 1 */
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_DOWN), 
+			BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.searchpath.down.button"), //$NON-NLS-1$ 
 			/* 2 */ null,
 			/* 3 */ BeanInfoUIMessages.getString("BeanInfoPathsBlock.ExportAll") , //$NON-NLS-1$
 			/* 4 */ BeanInfoUIMessages.getString("BeanInfoPathsBlock.UnexportAll") //$NON-NLS-1$
@@ -86,7 +86,7 @@ public class BeaninfoPathsBlock {
 		fSearchOrder = new CheckedListDialogField(null, buttonLabels, labelProvider);
 		fSearchOrder.setDialogFieldListener(adapter);
 		fSearchOrder.setLabelText(
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_LABEL));
+			BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.searchpath.label")); //$NON-NLS-1$
 		fSearchOrder.setUpButtonIndex(0);
 		fSearchOrder.setDownButtonIndex(1);
 		fSearchOrder.setCheckAllButtonIndex(3);
@@ -94,7 +94,7 @@ public class BeaninfoPathsBlock {
 
 		fEnableBeaninfoDialogField = new SelectionButtonDialogField(SWT.CHECK);
 		fEnableBeaninfoDialogField.setLabelText(
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_ENABLEBEANINFO));
+			BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.enablebeaninfo")); //$NON-NLS-1$
 
 		fSearchStatus = new StatusInfo();
 
@@ -179,7 +179,7 @@ public class BeaninfoPathsBlock {
 		
 		SearchpathOrderingWorkbookPage ordpage = new SearchpathOrderingWorkbookPage(fSearchOrder, interestedDialogFields);
 		item = new TabItem(folder, SWT.NONE);
-		item.setText(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_TAB_ORDER));
+		item.setText(BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.serachpath.tab.order")); //$NON-NLS-1$
 		item.setImage(cpoImage);
 		item.setData(ordpage);
 		item.setControl(ordpage.getControl(folder));
@@ -445,7 +445,7 @@ public class BeaninfoPathsBlock {
 
 			if (entryMissing) {
 				fSearchStatus.setWarning(
-					BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_MISSING));
+					BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.warning.EntryMissing")); //$NON-NLS-1$
 			}
 		} finally {
 			inUpdate = false;
@@ -467,7 +467,7 @@ public class BeaninfoPathsBlock {
 					monitor = new NullProgressMonitor();
 				}
 				monitor.beginTask(
-					BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_OPDESC),
+					BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.searchpath.operationdescription"), //$NON-NLS-1$
 					10);
 				try {
 					setBeaninfoSearchpath(wantNature, searchPathEntries, monitor);
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosPropertyPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosPropertyPage.java
index ccb36f466..5f2dd8a47 100644
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosPropertyPage.java
+++ b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosPropertyPage.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.beaninfo.ui;
 /*
  *  $RCSfile: BeaninfosPropertyPage.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/18 21:52:31 $ 
+ *  $Revision: 1.7 $  $Date: 2005/06/21 19:08:31 $ 
  */
 
 import java.lang.reflect.InvocationTargetException;
@@ -95,7 +95,7 @@ public class BeaninfosPropertyPage extends PropertyPage implements IStatusChange
 	 */	
 	private Control createWithoutJava(Composite parent) {
 		Label label= new Label(parent, SWT.LEFT);
-		label.setText(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPP_NOJAVAPROJECT)); 
+		label.setText(BeanInfoUIMessages.getString("BeaninfoPropertiesPage_INFO_.nojavaproject")); //$NON-NLS-1$ 
 		
 		fBuildPathsBlock= null;
 		setValid(true);
@@ -107,7 +107,7 @@ public class BeaninfosPropertyPage extends PropertyPage implements IStatusChange
 	 */		
 	private Control createForClosedProject(Composite parent) {
 		Label label= new Label(parent, SWT.LEFT);
-		label.setText(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPP_CLOSEDPROJECT));
+		label.setText(BeanInfoUIMessages.getString("BeaninfoPropertiesPage_INFO_.closedproject")); //$NON-NLS-1$
 		
 		fBuildPathsBlock= null;
 		setValid(true);
@@ -146,8 +146,8 @@ public class BeaninfosPropertyPage extends PropertyPage implements IStatusChange
 			try {
 				PlatformUI.getWorkbench().getProgressService().run(false, false, op);
 			} catch (InvocationTargetException e) {
-				String title= BeanInfoUIMessages.getString(BeanInfoUIMessages.BUI_ERRORTITLE);
-				String message= BeanInfoUIMessages.getString(BeanInfoUIMessages.BUI_ERROR); 
+				String title= BeanInfoUIMessages.getString("Beaninfo_UI_.errortitle"); //$NON-NLS-1$
+				String message= BeanInfoUIMessages.getString("Beaninfo_UI_.error"); //$NON-NLS-1$ 
 				ExceptionHandler.handle(e, shell, title, message);
 				return false;
 			} catch (InterruptedException e) {
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackagesWorkbookPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackagesWorkbookPage.java
index ad97bdaa5..d8f08b656 100644
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackagesWorkbookPage.java
+++ b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackagesWorkbookPage.java
@@ -11,7 +11,7 @@
 package org.eclipse.jem.internal.beaninfo.ui;
 /*
  *  $RCSfile: PackagesWorkbookPage.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 23:02:54 $ 
+ *  $Revision: 1.6 $  $Date: 2005/06/21 19:08:31 $ 
  */
 
 import java.util.*;
@@ -303,10 +303,10 @@ public class PackagesWorkbookPage extends BuildSearchBasePage {
 		ILabelProvider labelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
 		ElementTreeSelectionDialog dialog =
 			new ElementTreeSelectionDialog(getShell(), labelProvider, provider);
-		dialog.setTitle(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_ADDSEARCHPATH_TITLE));
+		dialog.setTitle(BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.addsearchpath.title"));
 
 		dialog.setValidator(validator);
-		dialog.setMessage(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_ADDSEARCHPATH_DESC));
+		dialog.setMessage(BeanInfoUIMessages.getString("BeaninfoPathsBlock_UI_.addsearchpath.description"));
 		dialog.addFilter(filter);
 		dialog.setInput(fCurrJProject);
 
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java
index 87c317a95..8debe1f24 100644
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java
@@ -1,43 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-/*
- *  $RCSfile: InstantiationImplMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
 package org.eclipse.jem.internal.instantiation.impl;
 
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import org.eclipse.osgi.util.NLS;
 
-/**
- * @author sri
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class InstantiationImplMessages {
+public final class InstantiationImplMessages extends NLS {
 
 	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.instantiation.impl.messages";//$NON-NLS-1$
 
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
 	private InstantiationImplMessages() {
+		// Do not instantiate
 	}
 
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
+	public static String NaiveExpressionFlattener_InvalidExpression;
+
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, InstantiationImplMessages.class);
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java
index 42415e29e..81827048b 100644
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: NaiveExpressionFlattener.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:36:09 $ 
+ *  $Revision: 1.8 $  $Date: 2005/06/21 19:12:44 $ 
  */
 package org.eclipse.jem.internal.instantiation.impl;
 
@@ -216,7 +216,7 @@ public class NaiveExpressionFlattener extends ParseVisitor {
 	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInvalidExpression)
 	 */
 	public boolean visit(PTInvalidExpression node) {
-		buffer.append(MessageFormat.format(InstantiationImplMessages.getString("NaiveExpressionFlattener.InvalidExpression"), new Object[]{node.getMessage()})); //$NON-NLS-1$
+		buffer.append(MessageFormat.format(InstantiationImplMessages.NaiveExpressionFlattener_InvalidExpression, new Object[]{node.getMessage()})); 
 		return false;
 	}
 
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties
index 945a6a545..4300c41bd 100644
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties
@@ -4,8 +4,8 @@
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-# 
+#
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-NaiveExpressionFlattener.InvalidExpression= invalid: "{0}"
+NaiveExpressionFlattener_InvalidExpression= invalid: "{0}"