diff --git a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/.ratings b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/.ratings index abca4e511b5e2d1043905174118e90e9146c34db..f164c269a7411334bd02bfdbf65c236b1200fe34 100644 --- a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/.ratings +++ b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/.ratings @@ -1,3 +1,3 @@ -AnnotationEntry.java 50d8790560ed60ba534b9d84a42f985e8f3e92a4 YELLOW +AnnotationEntry.java 967e6c0eeb47165fcd175c23aa372f0d8385d406 YELLOW AnnotationValueService.java 01fc46fb381854b16ce78779217ffc7c29036c14 GREEN IAnnotationValueService.java 81ff274a7b2d4c58e7b8485db857eb83f99710d0 GREEN diff --git a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/AnnotationEntry.java b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/AnnotationEntry.java index 50d8790560ed60ba534b9d84a42f985e8f3e92a4..967e6c0eeb47165fcd175c23aa372f0d8385d406 100644 --- a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/AnnotationEntry.java +++ b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/AnnotationEntry.java @@ -15,6 +15,8 @@ +--------------------------------------------------------------------------*/ package org.fortiss.tooling.base.annotation; +import static org.fortiss.tooling.kernel.utils.EcoreUtils.getModelElementLevel; + import java.util.ArrayList; import java.util.List; @@ -236,6 +238,14 @@ public class AnnotationEntry implements Comparable<AnnotationEntry> { public int compareTo(AnnotationEntry otherEntry) { IModelElement otherModelElement = otherEntry.getModelElement(); IModelElement thisModelElement = this.getModelElement(); + + int thisLevel = getModelElementLevel(thisModelElement); + int otherLevel = getModelElementLevel(otherModelElement); + + if(thisLevel != otherLevel) { + return ((Integer)thisLevel).compareTo(otherLevel); + } + if(thisModelElement instanceof INamedElement && otherModelElement instanceof INamedElement) { INamedElement thisNamed = (INamedElement)thisModelElement;