Commit d159f90c authored by Simon Barner's avatar Simon Barner
Browse files

GREEN (with minor modifications)

Issue-Ref: 3812
Issue-Url: https://af3-developer.fortiss.org/issues/3812

Signed-off-by: Simon Barner's avatarSimon Barner <barner@fortiss.org>
parent 0a480492
AllocationPatternCompositeBackend.java e5ff1026f9d8f6116d638842d2a92bfb08555e32 YELLOW
ConstraintPatternHeader.java 2dd3ee55a70f6fbddd61c98904f679bf812a6283 YELLOW
AllocationPatternCompositeBackend.java e5ff1026f9d8f6116d638842d2a92bfb08555e32 GREEN
ConstraintPatternHeader.java 3f0b194738c36b3b666a74cb988660938e67e4f3 GREEN
ConstraintViewBackend.java 4099a405a81ccdf05e3f517d6b1de3f2f2b2d926 GREEN
FunctionCouplingCompositeBackend.java 5ac225275ab1ccc964d07b38bbee7463cecb124c YELLOW
FunctionCouplingCompositeBackend.java e5b7cabaa3535d500b9f3171cb4eccdb46548e06 GREEN
MemoryPatternBackend.java c452fa46dce1d8646a60ba48ee7bcdd2b39debd7 GREEN
SafetyPatternBackend.java bfb2d61e387f33cdff9270978253868d50308b43 GREEN
......@@ -63,8 +63,6 @@ public class ConstraintPatternHeader extends Composite implements IEventListener
lblName.setSize(38, 14);
lblName.setText("Name:");
// TODO (SB): Add another parameter that allows to set a better initial value for the name
// e.g., <task> -> <ecu> for the allocation pattern
txtName = new Text(this, SWT.BORDER);
txtName.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
txtName.setSize(83, 19);
......
......@@ -45,7 +45,6 @@ import org.fortiss.af3.exploration.ui.perspective.service.IEventListener;
import org.fortiss.af3.exploration.ui.perspective.targetdef.SuperSetContentProvider;
import org.fortiss.af3.platform.model.ExecutionUnit;
import org.fortiss.af3.task.model.Task;
import org.fortiss.tooling.base.model.element.IModelElement;
import org.fortiss.tooling.kernel.service.IPersistencyService;
import org.fortiss.tooling.kernel.ui.presentation.ModelElementLabelProvider;
......@@ -80,16 +79,14 @@ public class FunctionCouplingCompositeBackend extends FunctionCouplingCompositeG
btnDecoupling.addSelectionListener(new OperatorSelectionAdapter());
treeViewerSet1Selection.addSelectionChangedListener(new ISelectionChangedListener() {
/** */
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override
public void selectionChanged(SelectionChangedEvent event) {
Task task = checkAndPickFirst(event.getSelection(), Task.class);
btnAdd.setEnabled(task != null);
List<IModelElement> selectionList =
((IStructuredSelection)event.getSelection()).toList();
taskList = pickInstanceOf(Task.class, selectionList);
taskList = pickInstanceOf(Task.class,
((IStructuredSelection)event.getSelection()).toList());
updateConstraint();
}
});
......@@ -193,14 +190,14 @@ public class FunctionCouplingCompositeBackend extends FunctionCouplingCompositeG
// Calculate the name
String name;
if(btnCoupling.getSelection()) {
name = "Coupling";
name = "Coupling ";
} else {
name = "Decoupling";
name = "Decoupling ";
}
if(taskList.size() == 1) {
name = name + "{";
}
name = name + calcPatternName(taskList, ",");
name = name + calcPatternName(taskList, ", ");
if(taskList.size() == 1) {
name = name + "}";
}
......
......@@ -6,4 +6,4 @@ ExplorationModelElementFactory.java bb48b2d09b92efcb1b2d3e382555089bb7ed5db5 GRE
ExplorationReflectionUtils.java 62731e1cef32fe93f2c2017f93f5ba1f054d5197 GREEN
ExplorationUtils.java 3e317c851bd1a0b48fbec3fdbe039d8b66506c51 GREEN
ModelSnapshotExtractUtils.java dde8b42c5a7228478ffe8c67820bcac91e875562 GREEN
PatternFactoryUtils.java cd8b667ac74161df9be367f23618567d15384a92 YELLOW
PatternFactoryUtils.java bcb1d325aecfef12d29d4eb53b28fe59dbd20e9a GREEN
......@@ -490,7 +490,7 @@ public class PatternFactoryUtils {
if(constraintNamePart.length() > MAX_ALLOC_SIZE_PER_SIDE) {
constraintNamePart = constraintNamePart.substring(0, MAX_ALLOC_SIZE_PER_SIDE);
if(selectedElements.size() > 1) {
constraintNamePart = "{" + constraintNamePart + "...; ...}";
constraintNamePart = constraintNamePart + "...; ...}";
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment