From a65ab9c8b49192ee12a75dae99df7fa5e1cb399b Mon Sep 17 00:00:00 2001
From: Sebastian Bergemann <bergemann@fortiss.org>
Date: Thu, 23 Mar 2023 10:36:12 +0100
Subject: [PATCH] GREEN (corrected minor flaws)
Issue-ref: 4273
Issue-URL: https://git.fortiss.org/af3/af3/-/issues/4273
Signed-off-by: Sebastian Bergemann <bergemann@fortiss.org>
---
.../fortiss/tooling/ext/variability/util/.ratings | 2 +-
.../ext/variability/util/VariabilityUtils.java | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/util/.ratings b/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/util/.ratings
index 5793bc323..9f9d18d8f 100644
--- a/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/util/.ratings
+++ b/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/util/.ratings
@@ -1 +1 @@
-VariabilityUtils.java 3a10f28d57ca4da70b6236b74bd682fa8b03582a YELLOW
+VariabilityUtils.java 6f2ffd231c27f5f7ab8c62d05350c0a92392eaf8 GREEN
diff --git a/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/util/VariabilityUtils.java b/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/util/VariabilityUtils.java
index 3a10f28d5..6f2ffd231 100644
--- a/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/util/VariabilityUtils.java
+++ b/org.fortiss.tooling.ext.variability/src/org/fortiss/tooling/ext/variability/util/VariabilityUtils.java
@@ -174,17 +174,17 @@ public class VariabilityUtils {
() -> elem.addSpecification(finalSpec));
}
- final OptionalVariationPointSpecification finalSpec = spec;
- // Change model only, if the new presence condition is different from the old one
- PresenceCondition oldPC = spec.getPresenceCondition();
+ // Change model only if the new presence condition is different from the old one
+ PresenceCondition oldPc = spec.getPresenceCondition();
// If both pc are null, there is nothing to change
- if(oldPC == null && pc == null) {
+ if(oldPc == null && pc == null) {
return true;
}
- // Check whether the old and new are different (i.e. one being null or different value)
- if(oldPC == null || pc == null ||
- !oldPC.getStringRepresentation().equals(pc.getStringRepresentation())) {
+ // Check whether the old and new are different (i.e., one being null or different value)
+ if(oldPc == null || pc == null ||
+ !oldPc.getStringRepresentation().equals(pc.getStringRepresentation())) {
+ final OptionalVariationPointSpecification finalSpec = spec;
ICommandStackService.getInstance().runAsCommand(elem,
() -> finalSpec.setPresenceCondition(pc));
}
--
GitLab