NLS Translations
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 b1eef82..d72bace 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 @@
  *******************************************************************************/
 /*
  *  $RCSfile: BeaninfoClassAdapter.java,v $
- *  $Revision: 1.12 $  $Date: 2004/05/24 23:23:31 $ 
+ *  $Revision: 1.13 $  $Date: 2004/06/02 19:42:39 $ 
  */
 
 import java.io.FileNotFoundException;
@@ -401,7 +401,7 @@
 						0,
 						MessageFormat.format(
 							BeanInfoAdapterMessages.getString(BeanInfoAdapterMessages.INTROSPECTFAILED),
-							new Object[] { getJavaClass().getJavaName(), ""}),
+							new Object[] { getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
 						e));
 			}
 		}
@@ -458,7 +458,7 @@
 											0,
 											MessageFormat.format(
 												BeanInfoAdapterMessages.getString(BeanInfoAdapterMessages.INTROSPECTFAILED),
-												new Object[] { getJavaClass().getJavaName(), ""}),
+												new Object[] { getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
 											e));
 								}
 							} else {
@@ -482,7 +482,7 @@
 									0,
 									MessageFormat.format(
 										BeanInfoAdapterMessages.getString(BeanInfoAdapterMessages.INTROSPECTFAILED),
-										new Object[] { getJavaClass().getJavaName(), "Class not found"}),
+										new Object[] { getJavaClass().getJavaName(), BeanInfoAdapterMessages.getString("BeaninfoClassAdapter.ClassNotFound")}), //$NON-NLS-1$
 									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 18eca32..ba520eb 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 @@
  *******************************************************************************/
 /*
  *  $RCSfile: BeaninfoNature.java,v $
- *  $Revision: 1.16 $  $Date: 2004/05/24 23:23:31 $ 
+ *  $Revision: 1.17 $  $Date: 2004/06/02 19:42:39 $ 
  */
 
 import java.io.*;
@@ -57,8 +57,8 @@
 	public static final String NATURE_ID = BeaninfoPlugin.PI_BEANINFO_PLUGINID + ".BeanInfoNature"; //$NON-NLS-1$
 	public static final String P_BEANINFO_SEARCH_PATH = ".beaninfoConfig"; //$NON-NLS-1$
 	
-	public static final QualifiedName CONFIG_INFO_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "CONFIG_INFO");
-	public static final QualifiedName BEANINFO_CONTRIBUTORS_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "BEANINFO_CONTRIBUTORS");
+	public static final QualifiedName CONFIG_INFO_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "CONFIG_INFO"); //$NON-NLS-1$
+	public static final QualifiedName BEANINFO_CONTRIBUTORS_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "BEANINFO_CONTRIBUTORS"); //$NON-NLS-1$
 
 	private ResourceTracker resourceTracker;
 	// This class listens for changes to the beaninfo paths file, and if changed it marks all stale
@@ -139,7 +139,7 @@
 					0,
 					MessageFormat.format(
 						BeanInfoAdapterMessages.getString(BeanInfoAdapterMessages.INTROSPECTFAILED),
-						new Object[] { project.getName(), "Invalid project"}),
+						new Object[] { project.getName(), BeanInfoAdapterMessages.getString("BeaninfoNature.InvalidProject")}), //$NON-NLS-1$
 					null));
 
 		addNatureToProject(project, NATURE_ID);
@@ -626,7 +626,7 @@
 				computedSearchPath = new ArrayList(3);	// We will be gathering this info.
 		}
 		
-		private static final String PI_CLASS = "class";
+		private static final String PI_CLASS = "class"; //$NON-NLS-1$
 		
 		/* (non-Javadoc)
 		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
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 38b95b6..a5509a7 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.2 $  $Date: 2004/05/24 23:23:31 $ 
+ *  $Revision: 1.3 $  $Date: 2004/06/02 19:42:39 $ 
  */
 package org.eclipse.jem.internal.beaninfo.adapters;
 
@@ -33,7 +33,7 @@
 					try {
 						// There is a UI, it may not be active, but bring in UICreateRegistryJobHandler to do the
 						// actual work since it can reference the UI.
-						jobHandler = (CreateRegistryJobHandler) Class.forName("org.eclipse.jem.internal.beaninfo.adapters.UICreateRegistryJobHandler").newInstance();
+						jobHandler = (CreateRegistryJobHandler) Class.forName("org.eclipse.jem.internal.beaninfo.adapters.UICreateRegistryJobHandler").newInstance(); //$NON-NLS-1$
 					} catch (InstantiationException e) {
 						jobHandler = new CreateRegistryJobHandler();
 					} catch (IllegalAccessException e) {
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
index 1d7a7aa..ef99d63 100644
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
+++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: UICreateRegistryJobHandler.java,v $
- *  $Revision: 1.1 $  $Date: 2004/04/20 21:15:27 $ 
+ *  $Revision: 1.2 $  $Date: 2004/06/02 19:42:39 $ 
  */
 package org.eclipse.jem.internal.beaninfo.adapters;
 
@@ -46,7 +46,7 @@
 			else {
 				// We are not in the UI thread, so farm it off to a job to syncit.
 				// Use it as a job so that if it takes long enough, the progress view will be shown.
-				Job createJob = new Job("Start Beaninfo registry") {
+				Job createJob = new Job(BeanInfoAdapterMessages.getString("UICreateRegistryJobHandler.StartBeaninfoRegistry")) { //$NON-NLS-1$
 					protected IStatus run(final IProgressMonitor monitor) {
 						display.syncExec(new Runnable() {
 							public void run() {
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 37c772f..cbb834a 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,7 +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.1 $  $Date: 2004/05/24 23:23:31 $
+# $Revision: 1.2 $  $Date: 2004/06/02 19:42:39 $
 #
 
 INTROSPECT_FAILED_EXC_ = Introspection failed on class "{0}." msg="{1}."
+BeaninfoClassAdapter.ClassNotFound=Class not found
+BeaninfoNature.InvalidProject=Invalid project
+UICreateRegistryJobHandler.StartBeaninfoRegistry=Start Beaninfo registry
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/InstantiationBaseMessages.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/InstantiationBaseMessages.java
new file mode 100644
index 0000000..2558069
--- /dev/null
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/InstantiationBaseMessages.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+/*
+ *  $RCSfile: InstantiationBaseMessages.java,v $
+ *  $Revision: 1.1 $  $Date: 2004/06/02 19:41:38 $ 
+ */
+package org.eclipse.jem.internal.instantiation.base;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * @author sri
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class InstantiationBaseMessages {
+
+	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.instantiation.base.messages";//$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private InstantiationBaseMessages() {
+	}
+
+	public static String getString(String key) {
+		// TODO Auto-generated method stub
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
\ No newline at end of file
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 32a42da..3b6973e 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.1 $  $Date: 2004/03/07 18:34:16 $ 
+ *  $Revision: 1.2 $  $Date: 2004/06/02 19:41:38 $ 
  */
 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("Currently \"this\" is not supported");
+		throw new IllegalArgumentException(InstantiationBaseMessages.getString("ParseTreeAllocationInstantiationVisitor.CurrentlyThisNotSupported")); //$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
new file mode 100644
index 0000000..2a7855e
--- /dev/null
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties
@@ -0,0 +1 @@
+ParseTreeAllocationInstantiationVisitor.CurrentlyThisNotSupported=Currently "this" is not supported
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
new file mode 100644
index 0000000..05ee5f3
--- /dev/null
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+/*
+ *  $RCSfile: InstantiationImplMessages.java,v $
+ *  $Revision: 1.1 $  $Date: 2004/06/02 19:41:38 $ 
+ */
+package org.eclipse.jem.internal.instantiation.impl;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * @author sri
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class InstantiationImplMessages {
+
+	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() {
+	}
+
+	public static String getString(String key) {
+		// TODO Auto-generated method stub
+		try {
+			return RESOURCE_BUNDLE.getString(key);
+		} catch (MissingResourceException e) {
+			return '!' + key + '!';
+		}
+	}
+}
\ 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 5f558ba..bd23f23 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,10 +10,11 @@
  *******************************************************************************/
 /*
  *  $RCSfile: NaiveExpressionFlattener.java,v $
- *  $Revision: 1.5 $  $Date: 2004/05/20 13:01:21 $ 
+ *  $Revision: 1.6 $  $Date: 2004/06/02 19:41:38 $ 
  */
 package org.eclipse.jem.internal.instantiation.impl;
 
+import java.text.MessageFormat;
 import java.util.List;
 
 import org.eclipse.jem.internal.instantiation.*;
@@ -74,7 +75,7 @@
 	 */
 	public boolean visit(PTArrayCreation node) {
 		String type = handleQualifiedName(node.getType());
-		buffer.append("new ");
+		buffer.append("new "); //$NON-NLS-1$
 		int ob = type.indexOf('[');
 		buffer.append(type.substring(0, ob));
 		int realdims = 0;
@@ -89,7 +90,7 @@
 			buffer.append(']');
 		}
 		for (int i=dims.size(); i < realdims; i++) {
-			buffer.append("[]");
+			buffer.append("[]"); //$NON-NLS-1$
 		}
 		
 		if (node.getInitializer() != null) {
@@ -108,7 +109,7 @@
 		List exp = node.getExpressions();
 		for (int i = 0; i < exp.size(); i++) {
 			if (i != 0)
-				buffer.append(", ");
+				buffer.append(", "); //$NON-NLS-1$
 			((PTExpression) exp.get(i)).accept(this);
 		}
 		buffer.append('}');
@@ -119,7 +120,7 @@
 	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTBooleanLiteral)
 	 */
 	public boolean visit(PTBooleanLiteral node) {
-		buffer.append(node.isBooleanValue() ? "true" : "false");
+		buffer.append(node.isBooleanValue() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
 		return false;
 	}
 
@@ -129,7 +130,7 @@
 	public boolean visit(PTCastExpression node) {
 		buffer.append('(');
 		buffer.append(handleQualifiedName(node.getType()));
-		buffer.append(") ");
+		buffer.append(") "); //$NON-NLS-1$
 		node.getExpression().accept(this);
 		return false;
 	}
@@ -146,13 +147,13 @@
 	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTClassInstanceCreation)
 	 */
 	public boolean visit(PTClassInstanceCreation node) {
-		buffer.append("new ");
+		buffer.append("new "); //$NON-NLS-1$
 		buffer.append(handleQualifiedName(node.getType()));
 		buffer.append('(');
 		List args = node.getArguments();
 		for (int i = 0; i < args.size(); i++) {
 			if (i != 0)
-				buffer.append(", ");
+				buffer.append(", "); //$NON-NLS-1$
 			((PTExpression) args.get(i)).accept(this);
 		}
 		buffer.append(')');
@@ -164,9 +165,9 @@
 	 */
 	public boolean visit(PTConditionalExpression node) {
 		node.getCondition().accept(this);
-		buffer.append(" ? ");
+		buffer.append(" ? "); //$NON-NLS-1$
 		node.getTrue().accept(this);
-		buffer.append(" : ");
+		buffer.append(" : "); //$NON-NLS-1$
 		node.getFalse().accept(this);
 		return false;
 	}
@@ -206,7 +207,7 @@
 	 */
 	public boolean visit(PTInstanceof node) {
 		node.getOperand().accept(this);
-		buffer.append(" instanceof ");
+		buffer.append(" instanceof "); //$NON-NLS-1$
 		buffer.append(handleQualifiedName(node.getType()));
 		return false;
 	}
@@ -215,9 +216,7 @@
 	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInvalidExpression)
 	 */
 	public boolean visit(PTInvalidExpression node) {
-		buffer.append(" invalid: \"");
-		buffer.append(node.getMessage());
-		buffer.append("\"");
+		buffer.append(MessageFormat.format(InstantiationImplMessages.getString("NaiveExpressionFlattener.InvalidExpression"), new Object[]{node.getMessage()})); //$NON-NLS-1$
 		return false;
 	}
 
@@ -235,7 +234,7 @@
 		List args = node.getArguments();
 		for (int i = 0; i < args.size(); i++) {
 			if (i != 0)
-				buffer.append(", ");
+				buffer.append(", "); //$NON-NLS-1$
 			((PTExpression) args.get(i)).accept(this);
 		}
 		buffer.append(')');
@@ -254,7 +253,7 @@
 	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTNullLiteral)
 	 */
 	public boolean visit(PTNullLiteral node) {
-		buffer.append("null");
+		buffer.append("null"); //$NON-NLS-1$
 		return false;
 	}
 
@@ -297,7 +296,7 @@
 	 * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTThisLiteral)
 	 */
 	public boolean visit(PTThisLiteral node) {
-		buffer.append("this");
+		buffer.append("this"); //$NON-NLS-1$
 		return false;
 	}
 
@@ -306,7 +305,7 @@
 	 */
 	public boolean visit(PTTypeLiteral node) {
 		buffer.append(handleQualifiedName(node.getType()));
-		buffer.append(".class");
+		buffer.append(".class"); //$NON-NLS-1$
 		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
new file mode 100644
index 0000000..3b1bd0f
--- /dev/null
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties
@@ -0,0 +1 @@
+NaiveExpressionFlattener.InvalidExpression= invalid: "{0}"
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java
index b895cb1..1355167 100644
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java
+++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 /*
  *  $RCSfile: InheritanceCycleException.java,v $
- *  $Revision: 1.1 $  $Date: 2004/01/13 16:16:21 $ 
+ *  $Revision: 1.2 $  $Date: 2004/06/02 19:41:38 $ 
  */
 import java.text.MessageFormat;
 
@@ -24,7 +24,7 @@
  * Window>Preferences>Java>Code Generation>Code and Comments
  */
 public class InheritanceCycleException extends Exception {
-	private static String MSG_PATTERN = ResourceHandler.getString("Java_Inh_Cycle_ERROR_");
+	private static String MSG_PATTERN = ResourceHandler.getString("Java_Inh_Cycle_ERROR_");//$NON-NLS-1$
 
 	/**
 	 *