Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraradermache2013-07-03 11:23:36 -0400
committeraradermache2013-07-03 11:23:36 -0400
commit2ff427a837d4ad11abbe7786426a597d4f5341bf (patch)
treec57a1c8181af5373bedf7d1d85ce018d230424bf /extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src
parent64271043f8390ac12b2152c81e944dca9bf7da19 (diff)
downloadorg.eclipse.papyrus-2ff427a837d4ad11abbe7786426a597d4f5341bf.tar.gz
org.eclipse.papyrus-2ff427a837d4ad11abbe7786426a597d4f5341bf.tar.xz
org.eclipse.papyrus-2ff427a837d4ad11abbe7786426a597d4f5341bf.zip
Remove ExternClass stereotype and replace it by External
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl6
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java4
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.java5
4 files changed, 8 insertions, 9 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
index c2e57b0864c..90d6de49b7f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
@@ -30,9 +30,9 @@
[template public CppClassAllIncludesDeclaration(class : Classifier, list : Sequence(Classifier) )]
[for (cl : Classifier | list)]
- [comment Only add include if this is not for the current class and if it does not have the stereotype "CppNoCodeGen", unless
- it has stereotype "CppExternalClass"/]
- [if((cl <> class) and (not hasStereotype(NoCodeGen)) or hasStereotype(ExternClass))]
+ [comment Only add include if this is not for the current class and if it does not have the stereotype "NoCodeGen", unless
+ it has stereotype "C_Cpp:External"/]
+ [if((cl <> class) and (not hasStereotype(NoCodeGen)) or hasStereotype(External))]
[if(oclIsKindOf(Enumeration) or oclIsKindOf(PrimitiveType))]
[comment Enumeration is not defined in a separate file, but in the package that owns it
=> include the owning package (might be a duplicate input, if owning package is also the owner of current class/]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
index 6086e5d1951..3ec9d358aa2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
@@ -7,7 +7,7 @@
if (hasStereotype(Template)) then
getApplication(Template).oclAsType(Template).declaration
else
- if (hasStereotype(ExternClass)) then getApplication(ExternClass).oclAsType(ExternClass).name
+ if (hasStereotype(External)) then getApplication(External).oclAsType(External).name
else
-- standard case (no stereotypes are applied)
getNearestPackage().getFullPath() + '/' + ne.name + '.' + getHeaderSuffix()
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 c2fdc6c21c7..d9986d37fc9 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
@@ -16,7 +16,7 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.papyrus.C_Cpp.CppRoot;
-import org.eclipse.papyrus.C_Cpp.ExternClass;
+import org.eclipse.papyrus.C_Cpp.External;
import org.eclipse.papyrus.C_Cpp.Include;
import org.eclipse.papyrus.C_Cpp.ManualGeneration;
import org.eclipse.papyrus.C_Cpp.NoCodeGen;
@@ -115,7 +115,7 @@ public class CppModelElementsCreator extends ModelElementsCreator {
}
// Only generate when no CppNoCodeGen stereotype is applied to the class
- else if((!GenUtils.hasStereotype(classifier, NoCodeGen.class)) && (!GenUtils.hasStereotype(classifier, ExternClass.class)) && (!GenUtils.hasStereotype(classifier, Template.class))) {
+ else if((!GenUtils.hasStereotype(classifier, NoCodeGen.class)) && (!GenUtils.hasStereotype(classifier, External.class)) && (!GenUtils.hasStereotype(classifier, Template.class))) {
// Template Bound Class
if(GenUtils.isTemplateBoundElement(classifier)) {
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.java
index 22f8be68f2b..d2e70dd502a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/GenUtils.java
@@ -20,12 +20,11 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.UniqueEList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.C_Cpp.ExternClass;
+import org.eclipse.papyrus.C_Cpp.External;
import org.eclipse.papyrus.C_Cpp.NoCodeGen;
import org.eclipse.papyrus.C_Cpp.Typedef;
import org.eclipse.papyrus.C_Cpp.Visibility;
import org.eclipse.papyrus.cpp.codegen.Constants;
-import org.eclipse.uml2.uml.AggregationKind;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Classifier;
@@ -491,7 +490,7 @@ public class GenUtils {
if(owner instanceof Package) {
owningPkgName = ((Package)owner).getName();
}
- if((hasStereotype(ne, ExternClass.class)) || (hasStereotype(ne, NoCodeGen.class))) {
+ if((hasStereotype(ne, External.class)) || (hasStereotype(ne, NoCodeGen.class))) {
return ne.getName();
} else if(owningPkgName.equals("AnsiCLibrary")) {
// always use the short name for types within the ANSI C library

Back to the top