Skip to content
Snippets Groups Projects
Commit 71a31cec authored by Simon Barner's avatar Simon Barner
Browse files

Partial cleanup

parent a0688ff1
No related branches found
No related tags found
1 merge request!93246: NPE in CurrentObjectiveContributionItem
ApplicationActionBarAdvisor.java 3e7c0fd992586e6ca7724b871eb0b2cf59244028 GREEN ApplicationActionBarAdvisor.java 3e7c0fd992586e6ca7724b871eb0b2cf59244028 GREEN
ApplicationWorkbenchAdvisor.java ef25d5783a4f75e88334fd679834a6e0421f8c2f GREEN ApplicationWorkbenchAdvisor.java ef25d5783a4f75e88334fd679834a6e0421f8c2f GREEN
ApplicationWorkbenchWindowAdvisor.java da5cb38300b384579532c678fbc9faa961c2ca6b GREEN ApplicationWorkbenchWindowAdvisor.java da5cb38300b384579532c678fbc9faa961c2ca6b GREEN
CurrentObjectiveContributionItem.java 79142f513151e349604304ee07edfe5ac9ab13e6 RED CurrentObjectiveContributionItem.java f3e3e5d264ec136145cdc8e0374dc2032b6e1b4d RED
UpcomingObjectiveContributionItem.java c07438463c4d359ea2f5de40ba90b5ac6991ba9c RED UpcomingObjectiveContributionItem.java c07438463c4d359ea2f5de40ba90b5ac6991ba9c RED
...@@ -49,7 +49,6 @@ import org.eclipse.swt.layout.GridLayout; ...@@ -49,7 +49,6 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem; import org.eclipse.swt.widgets.ToolItem;
...@@ -73,9 +72,9 @@ import org.fortiss.tooling.kernel.model.constraints.SuccessConstraintInstanceSta ...@@ -73,9 +72,9 @@ import org.fortiss.tooling.kernel.model.constraints.SuccessConstraintInstanceSta
import org.fortiss.tooling.kernel.service.IPersistencyService; import org.fortiss.tooling.kernel.service.IPersistencyService;
import org.fortiss.tooling.kernel.ui.service.IConstraintUIService; import org.fortiss.tooling.kernel.ui.service.IConstraintUIService;
// TODO (SB, 3): Class comment
/** /**
* * {@link ContributionItem} to select current development process objective.
*
* @author rahman * @author rahman
* *
*/ */
...@@ -376,14 +375,9 @@ class CurrentObjectiveContributionItem extends ContributionItem ...@@ -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 * Generates an object containing how many instances of a given constraints are satisfied and
* how many constraints in * how many constraints in all exist in the given objective.
* all exist in the given objective
*
* @param constraintName
* @return the value indicating whether the constraint is satisfied or not
*/ */
private ConstraintResultHolder getConstraintValueObjectByName(String constraintName) { private ConstraintResultHolder getConstraintValueObjectByName(String constraintName) {
...@@ -405,21 +399,14 @@ class CurrentObjectiveContributionItem extends ContributionItem ...@@ -405,21 +399,14 @@ class CurrentObjectiveContributionItem extends ContributionItem
return new ConstraintResultHolder(success, total); return new ConstraintResultHolder(success, total);
} }
/** /** Generates scores for configuration. */
* Generates scores for configuration.
*
* @param process
* the root process
* @return The class containing the total and satisfied constraint count.
*/
private ConstraintResultHolder private ConstraintResultHolder
generateScoresForConfig(ConstraintBasedDevelopmentProcess process) { generateScoresForConfig(ConstraintBasedDevelopmentProcess process) {
float totalConstraintCount = 0; float totalConstraintCount = 0;
float satisfiedConstraintCount = 0; float satisfiedConstraintCount = 0;
EList<String> activeConstraints = EList<String> activeConstraints = process.getCurrentObjective().getActiveConstraints();
currentDevelopmentProcess.getCurrentObjective().getActiveConstraints();
for(String activeConstraintName : activeConstraints) { for(String activeConstraintName : activeConstraints) {
ConstraintResultHolder constraintValueObjectByName = ConstraintResultHolder constraintValueObjectByName =
...@@ -433,9 +420,8 @@ class CurrentObjectiveContributionItem extends ContributionItem ...@@ -433,9 +420,8 @@ class CurrentObjectiveContributionItem extends ContributionItem
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public void resourceChanged(IResourceChangeEvent event) { 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 && if(event.getType() == IResourceChangeEvent.POST_CHANGE &&
currentDevelopmentProcess != null && Display.getCurrent() != null) { currentDevelopmentProcess != null) {
generateScoresAndUpdateUI(currentDevelopmentProcess); generateScoresAndUpdateUI(currentDevelopmentProcess);
EList<ConstraintConfiguration> configurations = EList<ConstraintConfiguration> configurations =
currentDevelopmentProcess.getConfigurations(); currentDevelopmentProcess.getConfigurations();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment