Bug 531923 - [beahavior.ui] interface items without incoming messages

should not occur in transition dialog

Change-Id: Ibcae55693a7c8fc055a5a754b16927187fac1e93

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 7ff1866c3..1fcef7532 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 912f9f31a..0b2fe8c74 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();