Merge branch 'change/10794/1'

Conflicts:
	plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/AbstractExecutionValidator.java
	plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/ActiveRules.java
	plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/ProposalGenerator.java
	plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/ReachabilityCheck.java
	plugins/org.eclipse.etrice.abstractexec.behavior/src/org/eclipse/etrice/abstractexec/behavior/SemanticsCheck.java

3 files changed, 11 insertions, 1 deletions

diff --git a/plugins/org.eclipse.etrice.core.room.ui/icons/LogicalThread.gif b/plugins/org.eclipse.etrice.core.room.ui/icons/LogicalThread.gif
new file mode 100644
index 000000000..9767cf936
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.room.ui/icons/LogicalThread.gif
diff --git a/plugins/org.eclipse.etrice.core.room.ui/icons/actorInstanceMapping.gif b/plugins/org.eclipse.etrice.core.room.ui/icons/actorInstanceMapping.gif
new file mode 100644
index 000000000..c569c7131
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.room.ui/icons/actorInstanceMapping.gif
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java
index 29920a79e..49e4862a9 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java
@@ -25,6 +25,7 @@ import org.eclipse.etrice.core.room.ExternalPort;
 import org.eclipse.etrice.core.room.ExternalType;

 import org.eclipse.etrice.core.room.Import;

 import org.eclipse.etrice.core.room.LogicalSystem;

+import org.eclipse.etrice.core.room.LogicalThread;

 import org.eclipse.etrice.core.room.Message;

 import org.eclipse.etrice.core.room.Operation;

 import org.eclipse.etrice.core.room.Port;

@@ -148,7 +149,7 @@ public class RoomLabelProvider extends DefaultEObjectLabelProvider {
 	String image(RefinedState state) {

 		return "RefinedState.gif";

 	}

-

+	

 	String image(ServiceImplementation svc) {

 		return "ServiceImpl.gif";

 	}

@@ -193,6 +194,12 @@ public class RoomLabelProvider extends DefaultEObjectLabelProvider {
 					return "Port.gif";

 	}

 	

+	String image(ActorInstanceMapping aim) {

+		return "actorInstanceMapping.gif";

+	}

+	String image(LogicalThread lt) {

+		return "LogicalThread.gif";

+	} 

 	// custom labels

 	

 	StyledString text(Import im) {

@@ -336,6 +343,9 @@ public class RoomLabelProvider extends DefaultEObjectLabelProvider {
 		return path+" -> "+aim.getThread().getName();

 	}

 	

+	String text (LogicalThread lt ) {

+		return lt.getName();		

+	}

 	private Styler getKeywordStyler() {

 		if (keywordStyler==null) {

 			FontDescriptor font = JFaceResources.getFontDescriptor(JFaceResources.TEXT_FONT);