From 054a3a832be0734a148301dd89cb6493552846dc Mon Sep 17 00:00:00 2001
From: Vincent Aravantinos <aravantinos@fortiss.org>
Date: Wed, 13 Apr 2016 13:40:33 +0000
Subject: [PATCH] fixes overlay in navigator refs 2553
---
.../tooling/kernel/ui/internal/MarkerService.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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 f924e917d..da2e9d2dd 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;
}
--
GitLab