- Bug 422523 - Extra CPP header generated from class association element

- Externalized an error message (trivial)

3 files changed, 21 insertions, 3 deletions

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java
new file mode 100644
index 00000000000..3260b816524
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java
@@ -0,0 +1,15 @@
+package org.eclipse.papyrus.cpp.codegen;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.cpp.codegen.messages"; //$NON-NLS-1$
+	public static String CppModelElementsCreator_CannotFormatContent;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties
new file mode 100644
index 00000000000..0d1e512b8fb
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties
@@ -0,0 +1 @@
+CppModelElementsCreator_CannotFormatContent=Cannot format content
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
index 754c05c0f1e..30f04b36594 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
@@ -35,9 +35,11 @@ import org.eclipse.papyrus.acceleo.AcceleoException;
 import org.eclipse.papyrus.acceleo.GenUtils;

 import org.eclipse.papyrus.acceleo.ModelElementsCreator;

 import org.eclipse.papyrus.cpp.codegen.Activator;

+import org.eclipse.papyrus.cpp.codegen.Messages;

 import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils;

 import org.eclipse.text.edits.MalformedTreeException;

 import org.eclipse.text.edits.TextEdit;

+import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Element;

@@ -140,11 +142,11 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 

 		// Only generate when no CppNoCodeGen stereotype is applied to the class

 		else if((!noCodeGen(classifier)) &&

-				(!GenUtils.hasStereotype(classifier, Template.class))) {

+				(!GenUtils.hasStereotype(classifier, Template.class)) &&

+				(!(classifier instanceof Association))) {

 

 			// Template Bound Class

 			if(GenUtils.isTemplateBoundElement(classifier)) {

-				// TODO: Acceleo template is only defined for class (not for all classifiers)

 				String fileContent = commentHeader + AcceleoDriver.evaluateURI(CppBindHeader, classifier);

 				createFile(container, classifier.getName() + DOT + hppExt, fileContent, true);

 

@@ -187,7 +189,7 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 		TextEdit edit = codeFormatter.format(CodeFormatter.K_TRANSLATION_UNIT, doc.get(), 0, doc.get().length(), 0, null);

 

 		if (edit == null) {

-			Activator.log.debug("Cannot format content");

+			Activator.log.debug(Messages.CppModelElementsCreator_CannotFormatContent);

 			return content;

 		}