From d55046b34d6cb3bef3f6fa95718e037d0ba7b871 Mon Sep 17 00:00:00 2001
From: Vincent Aravantinos <aravantinos@fortiss.org>
Date: Wed, 27 Apr 2016 22:46:42 +0000
Subject: [PATCH] improves constraint verifier base in case no specific error
messages have been defined refs 2553
---
.../extension/base/ConstraintVerifierUIBase.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintVerifierUIBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintVerifierUIBase.java
index 694493f41..73aa0e42a 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintVerifierUIBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintVerifierUIBase.java
@@ -36,9 +36,11 @@ import org.fortiss.tooling.kernel.model.constraints.FailVerificationStatus;
import org.fortiss.tooling.kernel.model.constraints.IConstraint;
import org.fortiss.tooling.kernel.model.constraints.IConstraintVerificationStatus;
import org.fortiss.tooling.kernel.model.constraints.OutdatedVerificationStatus;
+import org.fortiss.tooling.kernel.model.constraints.SuccessVerificationStatus;
import org.fortiss.tooling.kernel.service.IConstraintVerificationService;
import org.fortiss.tooling.kernel.service.IConstraintVerificationService.IFix;
import org.fortiss.tooling.kernel.ui.extension.IConstraintVerifierUI;
+import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
/**
* Base class for constraint verification GUI.
@@ -46,7 +48,7 @@ import org.fortiss.tooling.kernel.ui.extension.IConstraintVerifierUI;
* @author vincent
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 5C9927F236301634847D916815662784
+ * @ConQAT.Rating YELLOW Hash: 2CAFC35BCE6941999C382DCE461140F1
*/
public class ConstraintVerifierUIBase<T extends IConstraint> implements IConstraintVerifierUI<T> {
@@ -83,7 +85,7 @@ public class ConstraintVerifierUIBase<T extends IConstraint> implements IConstra
/** {@inheritDoc} */
@Override
public boolean canOpen(IConstraintVerificationStatus status) {
- return(status instanceof OutdatedVerificationStatus);
+ return(!(status instanceof SuccessVerificationStatus));
}
/** Dialog presenting the error/failure and the possible fix(es). */
@@ -161,8 +163,10 @@ public class ConstraintVerifierUIBase<T extends IConstraint> implements IConstra
/** {@inheritDoc} */
@Override
- public String getMessage(IConstraintVerificationStatus status) {
- // By default, no message. To be specialized by inheriting classes.
- return null;
+ public String getMessage(IConstraintVerificationStatus s) {
+ // Default message. Inheriting classes SHOULD specialize.
+ String name = IModelElementHandlerService.INSTANCE.getName(s.getConstraint());
+ String pre = s instanceof FailVerificationStatus ? "Error while checking" : "Unsatisfied";
+ return pre + " constraint" + (name == null ? "." : ": " + name);
}
}
--
GitLab