From 6ff7af7dc68171ccb1ed54578bb313f4f2417ab3 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Mon, 4 Aug 2014 12:40:50 -0700
Subject: [PATCH] Cleanup of Messages.properties and Messages.java files
 continued.

Change-Id: Ia8dd64344b368c00d72006a9abdea7cc2019d637
---
 .../.settings/.api_filters                    |  4 +--
 .../TemplateEngineMessages.java               | 27 +++++++++++++++++++
 .../core/templateengine/process/Messages.java |  9 ++++++-
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngineMessages.java

diff --git a/core/org.eclipse.cdt.core/.settings/.api_filters b/core/org.eclipse.cdt.core/.settings/.api_filters
index ac2945a73c7..88e5451babc 100644
--- a/core/org.eclipse.cdt.core/.settings/.api_filters
+++ b/core/org.eclipse.cdt.core/.settings/.api_filters
@@ -9,10 +9,10 @@
         </filter>
     </resource>
     <resource path="templateengine/org/eclipse/cdt/core/templateengine/TemplateEngineMessages.java" type="org.eclipse.cdt.core.templateengine.TemplateEngineMessages">
-        <filter id="305365105">
+        <filter id="338944126">
             <message_arguments>
                 <message_argument value="org.eclipse.cdt.core.templateengine.TemplateEngineMessages"/>
-                <message_argument value="org.eclipse.cdt.core_5.8.0"/>
+                <message_argument value="getString(String)"/>
             </message_arguments>
         </filter>
     </resource>
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/TemplateEngineMessages.java
new file mode 100644
index 00000000000..0a81b7e02ca
--- /dev/null
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateEngineMessages.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * 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;
+
+/**
+ * @noreference This class is not intended to be referenced by clients.
+ * @deprecated Provide your own messages.
+ */
+@Deprecated
+public class TemplateEngineMessages {
+	private TemplateEngineMessages() {
+	}
+
+	public static String ProcessRunner_missingArg;
+
+	public static String getString(String key) {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Messages.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Messages.java
index c77c46e9b1e..fa3498f3199 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Messages.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Messages.java
@@ -13,12 +13,19 @@ package org.eclipse.cdt.core.templateengine.process;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-class Messages {
+import org.eclipse.osgi.util.NLS;
+
+class Messages extends NLS {
 	private static final ResourceBundle RESOURCE_BUNDLE =
 			ResourceBundle.getBundle(Messages.class.getName());
 
 	public static String ProcessRunner_missingArg;
 
+	static {
+		// Initialize resource bundle.
+		NLS.initializeMessages(Messages.class.getName(), Messages.class);
+	}
+
 	private Messages() {
 	}