[93111] Convert to NLS message class.

3 files changed, 53 insertions, 3 deletions

diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties
new file mode 100644
index 000000000..429c18eaa
--- /dev/null
+++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2001, 2004 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
+###############################################################################
+
+#
+# Common Messages
+#
+MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occured.
+
+TITLE_WARNING=Warning:
+TITLE_ERROR=Error:
+TITLE_INFO=Info:
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCoreMessages.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCoreMessages.java
new file mode 100644
index 000000000..94581af68
--- /dev/null
+++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCoreMessages.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+package org.eclipse.wst.command.internal.env.core;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class EnvironmentCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.wst.command.internal.env.core.EnvironmentCore";//$NON-NLS-1$
+
+	private EnvironmentCoreMessages() {
+		// Do not instantiate
+	}
+
+	public static String MSG_ERROR_UNEXPECTED_ERROR;
+	public static String TITLE_WARNING;
+	public static String TITLE_ERROR;
+	public static String TITLE_INFO;
+
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, EnvironmentCoreMessages.class);
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
index d4fce3d4b..13c0fd566 100644
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
+++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
@@ -11,13 +11,14 @@
 package org.eclipse.wst.command.internal.env.core.fragment;
 
 import java.util.Stack;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.wst.command.internal.env.core.CommandFactory;
 import org.eclipse.wst.command.internal.env.core.CommandManager;
-import org.eclipse.wst.command.internal.env.core.common.MessageUtils;
+import org.eclipse.wst.command.internal.env.core.EnvironmentCoreMessages;
 import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
 import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
 import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
@@ -350,10 +351,9 @@ public class CommandFragmentEngine implements CommandManager
   	    }
   	    catch( Throwable exc )
   	    {
-  	      MessageUtils utils           = new MessageUtils( "org.eclipse.wst.command.env.core.environment", this );
   	      IStatus      unexpectedError = StatusUtils.errorStatus( exc );
           MultiStatus  parentStatus    = new MultiStatus( "id", 0, new IStatus[]{unexpectedError}, 
-                                                          utils.getMessage( "MSG_ERROR_UNEXPECTED_ERROR" ), null );
+                                                          EnvironmentCoreMessages.MSG_ERROR_UNEXPECTED_ERROR, null );
   	      environment_.getStatusHandler().reportError( parentStatus );
   	    }
   	    finally