From 71a31cec8c815adec44d0f229ba03e8250c6c211 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Mon, 7 Oct 2019 14:22:36 +0200
Subject: [PATCH] Partial cleanup
Issue-Ref: 3246
Issue-Url: https://af3-developer.fortiss.org/issues/3246
Signed-off-by: Simon Barner <barner@fortiss.org>
---
.../af3/rcp/application/advisors/.ratings | 2 +-
.../CurrentObjectiveContributionItem.java | 28 +++++--------------
2 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings
index 3aade2c..ef391fe 100644
--- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings
+++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/.ratings
@@ -1,5 +1,5 @@
ApplicationActionBarAdvisor.java 3e7c0fd992586e6ca7724b871eb0b2cf59244028 GREEN
ApplicationWorkbenchAdvisor.java ef25d5783a4f75e88334fd679834a6e0421f8c2f GREEN
ApplicationWorkbenchWindowAdvisor.java da5cb38300b384579532c678fbc9faa961c2ca6b GREEN
-CurrentObjectiveContributionItem.java 79142f513151e349604304ee07edfe5ac9ab13e6 RED
+CurrentObjectiveContributionItem.java f3e3e5d264ec136145cdc8e0374dc2032b6e1b4d RED
UpcomingObjectiveContributionItem.java c07438463c4d359ea2f5de40ba90b5ac6991ba9c RED
diff --git a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/CurrentObjectiveContributionItem.java b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/CurrentObjectiveContributionItem.java
index 79142f5..f3e3e5d 100644
--- a/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/CurrentObjectiveContributionItem.java
+++ b/org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/advisors/CurrentObjectiveContributionItem.java
@@ -49,7 +49,6 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
@@ -73,9 +72,9 @@ import org.fortiss.tooling.kernel.model.constraints.SuccessConstraintInstanceSta
import org.fortiss.tooling.kernel.service.IPersistencyService;
import org.fortiss.tooling.kernel.ui.service.IConstraintUIService;
-// TODO (SB, 3): Class comment
/**
- *
+ * {@link ContributionItem} to select current development process objective.
+ *
* @author rahman
*
*/
@@ -376,14 +375,9 @@ class CurrentObjectiveContributionItem extends ContributionItem
}
}
- // TODO (SB, 4): Also fix line-breaks, and punctuation and capitalization of @return
/**
- * generates an object containing how many instances of a given constraints are satisfied and
- * how many constraints in
- * all exist in the given objective
- *
- * @param constraintName
- * @return the value indicating whether the constraint is satisfied or not
+ * Generates an object containing how many instances of a given constraints are satisfied and
+ * how many constraints in all exist in the given objective.
*/
private ConstraintResultHolder getConstraintValueObjectByName(String constraintName) {
@@ -405,21 +399,14 @@ class CurrentObjectiveContributionItem extends ContributionItem
return new ConstraintResultHolder(success, total);
}
- /**
- * Generates scores for configuration.
- *
- * @param process
- * the root process
- * @return The class containing the total and satisfied constraint count.
- */
+ /** Generates scores for configuration. */
private ConstraintResultHolder
generateScoresForConfig(ConstraintBasedDevelopmentProcess process) {
float totalConstraintCount = 0;
float satisfiedConstraintCount = 0;
- EList<String> activeConstraints =
- currentDevelopmentProcess.getCurrentObjective().getActiveConstraints();
+ EList<String> activeConstraints = process.getCurrentObjective().getActiveConstraints();
for(String activeConstraintName : activeConstraints) {
ConstraintResultHolder constraintValueObjectByName =
@@ -433,9 +420,8 @@ class CurrentObjectiveContributionItem extends ContributionItem
/** {@inheritDoc} */
@Override
public void resourceChanged(IResourceChangeEvent event) {
- // TODO (SB, 9): Why do you check for the existence of a Display that is never used?
if(event.getType() == IResourceChangeEvent.POST_CHANGE &&
- currentDevelopmentProcess != null && Display.getCurrent() != null) {
+ currentDevelopmentProcess != null) {
generateScoresAndUpdateUI(currentDevelopmentProcess);
EList<ConstraintConfiguration> configurations =
currentDevelopmentProcess.getConfigurations();
--
GitLab