IConstraint -> Constraint

refs 2553

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

@@ -31,10 +31,10 @@ import org.eclipse.swt.widgets.Display;
 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.Constraint;
 import org.fortiss.tooling.kernel.model.constraints.ErrorVerificationStatus;
 import org.fortiss.tooling.kernel.model.constraints.FailVerificationStatus;
 import org.fortiss.tooling.kernel.model.constraints.IConstrained;
-import org.fortiss.tooling.kernel.model.constraints.IConstraint;
 import org.fortiss.tooling.kernel.model.constraints.IConstraintContainer;
 import org.fortiss.tooling.kernel.model.constraints.IConstraintVerificationStatus;
 import org.fortiss.tooling.kernel.model.constraints.OutdatedVerificationStatus;
@@ -48,7 +48,7 @@ import org.fortiss.tooling.kernel.utils.EcoreUtils;
  * @author aravantinos
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: DEFFE3B2CD87000FA08371CCE78E9F33
+ * @ConQAT.Rating YELLOW Hash: 8E535AAF5BE563F94B385D091D10B45E
  */
 public class ConstraintsUIUtils {
 
@@ -82,7 +82,7 @@ public class ConstraintsUIUtils {
 	 */
 	public static ClassifiedStatuses getClassifiedStatuses(IConstrained constrained) {
 		ClassifiedStatuses res = new ClassifiedStatuses();
-		for(IConstraint constraint : constrained.getConstraints()) {
+		for(Constraint constraint : constrained.getConstraints()) {
 			IConstraintVerificationStatus status =
 					IConstraintVerificationUIService.getInstance().getStatus(constraint);
 			if(status instanceof FailVerificationStatus) {
@@ -105,9 +105,16 @@ public class ConstraintsUIUtils {
 	 * @param c
 	 * @return {@link ESeverity} corresponding to the status of the constraint <code>c</code>
 	 */
-	public static ESeverity getConstraintSeverity(IConstraint c) {
+	public static ESeverity getConstraintSeverity(Constraint c) {
 		IConstraintVerificationStatus status =
 				IConstraintVerificationUIService.getInstance().getStatus(c);
+		if(IConstraintVerificationUIService.getInstance().shallDisplayAsWarning(c)) {
+			if(status instanceof FailVerificationStatus ||
+					status instanceof OutdatedVerificationStatus) {
+				return ESeverity.WARNING;
+			}
+			return ESeverity.lowest();
+		}
 		if(status instanceof FailVerificationStatus) {
 			return ESeverity.ERROR;
 		} else if(status instanceof ErrorVerificationStatus) {
@@ -156,7 +163,7 @@ public class ConstraintsUIUtils {
 	 *            Sends (kernel-specific) refresh notifications to the constrained elements to
 	 *            trigger a refresh of the marker decorations.
 	 */
-	public static void triggerMarkersRefresh(IConstraint c) {
+	public static void triggerMarkersRefresh(Constraint c) {
 		List<IConstrained> constraineds = new ArrayList<IConstrained>();
 		// 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
@@ -172,15 +179,14 @@ public class ConstraintsUIUtils {
 	}
 
 	/**
-	 * @param constraintType
+	 * @param id
 	 * @param cstrContainer
 	 *            Calls <code>triggerMarkersRefresh</code> on every constraint of
-	 *            <code>cstrContainer</code>.
+	 *            <code>cstrContainer</code> matching <code>id</code>.
 	 */
-	public static <T extends IConstraint> void triggerMarkerRefresh(Class<T> constraintType,
-			IConstraintContainer cstrContainer) {
-		for(IConstraint c : cstrContainer.getConstraints()) {
-			if(constraintType.isInstance(c)) {
+	public static void triggerMarkerRefresh(String id, IConstraintContainer cstrContainer) {
+		for(Constraint c : cstrContainer.getConstraints()) {
+			if(c.getConstraintTypeID().equals(id)) {
 				ConstraintsUIUtils.triggerMarkersRefresh(c);
 			}
 		}
@@ -190,7 +196,7 @@ public class ConstraintsUIUtils {
 	 * @param c
 	 * @return Standard text describing the status of <code>c</code>.
 	 */
-	public static String getText(IConstraint c) {
+	public static String getText(Constraint c) {
 		if(c == null) {
 			return "";
 		}
@@ -213,7 +219,7 @@ public class ConstraintsUIUtils {
 	 * @param c
 	 * @return Standard "hint" indicating possible action on the status of <code>c</code>.
 	 */
-	public static String getHint(IConstraint c) {
+	public static String getHint(Constraint c) {
 		if(c == null) {
 			return "";
 		}
@@ -231,7 +237,7 @@ public class ConstraintsUIUtils {
 	 * @param c
 	 * @return Standard colour corresponding to the status of <code>c</code>.
 	 */
-	public static Color getColor(IConstraint c) {
+	public static Color getColor(Constraint c) {
 		Display display = Display.getCurrent();
 		if(c == null) {
 			return display.getSystemColor(SWT.COLOR_GRAY);
@@ -249,14 +255,14 @@ public class ConstraintsUIUtils {
 		return display.getSystemColor(SWT.COLOR_GRAY);
 	}
 
-	/** A label provider for the status of an {@link IConstraint}. */
+	/** A label provider for the status of an {@link Constraint}. */
 	public static class StatusLabelProvider extends ColumnLabelProvider {
 
 		/** See constructor. */
 		private boolean withHint;
 
 		/** Function to retrieve a constraint from the embedded objects. */
-		private Function<Object, IConstraint> getConstraint;
+		private Function<Object, Constraint> getConstraint;
 
 		/**
 		 * Constructor.
@@ -269,7 +275,7 @@ public class ConstraintsUIUtils {
 		 * @param getConstraint
 		 *            Function returning a constraint from the object to be provided.
 		 */
-		public StatusLabelProvider(boolean withHint, Function<Object, IConstraint> getConstraint) {
+		public StatusLabelProvider(boolean withHint, Function<Object, Constraint> getConstraint) {
 			super();
 			this.getConstraint = getConstraint;
 			this.withHint = withHint;
@@ -278,7 +284,7 @@ public class ConstraintsUIUtils {
 		/** {@inheritDoc} */
 		@Override
 		public String getText(Object element) {
-			IConstraint cstr = getConstraint.apply(element);
+			Constraint cstr = getConstraint.apply(element);
 			String mainMsg = ConstraintsUIUtils.getText(cstr);
 			return mainMsg + (withHint ? " " + ConstraintsUIUtils.getHint(cstr) : "");
 		}
@@ -286,7 +292,7 @@ public class ConstraintsUIUtils {
 		/** {@inheritDoc} */
 		@Override
 		public Color getBackground(Object element) {
-			IConstraint cstr = getConstraint.apply(element);
+			Constraint cstr = getConstraint.apply(element);
 			return ConstraintsUIUtils.getColor(cstr);
 		}
 	}
@@ -295,7 +301,7 @@ public class ConstraintsUIUtils {
 	 * @param constraint
 	 * @return <code>true</code> if <code>constraint</code> is active.
 	 */
-	public static boolean isConstraintActive(IConstraint constraint) {
+	public static boolean isConstraintActive(Constraint constraint) {
 		return IConstraintVerificationUIService.getInstance().getStatus(constraint) != null;
 	}