aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2018-03-02 08:49:00 -0500
committerHenrik Rentz-Reichert2018-03-02 08:49:00 -0500
commit7c9cb4308864f36e33d4c7ca5aa8c2d203473310 (patch)
treea07d5490eafac19c400f5ac31b74a52f98645903
parenteca8349e5c8e9f9032bf48c20a76eae90f75d609 (diff)
downloadorg.eclipse.etrice-7c9cb4308864f36e33d4c7ca5aa8c2d203473310.zip
org.eclipse.etrice-7c9cb4308864f36e33d4c7ca5aa8c2d203473310.tar.gz
org.eclipse.etrice-7c9cb4308864f36e33d4c7ca5aa8c2d203473310.tar.xz
Bug 531923 - [beahavior.ui] interface items without incoming messagesHEADmaster
should not occur in transition dialog Change-Id: Ibcae55693a7c8fc055a5a754b16927187fac1e93
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/dialogs/TransitionTriggerCompartment.java6
-rw-r--r--plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java2
2 files changed, 5 insertions, 3 deletions
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/dialogs/TransitionTriggerCompartment.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/dialogs/TransitionTriggerCompartment.java
index 7ff1866..1fcef75 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/dialogs/TransitionTriggerCompartment.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/dialogs/TransitionTriggerCompartment.java
@@ -364,7 +364,9 @@ public class TransitionTriggerCompartment {
memberAwareConfiguration.configureMemberAwareness(interfaceCombo);
for (AbstractInterfaceItem item : interfaceItems) {
- interfaceCombo.add(item.getDisplayName());
+ if (!item.getAllIncomingAbstractMessages().isEmpty()) {
+ interfaceCombo.add(item.getDisplayName());
+ }
}
}
@@ -475,7 +477,7 @@ public class TransitionTriggerCompartment {
idx = pos;
++pos;
}
- if (idx==-1) {
+ if (idx==-1 && !currentMsgs.isEmpty()) {
idx = 0;
mif.setMessage(currentMsgs.get(idx));
triggerViewer.refresh();
diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java
index 912f9f3..0b2fe8c 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java
+++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java
@@ -92,7 +92,7 @@ public abstract class AbstractPropertyDialog extends FormDialog {
if (!newStatus.getMessage().isEmpty())
validationText.setText(newStatus.getMessage());
- // iterate over all decoration and there validation status
+ // iterate over all decoration and their validation status
for(ControlDecoration decoration: decorations){
IObservableValue observableValue = decoratorMap.get(decoration);
IStatus status = (IStatus) observableValue.getValue();