Cleanup of Messages.properties and Messages.java files.

Change-Id: Iea47d46a3ea201722fbe666a03c89dde7e5e4961

12 files changed, 71 insertions, 52 deletions

diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/Messages.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/Messages.java
new file mode 100644
index 00000000000..24c31e6c203
--- /dev/null
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/Messages.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Symbian Software Limited 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:
+ *     Bala Torati (Symbian) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.templateengine;
+
+import org.eclipse.osgi.util.NLS;
+
+class Messages extends NLS {
+	public static String TemplateCore_init_failed;
+
+	static {
+		// Initialize resource bundle.
+		NLS.initializeMessages(Messages.class.getName(), Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/Messages.properties b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/Messages.properties
new file mode 100644
index 00000000000..86908a2e2d4
--- /dev/null
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/Messages.properties
@@ -0,0 +1,11 @@
+###############################################################################
+# Copyright (c) 2007 Symbian Software Limited 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:
+#     Bala Torati (Symbian) - Initial API and implementation
+###############################################################################
+TemplateCore_init_failed=Failed to initialize: {0}
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java
index 3f90c106e9a..eaee4c8a00a 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java
@@ -26,9 +26,7 @@ import org.eclipse.cdt.core.templateengine.process.TemplateProcessHandler;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-
-import com.ibm.icu.text.MessageFormat;
-
+import org.eclipse.osgi.util.NLS;
 
 /**
  * TemplateCore class is responsible providing the non-UI part of template and
@@ -44,7 +42,7 @@ public class TemplateCore {
 	private static final String ID = "id"; //$NON-NLS-1$
 	private static final String TYPE = "type"; //$NON-NLS-1$
 
-	private static Map<TemplateInfo, TemplateCore> templateCache = new HashMap<TemplateInfo, TemplateCore>();
+	private static Map<TemplateInfo, TemplateCore> templateCache = new HashMap<>();
 
 	public static final Comparator<TemplateCore> TEMPLATE_ID_CASE_INSENSITIVE_COMPARATOR = new Comparator<TemplateCore>() {
 		@Override
@@ -74,7 +72,7 @@ public class TemplateCore {
 		try {
 			descriptorURL= TemplateEngineHelper.getTemplateResourceURL(templateInfo.getPluginId(), templateInfo.getTemplatePath());
 		} catch(IOException ioe) {
-			String msg= MessageFormat.format(TemplateEngineMessages.getString("TemplateCore.InitFailed"), new Object[]{templateInfo.getTemplatePath()}); //$NON-NLS-1$
+			String msg= NLS.bind(Messages.TemplateCore_init_failed, templateInfo.getTemplatePath());
 			throw new TemplateInitializationException(msg);
 		}
 		if(descriptorURL==null)
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateDescriptor.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateDescriptor.java
index 10f658ebbbc..61451ea0137 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateDescriptor.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateDescriptor.java
@@ -6,13 +6,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * Bala Torati (Symbian) - Initial API and implementation
+ *     Bala Torati (Symbian) - Initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.core.templateengine;
 
 import java.io.IOException;
 import java.net.URL;
-import com.ibm.icu.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -21,11 +20,11 @@ import java.util.Map;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.eclipse.osgi.util.NLS;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
-
 /**
  * This class contains methods to get first process block element, next process block 
  * element and checks for next process block element.
@@ -50,7 +49,7 @@ public class TemplateDescriptor {
 	 * @throws TemplateInitializationException
 	 */
 	public TemplateDescriptor(URL descriptorURL, String pluginId) throws TemplateInitializationException {
-		String msg= MessageFormat.format(TemplateEngineMessages.getString("TemplateCore.InitFailed"), new Object[]{descriptorURL}); //$NON-NLS-1$
+		String msg= NLS.bind(Messages.TemplateCore_init_failed, descriptorURL.toString());
 		try {
 			this.document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(descriptorURL.openStream());
 		} catch(ParserConfigurationException pce) {
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java
index a05e8f8dad8..6b934b81c6b 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java
@@ -22,7 +22,6 @@ import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.templateengine.TemplateCore;
 import org.eclipse.cdt.core.templateengine.TemplateDescriptor;
 import org.eclipse.cdt.core.templateengine.TemplateEngine;
-import org.eclipse.cdt.core.templateengine.TemplateEngineMessages;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -211,7 +210,7 @@ public class ConditionalProcessGroup {
 		}
 		if (!isConditionValueTrue()) {
 			List<IStatus> statuses = new ArrayList<IStatus>(1);
-			statuses.add(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, IStatus.INFO, TemplateEngineMessages.getString("ConditionalProcessGroup.notExecuting") + id, null)); //$NON-NLS-1$
+			statuses.add(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, IStatus.INFO, Messages.getString("ConditionalProcessGroup.notExecuting") + id, null)); //$NON-NLS-1$
 			return statuses;
 		}
 		List<IStatus> statuses = new ArrayList<IStatus>(processes.size());
@@ -234,7 +233,7 @@ public class ConditionalProcessGroup {
 			Map<String, String> valueStore = template.getValueStore();
 			for(String value : macros) {			
 				if (valueStore.get(value) == null) {
-					return TemplateEngineMessages.getString("ConditionalProcessGroup.unexpandableMacro") + value; //$NON-NLS-1$
+					return Messages.getString("ConditionalProcessGroup.unexpandableMacro") + value; //$NON-NLS-1$
 				}
 			}
 		}
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngineMessages.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Messages.java
index 4f790d97909..c77c46e9b1e 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngineMessages.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Messages.java
@@ -6,25 +6,20 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * Bala Torati (Symbian) - Initial API and implementation
+ *     Bala Torati (Symbian) - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.core.templateengine;
+package org.eclipse.cdt.core.templateengine.process;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-public class TemplateEngineMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.core.templateengine.messages"; //$NON-NLS-1$
+class Messages {
+	private static final ResourceBundle RESOURCE_BUNDLE =
+			ResourceBundle.getBundle(Messages.class.getName());
 
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	/**
-	 * @since 5.6
-	 */
 	public static String ProcessRunner_missingArg;
 
-	private TemplateEngineMessages() {
+	private Messages() {
 	}
 
 	public static String getString(String key) {
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/messages.properties b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Messages.properties
index 43bd4b7692d..b75a191cb90 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/messages.properties
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Messages.properties
@@ -6,11 +6,9 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-# Bala Torati (Symbian) - Initial API and implementation
+#     Bala Torati (Symbian) - Initial API and implementation
 ###############################################################################
-
 TemplateEngine.internalError=Internal Error: 
-TemplateCore.InitFailed=Failed to initialize: {0}
 TemplateEngine.templateEngine=Template Engine
 ProjectCreatedActions.InsufficientInformation=Insufficient information to create new project
 
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Process.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Process.java
index 156b8e5da5a..c0190dd6bcb 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Process.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Process.java
@@ -19,7 +19,6 @@ import java.util.Set;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.templateengine.TemplateCore;
 import org.eclipse.cdt.core.templateengine.TemplateEngine;
-import org.eclipse.cdt.core.templateengine.TemplateEngineMessages;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -119,8 +118,8 @@ public class Process {
 			for (int i= 0; i < args.length; i++) {
 				ProcessArgument arg = args[i];
 				if ((macro = arg.getFirstNonExpandableMacro()) != null) {
-					return TemplateEngineMessages.getString("Process.argument") + arg.getName() + //$NON-NLS-1$
-							TemplateEngineMessages.getString("Process.expandableMacro") + macro; //$NON-NLS-1$
+					return Messages.getString("Process.argument") + arg.getName() + //$NON-NLS-1$
+							Messages.getString("Process.expandableMacro") + macro; //$NON-NLS-1$
 				}
 			}
 		}
@@ -136,11 +135,11 @@ public class Process {
 	private String getProcessMessage(int code, String msg) {
 		switch (code) {
 		case IStatus.ERROR:
-			return id + TemplateEngineMessages.getString("Process.error") + msg; //$NON-NLS-1$
+			return id + Messages.getString("Process.error") + msg; //$NON-NLS-1$
 		case IStatus.OK:
-			return id + TemplateEngineMessages.getString("Process.success") + msg; //$NON-NLS-1$
+			return id + Messages.getString("Process.success") + msg; //$NON-NLS-1$
 		default:
-			return id + TemplateEngineMessages.getString("Process.info") + msg; //$NON-NLS-1$
+			return id + Messages.getString("Process.info") + msg; //$NON-NLS-1$
 		}
 	}
 
@@ -152,7 +151,7 @@ public class Process {
 	 */
 	public IStatus process(IProgressMonitor monitor) throws ProcessFailureException {
 		if (processRunner == null) {
-			throw new ProcessFailureException(TemplateEngineMessages.getString("Process.unknownProcess") + processType); //$NON-NLS-1$
+			throw new ProcessFailureException(Messages.getString("Process.unknownProcess") + processType); //$NON-NLS-1$
 		}
 		if (!processRunner.areArgumentsMatchingRequiredParameters(args)) {
 			throw new ProcessFailureException(processRunner.getArgumentsMismatchMessage(args));
@@ -162,7 +161,7 @@ public class Process {
 		}
 		resolve();
 		processRunner.process(template, args, id, monitor);
-		return new Status(IStatus.INFO, CCorePlugin.PLUGIN_ID, IStatus.OK, getProcessMessage(IStatus.OK, TemplateEngineMessages.getString("Process.executedSuccessfully") + Arrays.asList(args)), null); //$NON-NLS-1$
+		return new Status(IStatus.INFO, CCorePlugin.PLUGIN_ID, IStatus.OK, getProcessMessage(IStatus.OK, Messages.getString("Process.executedSuccessfully") + Arrays.asList(args)), null); //$NON-NLS-1$
 	}
 
 	private void resolve() {
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessHelper.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessHelper.java
index 44c779f40ee..c82a573576c 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessHelper.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessHelper.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.cdt.core.templateengine.TemplateEngineMessages;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -54,7 +53,7 @@ public class ProcessHelper {
 		RandomAccessFile raf = null;
 		if (!toFile.exists()) {
 			throw new FileNotFoundException(MessageFormat.format(
-					TemplateEngineMessages.getString("ProcessHelper.fileNotFound"), //$NON-NLS-1$
+					Messages.getString("ProcessHelper.fileNotFound"), //$NON-NLS-1$
 					toFile.getPath()));
 		} else {
 			try {
@@ -121,7 +120,7 @@ public class ProcessHelper {
 		StringBuilder buffer = new StringBuilder();
 		if (!new java.io.File(source.getFile()).exists()) {
 			throw new FileNotFoundException(MessageFormat.format(
-					TemplateEngineMessages.getString("ProcessHelper.fileNotFound"), //$NON-NLS-1$
+					Messages.getString("ProcessHelper.fileNotFound"), //$NON-NLS-1$
 					source.getFile()));
 		} else {
 			contentsReader = new InputStreamReader(source.openStream());
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java
index b2742a9bf43..6045968f8b7 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java
@@ -11,7 +11,6 @@
 package org.eclipse.cdt.core.templateengine.process;
 
 import org.eclipse.cdt.core.templateengine.TemplateCore;
-import org.eclipse.cdt.core.templateengine.TemplateEngineMessages;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
@@ -21,7 +20,6 @@ import com.ibm.icu.text.MessageFormat;
  * Abstract ProcessRunner class provides the methods to implement for processes.
  */
 public abstract class ProcessRunner {
-
 	private ProcessParameter[] params = new ProcessParameter[0];
 
 	void setProcessParameters(ProcessParameter[] params) {
@@ -39,7 +37,7 @@ public abstract class ProcessRunner {
 	 * @since 5.6
 	 */
 	protected ProcessFailureException missingArgException(String processId, String varname) {
-		String msg = MessageFormat.format(TemplateEngineMessages.ProcessRunner_missingArg, varname);
+		String msg = MessageFormat.format(Messages.ProcessRunner_missingArg, varname);
 		return new ProcessFailureException(getProcessMessage(processId, IStatus.ERROR, msg));
 	}
 
@@ -70,22 +68,22 @@ public abstract class ProcessRunner {
 	 */
 	public String getArgumentsMismatchMessage(ProcessArgument[] args) {
 		if (params == null && args != null) {
-			return TemplateEngineMessages.getString("ProcessRunner.unexpectedArguments"); //$NON-NLS-1$
+			return Messages.getString("ProcessRunner.unexpectedArguments"); //$NON-NLS-1$
 		}
 		if (params != null && args == null) {
-			return TemplateEngineMessages.getString("ProcessRunner.missingArguments"); //$NON-NLS-1$
+			return Messages.getString("ProcessRunner.missingArguments"); //$NON-NLS-1$
 		}
 		if (params == null && args == null) {
 			return null;
 		}
 		if (params.length != args.length) {
-			return TemplateEngineMessages.getString("ProcessRunner.missingArguments"); //$NON-NLS-1$
+			return Messages.getString("ProcessRunner.missingArguments"); //$NON-NLS-1$
 		}
 		for (int i = 0; i < params.length; i++) {
 			ProcessParameter param = params[i];
 			ProcessArgument arg = args[i];
 			if (!arg.isOfParameterType(param)) {
-				return TemplateEngineMessages.getString("ProcessRunner.argumentsMismatch") + arg.getName(); //$NON-NLS-1$
+				return Messages.getString("ProcessRunner.argumentsMismatch") + arg.getName(); //$NON-NLS-1$
 			}
 		}
 		return null;
@@ -97,11 +95,11 @@ public abstract class ProcessRunner {
 	protected final String getProcessMessage(String processId, int code, String msg) {
 		switch (code) {
 			case IStatus.ERROR:
-				return processId + TemplateEngineMessages.getString("ProcessRunner.error") + msg; //$NON-NLS-1$
+				return processId + Messages.getString("ProcessRunner.error") + msg; //$NON-NLS-1$
 			case IStatus.OK:
-				return processId + TemplateEngineMessages.getString("ProcessRunner.success") + msg; //$NON-NLS-1$
+				return processId + Messages.getString("ProcessRunner.success") + msg; //$NON-NLS-1$
 			default:
-				return processId + TemplateEngineMessages.getString("ProcessRunner.info") + msg; //$NON-NLS-1$
+				return processId + Messages.getString("ProcessRunner.info") + msg; //$NON-NLS-1$
 		}
 	}
 
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/Messages.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/Messages.java
index 863aaef9f1b..6c54bab818b 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/Messages.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/Messages.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * Bala Torati (Symbian) - Initial API and implementation
+ *     Bala Torati (Symbian) - Initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.core.templateengine.process.processes;
 
@@ -14,10 +14,8 @@ import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.core.templateengine.process.processes.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
+	private static final ResourceBundle RESOURCE_BUNDLE =
+			ResourceBundle.getBundle(Messages.class.getName());
 
 	private Messages() {
 	}
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/messages.properties b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/Messages.properties
index ad8ca201f2d..ad8ca201f2d 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/messages.properties
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/Messages.properties