From 65d24805bd476eb149a8384fb7f16d3b07e251a2 Mon Sep 17 00:00:00 2001 From: Vincent Aravantinos <aravantinos@fortiss.org> Date: Fri, 3 Jun 2016 15:41:09 +0000 Subject: [PATCH] defines "onOutdate" refs 2353 --- .../extension/base/ConstraintVerifierUIBases.java | 7 +++++-- .../internal/ConstraintVerificationUIService.java | 13 +++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintVerifierUIBases.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintVerifierUIBases.java index aa559d8df..a429e86b5 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintVerifierUIBases.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ConstraintVerifierUIBases.java @@ -46,6 +46,7 @@ import org.fortiss.tooling.kernel.service.IConstraintVerificationService.IFix; import org.fortiss.tooling.kernel.ui.extension.IConstraintVerifierUI; import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService; import org.fortiss.tooling.kernel.ui.util.ConstraintsUIUtils; +import org.fortiss.tooling.kernel.utils.ConstraintsUtils; /** * Base class for constraint verification GUI. @@ -53,7 +54,7 @@ import org.fortiss.tooling.kernel.ui.util.ConstraintsUIUtils; * @author vincent * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: C5B7A42314634675038E8C625160CAAE + * @ConQAT.Rating YELLOW Hash: B5B3B63AD0F33075F552A516503219EB */ public class ConstraintVerifierUIBases { @@ -186,7 +187,9 @@ public class ConstraintVerifierUIBases { /** {@inheritDoc} */ @Override public void onOutdate(T constraint) { - // By default do nothing + // By default, we just set the status to outdated + ConstraintsUtils.createOutdatedVerificationStatus(constraint); + ConstraintsUIUtils.triggerMarkersRefresh(constraint); } } diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintVerificationUIService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintVerificationUIService.java index 1b682c28c..15de0bc6d 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintVerificationUIService.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintVerificationUIService.java @@ -20,14 +20,12 @@ import org.fortiss.tooling.kernel.model.constraints.ConstraintsPackage; import org.fortiss.tooling.kernel.model.constraints.IConstrained; 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.service.IConstraintVerificationService; import org.fortiss.tooling.kernel.service.base.EObjectAwareServiceBase; import org.fortiss.tooling.kernel.ui.extension.IConstraintVerifierUI; import org.fortiss.tooling.kernel.ui.internal.introspection.items.ConstraintVerificationUIServiceIntrospectionDetailsItem; import org.fortiss.tooling.kernel.ui.service.IConstraintVerificationUIService; import org.fortiss.tooling.kernel.ui.util.ConstraintsUIUtils; -import org.fortiss.tooling.kernel.utils.ConstraintsUtils; import org.fortiss.tooling.kernel.utils.EcoreUtils; import org.fortiss.tooling.kernel.utils.LoggingUtils; @@ -37,7 +35,7 @@ import org.fortiss.tooling.kernel.utils.LoggingUtils; * @author aravantinos * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: ED5A17BE7E2FCB66B36AA7F8954DEEE3 + * @ConQAT.Rating YELLOW Hash: 49C49FED91805187499D527C107490FC */ public final class ConstraintVerificationUIService extends EObjectAwareServiceBase<IConstraintVerifierUI<IConstraint>> implements @@ -162,13 +160,8 @@ public final class ConstraintVerificationUIService extends return false; } if(!IConstraintVerificationService.INSTANCE.isUpToDate(constraint)) { - if(constraint.isAutoCheck()) { - IConstraintVerifierUI<IConstraint> verifier = getFirstVerifier(constraint); - verifier.onOutdate(constraint); - } else if(!(constraint.getVerificationStatus() instanceof OutdatedVerificationStatus)) { - ConstraintsUtils.createOutdatedVerificationStatus(constraint); - ConstraintsUIUtils.triggerMarkersRefresh(constraint); - } + IConstraintVerifierUI<IConstraint> verifier = getFirstVerifier(constraint); + verifier.onOutdate(constraint); return true; } return false; -- GitLab