- Added missing NON-NLS tags

5 files changed, 36 insertions, 27 deletions

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
index 34ebf025224..ff479ae30f3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 - 2012 CEA LIST.
+ * Copyright (c) 2006 - 2013 CEA LIST.
  * 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
@@ -18,21 +18,22 @@ package org.eclipse.papyrus.cpp.codegen;
  */
 public class Constants {
 
-	public static final String includeHFile = "// include associated header file";
+	public static final String includeHFile = "// include associated header file"; //$NON-NLS-1$
 
-	public static final String cppIncPreBodyStart = "// Include from CppInclude stereotype (pre-body)";
+	public static final String cppIncPreBodyStart = "// Include from CppInclude stereotype (pre-body)"; //$NON-NLS-1$
 
-	public static final String cppIncPreBodyEnd = "// End of CppInclude stereotype (pre-body)";
+	public static final String cppIncPreBodyEnd = "// End of CppInclude stereotype (pre-body)"; //$NON-NLS-1$
 
-	public static final String cppIncBodyStart = "// Include from CppInclude declaration (body)";
+	public static final String cppIncBodyStart = "// Include from CppInclude declaration (body)"; //$NON-NLS-1$
 
-	public static final String cppIncBodyEnd = "// End of CppInclude stereotype (body)";
+	public static final String cppIncBodyEnd = "// End of CppInclude stereotype (body)";//$NON-NLS-1$
 
-	public static final String derivedIncludes = "// Derived includes directives";
+	public static final String derivedIncludes = "// Derived includes directives";//$NON-NLS-1$
 
-	public static final String forwardDecl = "// forward declarations";
+	public static final String forwardDecl = "// forward declarations"; //$NON-NLS-1$
 
-	public static final String staticAttributes = "// static attributes (if any)";
+	public static final String staticAttributes = "// static attributes (if any)"; //$NON-NLS-1$
+
+	public static final String undefinedType = "undefined"; //$NON-NLS-1$
 
-	public static final String undefinedType = "undefined";
 }
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java
index 16e8aec7fed..e70c7807870 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 - 2012 CEA LIST.
+ * Copyright (c) 2006 - 2013 CEA LIST.
  * 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
@@ -13,17 +13,22 @@ package org.eclipse.papyrus.cpp.codegen;
 
 import org.eclipse.papyrus.acceleo.GenUtils;
 import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Namespace;
 
 public class StdStereo {
 
-	public final static String create = "Create";
+	public final static String create = "Create"; //$NON-NLS-1$
 
-	public final static String destroy = "Destroy";
+
+	public final static String destroy = "Destroy"; //$NON-NLS-1$
 
 	/**
 	 * In the UML 2.4 plugin, the Standard profile is split into an L2 and an L3 profile
 	 */
-	public final static String[] namespaces = { "Standard", "StandardProfileL2" };
+	public final static String[] namespaces = {
+		"Standard", //$NON-NLS-1$
+		"StandardProfileL2" //$NON-NLS-1$
+	};
 
 	/**
 	 * Check whether a stereotype of the standard profile is applied
@@ -37,7 +42,7 @@ public class StdStereo {
 	 */
 	public static boolean isApplied(Element element, String stdName) {
 		for(String namespace : namespaces) {
-			if(GenUtils.hasStereotype(element, namespace + "::" + stdName)) {
+			if(GenUtils.hasStereotype(element, namespace + Namespace.SEPARATOR + stdName)) {
 				return true;
 			}
 		}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
index 27adfd59abb..6da7ce34190 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
@@ -16,21 +16,21 @@ public class CppCodeGenConstants {
 	/**
 	 * Suffix for generated header files
 	 */
-	public static final String P_HEADER_SUFFIX = "headSuffix";
+	public static final String P_HEADER_SUFFIX = "headSuffix"; //$NON-NLS-1$
 
 	/**
 	 * Suffix for generated body/implementation files
 	 */
-	public static final String P_IMPLEM_SUFFIX = "implSuffix";
+	public static final String P_IMPLEM_SUFFIX = "implSuffix"; //$NON-NLS-1$
 
 	/**
 	 * Suffix for generated body/implementation files
 	 */
-	public static final String P_OUT_INOUT_OP = "outInoutOp";
+	public static final String P_OUT_INOUT_OP = "outInoutOp"; //$NON-NLS-1$
 
 	/**
 	 * User defined comment header in generated files
 	 */
-	public static final String P_COMMENT_HEADER = "commentHeader";
+	public static final String P_COMMENT_HEADER = "commentHeader"; //$NON-NLS-1$
 
 }
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
index 0de1976c2a8..86a582619b5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
@@ -25,13 +25,16 @@ public class CppCodeGenPreferenceInitializer extends AbstractPreferenceInitializ
 	 */
 	public void initializeDefaultPreferences() {
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		store.setDefault(CppCodeGenConstants.P_HEADER_SUFFIX, "h");
-		store.setDefault(CppCodeGenConstants.P_IMPLEM_SUFFIX, "cpp");
-		store.setDefault(CppCodeGenConstants.P_OUT_INOUT_OP, "*");
+		store.setDefault(CppCodeGenConstants.P_HEADER_SUFFIX, "h"); //$NON-NLS-1$
+		store.setDefault(CppCodeGenConstants.P_IMPLEM_SUFFIX, "cpp"); //$NON-NLS-1$
+		store.setDefault(CppCodeGenConstants.P_OUT_INOUT_OP, "*"); //$NON-NLS-1$
 
 		// Default value for P_COMMENT_HEADER
-		String NL = System.getProperties().getProperty("line.separator");
-		String defaultValue = "" + "// --------------------------------------------------------" + NL + "// Code generated by Papyrus C++" + NL + "// --------------------------------------------------------" + NL + NL;
+		String NL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
+		String defaultValue =
+				"// --------------------------------------------------------" + NL + //$NON-NLS-1$
+				"// Code generated by Papyrus C++" + NL + //$NON-NLS-1$ 
+				"// --------------------------------------------------------" + NL + NL; //$NON-NLS-1$
 		store.setDefault(CppCodeGenConstants.P_COMMENT_HEADER, defaultValue);
 	}
 }
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
index 1e8e83c440e..42d87d5fd4d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
@@ -298,7 +298,7 @@ public class CppGenUtils {
 
 	private static boolean visibilityStale = false;
 	private static VisibilityKind currVisibility = null;
-	private static final Pattern EmptySectionRegex = Pattern.compile("^\\s*$");
+	private static final Pattern EmptySectionRegex = Pattern.compile("^\\s*$"); //$NON-NLS-1$
 
 	/**
 	 * Update the current visibility to the specified value without writing this value to
@@ -322,7 +322,7 @@ public class CppGenUtils {
 		// Filter out empty sections.
 		Matcher m = EmptySectionRegex.matcher(content);
 		if (content.isEmpty() || m.matches()) {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 
 		// Don't write duplicate visibility modifiers.
@@ -331,6 +331,6 @@ public class CppGenUtils {
 		}
 
 		visibilityStale = false;
-		return currVisibility.toString() + ":\n" + content;
+		return currVisibility.toString() + ":\n" + content; //$NON-NLS-1$
 	}
 }