Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2013-03-23 12:07:42 -0400
committerMartin Taal2013-03-23 12:07:42 -0400
commit7bdd6e740b5016444c91ea01773f3a063e0faf65 (patch)
tree615939c1cc3ca68c5d9d815c55d29de513d4610f
parentcf7e802d70d9fd840bc4a4a4ab5c3821a2f663ec (diff)
downloadorg.eclipse.emf.texo-7bdd6e740b5016444c91ea01773f3a063e0faf65.tar.gz
org.eclipse.emf.texo-7bdd6e740b5016444c91ea01773f3a063e0faf65.tar.xz
org.eclipse.emf.texo-7bdd6e740b5016444c91ea01773f3a063e0faf65.zip
Prevent duplicate Inheritance Annotation
-rwxr-xr-xgenerator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EClassORMAnnotator.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EClassORMAnnotator.java b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EClassORMAnnotator.java
index 570585ee..73511328 100755
--- a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EClassORMAnnotator.java
+++ b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EClassORMAnnotator.java
@@ -91,7 +91,8 @@ public class EClassORMAnnotator extends ETypeElementORMAnnotator implements Anno
&& ePackageAnnotation.getInheritance().isSetStrategy()) {
annotation.setInheritance(EcoreUtil.copy(ePackageAnnotation.getInheritance()));
}
- if (annotation.getInheritance() != null && annotation.getEntity() != null) {
+ if (annotation.getInheritance() == null && annotation.getEntity() != null
+ && annotation.getEntity().getInheritance() == null) {
annotation.getEntity().setInheritance(EcoreUtil.copy(annotation.getInheritance()));
}

Back to the top