diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java index f924e917d5a6958ccb192b44a6831e986029df4f..da2e9d2ddfe12d5094dc152bca051a5245908c05 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java @@ -152,7 +152,11 @@ public class MarkerService implements IMarkerService, IPersistencyServiceListene if(top == null) { return ESeverity.lowest(); } - return getCacheEntry(top).getHighestSeverity(element); + ESeverity sev = getCacheEntry(top).getHighestSeverity(element); + if(element instanceof IConstrained) { + sev = ConstraintsUtils.augmentSeverityWithConstraintSeverity(sev, element); + } + return sev; } /** Accesses cache. */ @@ -261,9 +265,6 @@ public class MarkerService implements IMarkerService, IPersistencyServiceListene /** Returns the highest severity for the given element. */ public ESeverity getHighestSeverity(EObject element) { ESeverity sev = highestSeverityMap.get(element); - if(element instanceof IConstrained) { - sev = ConstraintsUtils.augmentSeverityWithConstraintSeverity(sev, element); - } return sev == null ? ESeverity.lowest() : sev; } @@ -388,7 +389,6 @@ public class MarkerService implements IMarkerService, IPersistencyServiceListene return getImageDescriptor("icons/info.gif"); case DEBUG: return getImageDescriptor("icons/debug.gif"); - } return null; }