adapts UI utils

refs 2726

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java

@@ -35,7 +35,6 @@ import org.eclipse.swt.widgets.Shell;
 import org.fortiss.tooling.kernel.extension.IConstraint;
 import org.fortiss.tooling.kernel.extension.data.IConstraintViolation;
 import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
-import org.fortiss.tooling.kernel.model.constraints.ConstrainedWithChecksum;
 import org.fortiss.tooling.kernel.model.constraints.ConstraintInstance;
 import org.fortiss.tooling.kernel.model.constraints.ErrorConstraintInstanceStatus;
 import org.fortiss.tooling.kernel.model.constraints.FailedConstraintInstanceStatus;
@@ -53,7 +52,7 @@ import org.fortiss.tooling.kernel.utils.EcoreUtils;
  * @author aravantinos
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: DFE7BB929A7FFD5E807F6C4B873BE83E
+ * @ConQAT.Rating YELLOW Hash: B0B5292B6B483943B7569735FD98865D
  */
 public class ConstraintsUIUtils {
 
@@ -171,9 +170,7 @@ public class ConstraintsUIUtils {
 		// We first collect separately the constrained objects because - unfortunately for some
 		// unknown reason - the following notification seems to trigger a change of the list of
 		// constrained objects.
-		for(ConstrainedWithChecksum cwc : ci.getConstrainedsWithChecksum()) {
-			constraineds.add(cwc.getConstrained());
-		}
+		constraineds.addAll(ci.getConstraineds());
 		constraineds.stream().forEach(constrained -> {
 			if(constrained != null) {
 				EcoreUtils.postRefreshNotification(constrained);
@@ -188,9 +185,9 @@ public class ConstraintsUIUtils {
 	public static void triggerMarkersRefresh(List<ConstraintInstance> cis) {
 		Set<IConstrained> constraineds = new HashSet<IConstrained>();
 		for(ConstraintInstance ci : cis) {
-			for(ConstrainedWithChecksum cwc : ci.getConstrainedsWithChecksum()) {
-				if(cwc.getConstrained() != null) {
-					constraineds.add(cwc.getConstrained());
+			for(IConstrained cstrd : ci.getConstraineds()) {
+				if(cstrd != null) {
+					constraineds.add(cstrd);
 				}
 			}
 		}
@@ -215,7 +212,7 @@ public class ConstraintsUIUtils {
 	 */
 	public static String getText(ConstraintInstance c) {
 		if(c == null) {
-			return "NOT APPLICABLE";
+			return "";
 		}
 		String mainMsg = "ERROR";
 		IConstraintInstanceStatus status = IConstraintUIService.getInstance().getStatus(c);
@@ -255,11 +252,11 @@ public class ConstraintsUIUtils {
 	public static Color getColor(ConstraintInstance c) {
 		Display display = Display.getCurrent();
 		if(c == null) {
-			return display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
+			return null;
 		}
 		IConstraintInstanceStatus status = IConstraintUIService.getInstance().getStatus(c);
 		if(status == null) {
-			return display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
+			return null;
 		} else if(status instanceof FailedConstraintInstanceStatus ||
 				status instanceof ErrorConstraintInstanceStatus) {
 			return display.getSystemColor(SWT.COLOR_RED);