From 0deacd48a78c240ac32528d697396f7f69b2c59c Mon Sep 17 00:00:00 2001
From: Vincent Aravantinos <aravantinos@fortiss.org>
Date: Thu, 21 Apr 2016 14:31:06 +0000
Subject: [PATCH] ConstraintUtils -> ConstraintUIUtils refs 2553
---
.../kernel/ui/internal/ConstraintLabelDecorator.java | 6 +++---
.../ui/internal/ConstraintVerificationUIService.java | 10 +++++-----
.../tooling/kernel/ui/internal/MarkerService.java | 4 ++--
.../{ConstraintsUtils.java => ConstraintsUIUtils.java} | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
rename org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/{ConstraintsUtils.java => ConstraintsUIUtils.java} (97%)
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintLabelDecorator.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintLabelDecorator.java
index fb026e5ce..864fd8ca7 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintLabelDecorator.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ConstraintLabelDecorator.java
@@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.ILightweightLabelDecorator;
import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
import org.fortiss.tooling.kernel.ui.ESharedImages;
import org.fortiss.tooling.kernel.ui.service.IMarkerService;
-import org.fortiss.tooling.kernel.ui.util.ConstraintsUtils;
+import org.fortiss.tooling.kernel.ui.util.ConstraintsUIUtils;
/**
* Label decorator for the {@link IMarkerService} decorations: errors, warnings, etc.
@@ -32,7 +32,7 @@ import org.fortiss.tooling.kernel.ui.util.ConstraintsUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 6F09A7DA3B08A67539BBCF9D027080FE
+ * @ConQAT.Rating YELLOW Hash: 79DD67670D9B7AAA62F3567B3CD0C347
*/
public final class ConstraintLabelDecorator extends BaseLabelProvider implements
ILightweightLabelDecorator {
@@ -42,7 +42,7 @@ public final class ConstraintLabelDecorator extends BaseLabelProvider implements
public void decorate(Object element, IDecoration decoration) {
if(element instanceof EObject) {
ESeverity sev = IMarkerService.INSTANCE.getHighestViolationSeverity((EObject)element);
- sev = ConstraintsUtils.augmentSeverityWithConstraintSeverity(sev, (EObject)element);
+ sev = ConstraintsUIUtils.augmentSeverityWithConstraintSeverity(sev, (EObject)element);
switch(sev) {
case FATAL:
decoration.addOverlay(ESharedImages.FATAL_OVERLAY.getImageDescriptor());
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 fbd5159f3..9ef1b01ce 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
@@ -25,7 +25,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
import org.fortiss.tooling.kernel.service.base.EObjectAwareServiceBase;
import org.fortiss.tooling.kernel.ui.extension.IConstraintVerifierUI;
import org.fortiss.tooling.kernel.ui.service.IConstraintVerificationUIService;
-import org.fortiss.tooling.kernel.ui.util.ConstraintsUtils;
+import org.fortiss.tooling.kernel.ui.util.ConstraintsUIUtils;
import org.fortiss.tooling.kernel.utils.EcoreUtils;
import org.fortiss.tooling.kernel.utils.LoggingUtils;
@@ -35,7 +35,7 @@ import org.fortiss.tooling.kernel.utils.LoggingUtils;
* @author aravantinos
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: FC9CE128FC7A41382D00FDDCC4F2AE52
+ * @ConQAT.Rating YELLOW Hash: F8F4B58C69F64FE19BEC02DE8D19A220
*/
public final class ConstraintVerificationUIService extends
EObjectAwareServiceBase<IConstraintVerifierUI<IConstraint>> implements
@@ -63,7 +63,7 @@ public final class ConstraintVerificationUIService extends
public void openStatus(IConstraintVerificationStatus status) {
IConstraintVerifierUI<IConstraint> verifier = getFirstVerifier(status.getConstraint());
verifier.openStatus(status);
- ConstraintsUtils.triggerMarkersRefresh(status.getConstraint());
+ ConstraintsUIUtils.triggerMarkersRefresh(status.getConstraint());
}
/** {@inheritDoc} */
@@ -152,10 +152,10 @@ public final class ConstraintVerificationUIService extends
}
});
} else if(!(constraint.getVerificationStatus() instanceof OutdatedVerificationStatus)) {
- ConstraintsUtils.createOutdatedVerificationStatus(constraint);
+ ConstraintsUIUtils.createOutdatedVerificationStatus(constraint);
}
// Update GUI markers
- ConstraintsUtils.triggerMarkersRefresh(constraint);
+ ConstraintsUIUtils.triggerMarkersRefresh(constraint);
return true;
}
return false;
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
index da2e9d2dd..f64e0be09 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java
@@ -46,7 +46,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
import org.fortiss.tooling.kernel.service.listener.IPersistencyServiceListener;
import org.fortiss.tooling.kernel.ui.internal.views.MarkerViewPart;
import org.fortiss.tooling.kernel.ui.service.IMarkerService;
-import org.fortiss.tooling.kernel.ui.util.ConstraintsUtils;
+import org.fortiss.tooling.kernel.ui.util.ConstraintsUIUtils;
/**
* This class implements the {@link IMarkerService} interface.
@@ -154,7 +154,7 @@ public class MarkerService implements IMarkerService, IPersistencyServiceListene
}
ESeverity sev = getCacheEntry(top).getHighestSeverity(element);
if(element instanceof IConstrained) {
- sev = ConstraintsUtils.augmentSeverityWithConstraintSeverity(sev, element);
+ sev = ConstraintsUIUtils.augmentSeverityWithConstraintSeverity(sev, element);
}
return sev;
}
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java
similarity index 97%
rename from org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUtils.java
rename to org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java
index f2b7935b4..68e577b1c 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUtils.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/ConstraintsUIUtils.java
@@ -45,9 +45,9 @@ import org.fortiss.tooling.kernel.utils.EcoreUtils;
* @author aravantinos
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 5F009C359872D3E716E02343F9AFD225
+ * @ConQAT.Rating YELLOW Hash: 985A54753B82CFBFA82AF1FA54A59124
*/
-public class ConstraintsUtils {
+public class ConstraintsUIUtils {
/**
* @param constraint
* @return An "outdated" verification status for <code>constraint</code>.
@@ -152,7 +152,7 @@ public class ConstraintsUtils {
public static ESeverity augmentSeverityWithConstraintSeverity(ESeverity sev,
EObject modelElement) {
if(modelElement instanceof IConstrained) {
- ESeverity sev2 = ConstraintsUtils.getSeverity((IConstrained)modelElement);
+ ESeverity sev2 = ConstraintsUIUtils.getSeverity((IConstrained)modelElement);
if(sev == null || (sev2 != null && SEVERITY_DIRECT_COMPARATOR.compare(sev2, sev) < 0)) {
sev = sev2;
}
--
GitLab