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 694493f4161113335b2e40961c972752c784d049..73aa0e42a4b8d2a2e0061a90fe91fd15402f4378 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); } }