[core.etmap] introduced ETMapUtil

this util is initialized with the models and creates
maps from actor instance to thread and node

9 files changed, 29 insertions, 29 deletions

diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.ecore b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.ecore
index 7d99d9f40..ac64983e0 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.ecore
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.ecore
@@ -23,7 +23,7 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ThreadMapping">

     <eStructuralFeatures xsi:type="ecore:EReference" name="logicalThread" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.ecore#//LogicalThread"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="physicalThread" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore#//PhysThread"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="physicalThread" eType="ecore:EClass ../../../../../../../org.eclipse.etrice.core.etphys/src-gen/org/eclipse/etrice/core/etphys/ETPhys.ecore#//PhysicalThread"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Import">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="importedNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.xmi b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.xmi
index df149a129..6292a1945 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.xmi
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/ETMap.xmi
@@ -112,7 +112,7 @@
         <elements xsi:type="xtext:Assignment" feature="physicalThread" operator="=">

           <terminal xsi:type="xtext:CrossReference">

             <type metamodel="/0/@metamodelDeclarations.3">

-              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/etrice/core/etphys/ETPhys#//PhysThread"/>

+              <classifier xsi:type="ecore:EClass" href="http://www.eclipse.org/etrice/core/etphys/ETPhys#//PhysicalThread"/>

             </type>

             <terminal xsi:type="xtext:RuleCall" rule="/1/@rules.0"/>

           </terminal>

diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/ThreadMapping.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/ThreadMapping.java
index ff1655e94..e06028c72 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/ThreadMapping.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/ThreadMapping.java
@@ -4,7 +4,7 @@ package org.eclipse.etrice.core.etmap.eTMap;
 

 import org.eclipse.emf.ecore.EObject;

 

-import org.eclipse.etrice.core.etphys.eTPhys.PhysThread;

+import org.eclipse.etrice.core.etphys.eTPhys.PhysicalThread;

 

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

 

@@ -62,12 +62,12 @@ public interface ThreadMapping extends EObject
    * </p>

    * <!-- end-user-doc -->

    * @return the value of the '<em>Physical Thread</em>' reference.

-   * @see #setPhysicalThread(PhysThread)

+   * @see #setPhysicalThread(PhysicalThread)

    * @see org.eclipse.etrice.core.etmap.eTMap.ETMapPackage#getThreadMapping_PhysicalThread()

    * @model

    * @generated

    */

-  PhysThread getPhysicalThread();

+  PhysicalThread getPhysicalThread();

 

   /**

    * Sets the value of the '{@link org.eclipse.etrice.core.etmap.eTMap.ThreadMapping#getPhysicalThread <em>Physical Thread</em>}' reference.

@@ -77,6 +77,6 @@ public interface ThreadMapping extends EObject
    * @see #getPhysicalThread()

    * @generated

    */

-  void setPhysicalThread(PhysThread value);

+  void setPhysicalThread(PhysicalThread value);

 

 } // ThreadMapping

diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ETMapPackageImpl.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ETMapPackageImpl.java
index 498330dc5..d13482057 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ETMapPackageImpl.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ETMapPackageImpl.java
@@ -417,7 +417,7 @@ public class ETMapPackageImpl extends EPackageImpl implements ETMapPackage
 

     initEClass(threadMappingEClass, ThreadMapping.class, "ThreadMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEReference(getThreadMapping_LogicalThread(), theRoomPackage.getLogicalThread(), null, "logicalThread", null, 0, 1, ThreadMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-    initEReference(getThreadMapping_PhysicalThread(), theETPhysPackage.getPhysThread(), null, "physicalThread", null, 0, 1, ThreadMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getThreadMapping_PhysicalThread(), theETPhysPackage.getPhysicalThread(), null, "physicalThread", null, 0, 1, ThreadMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEAttribute(getImport_ImportedNamespace(), ecorePackage.getEString(), "importedNamespace", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ThreadMappingImpl.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ThreadMappingImpl.java
index b0e956f74..efe454c52 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ThreadMappingImpl.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/eTMap/impl/ThreadMappingImpl.java
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.etrice.core.etmap.eTMap.ETMapPackage;

 import org.eclipse.etrice.core.etmap.eTMap.ThreadMapping;

 

-import org.eclipse.etrice.core.etphys.eTPhys.PhysThread;

+import org.eclipse.etrice.core.etphys.eTPhys.PhysicalThread;

 

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

 

@@ -51,7 +51,7 @@ public class ThreadMappingImpl extends MinimalEObjectImpl.Container implements T
    * @generated

    * @ordered

    */

-  protected PhysThread physicalThread;

+  protected PhysicalThread physicalThread;

 

   /**

    * <!-- begin-user-doc -->

@@ -122,12 +122,12 @@ public class ThreadMappingImpl extends MinimalEObjectImpl.Container implements T
    * <!-- end-user-doc -->

    * @generated

    */

-  public PhysThread getPhysicalThread()

+  public PhysicalThread getPhysicalThread()

   {

     if (physicalThread != null && physicalThread.eIsProxy())

     {

       InternalEObject oldPhysicalThread = (InternalEObject)physicalThread;

-      physicalThread = (PhysThread)eResolveProxy(oldPhysicalThread);

+      physicalThread = (PhysicalThread)eResolveProxy(oldPhysicalThread);

       if (physicalThread != oldPhysicalThread)

       {

         if (eNotificationRequired())

@@ -142,7 +142,7 @@ public class ThreadMappingImpl extends MinimalEObjectImpl.Container implements T
    * <!-- end-user-doc -->

    * @generated

    */

-  public PhysThread basicGetPhysicalThread()

+  public PhysicalThread basicGetPhysicalThread()

   {

     return physicalThread;

   }

@@ -152,9 +152,9 @@ public class ThreadMappingImpl extends MinimalEObjectImpl.Container implements T
    * <!-- end-user-doc -->

    * @generated

    */

-  public void setPhysicalThread(PhysThread newPhysicalThread)

+  public void setPhysicalThread(PhysicalThread newPhysicalThread)

   {

-    PhysThread oldPhysicalThread = physicalThread;

+    PhysicalThread oldPhysicalThread = physicalThread;

     physicalThread = newPhysicalThread;

     if (eNotificationRequired())

       eNotify(new ENotificationImpl(this, Notification.SET, ETMapPackage.THREAD_MAPPING__PHYSICAL_THREAD, oldPhysicalThread, physicalThread));

@@ -194,7 +194,7 @@ public class ThreadMappingImpl extends MinimalEObjectImpl.Container implements T
         setLogicalThread((LogicalThread)newValue);

         return;

       case ETMapPackage.THREAD_MAPPING__PHYSICAL_THREAD:

-        setPhysicalThread((PhysThread)newValue);

+        setPhysicalThread((PhysicalThread)newValue);

         return;

     }

     super.eSet(featureID, newValue);

@@ -214,7 +214,7 @@ public class ThreadMappingImpl extends MinimalEObjectImpl.Container implements T
         setLogicalThread((LogicalThread)null);

         return;

       case ETMapPackage.THREAD_MAPPING__PHYSICAL_THREAD:

-        setPhysicalThread((PhysThread)null);

+        setPhysicalThread((PhysicalThread)null);

         return;

     }

     super.eUnset(featureID);

diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g
index d1c04e590..35cb0d594 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMap.g
@@ -360,7 +360,7 @@ ruleThreadMapping returns [EObject current=null]
         }
 	otherlv_3=RULE_ID
 	{
-		newLeafNode(otherlv_3, grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysThreadCrossReference_3_0()); 
+		newLeafNode(otherlv_3, grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysicalThreadCrossReference_3_0()); 
 	}
 
 )
diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapParser.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapParser.java
index 5cfa932fd..1f0f08fef 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapParser.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/parser/antlr/internal/InternalETMapParser.java
@@ -801,7 +801,7 @@ public class InternalETMapParser extends AbstractInternalAntlrParser {
                     

             otherlv_3=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleThreadMapping717); 

 

-            		newLeafNode(otherlv_3, grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysThreadCrossReference_3_0()); 

+            		newLeafNode(otherlv_3, grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysicalThreadCrossReference_3_0()); 

             	

 

             }

diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSemanticSequencer.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSemanticSequencer.java
index 8b356069c..b56684c8b 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSemanticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/serializer/ETMapSemanticSequencer.java
@@ -101,7 +101,7 @@ public class ETMapSemanticSequencer extends AbstractDelegatingSemanticSequencer
 	

 	/**

 	 * Constraint:

-	 *     (logicalThread=[LogicalThread|ID] physicalThread=[PhysThread|ID])

+	 *     (logicalThread=[LogicalThread|ID] physicalThread=[PhysicalThread|ID])

 	 */

 	protected void sequence_ThreadMapping(EObject context, ThreadMapping semanticObject) {

 		if(errorAcceptor != null) {

@@ -113,7 +113,7 @@ public class ETMapSemanticSequencer extends AbstractDelegatingSemanticSequencer
 		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);

 		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);

 		feeder.accept(grammarAccess.getThreadMappingAccess().getLogicalThreadLogicalThreadIDTerminalRuleCall_1_0_1(), semanticObject.getLogicalThread());

-		feeder.accept(grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysThreadIDTerminalRuleCall_3_0_1(), semanticObject.getPhysicalThread());

+		feeder.accept(grammarAccess.getThreadMappingAccess().getPhysicalThreadPhysicalThreadIDTerminalRuleCall_3_0_1(), semanticObject.getPhysicalThread());

 		feeder.finish();

 	}

 }

diff --git a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java
index 8e22053e9..677a3a386 100644
--- a/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.etmap/src-gen/org/eclipse/etrice/core/etmap/services/ETMapGrammarAccess.java
@@ -211,15 +211,15 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		private final RuleCall cLogicalThreadLogicalThreadIDTerminalRuleCall_1_0_1 = (RuleCall)cLogicalThreadLogicalThreadCrossReference_1_0.eContents().get(1);
 		private final Keyword cHyphenMinusGreaterThanSignKeyword_2 = (Keyword)cGroup.eContents().get(2);
 		private final Assignment cPhysicalThreadAssignment_3 = (Assignment)cGroup.eContents().get(3);
-		private final CrossReference cPhysicalThreadPhysThreadCrossReference_3_0 = (CrossReference)cPhysicalThreadAssignment_3.eContents().get(0);
-		private final RuleCall cPhysicalThreadPhysThreadIDTerminalRuleCall_3_0_1 = (RuleCall)cPhysicalThreadPhysThreadCrossReference_3_0.eContents().get(1);
+		private final CrossReference cPhysicalThreadPhysicalThreadCrossReference_3_0 = (CrossReference)cPhysicalThreadAssignment_3.eContents().get(0);
+		private final RuleCall cPhysicalThreadPhysicalThreadIDTerminalRuleCall_3_0_1 = (RuleCall)cPhysicalThreadPhysicalThreadCrossReference_3_0.eContents().get(1);
 		
 		//ThreadMapping:
 		//
-		//	"ThreadMapping" logicalThread=[room::LogicalThread] "->" physicalThread=[phys::PhysThread];
+		//	"ThreadMapping" logicalThread=[room::LogicalThread] "->" physicalThread=[phys::PhysicalThread];
 		public ParserRule getRule() { return rule; }
 
-		//"ThreadMapping" logicalThread=[room::LogicalThread] "->" physicalThread=[phys::PhysThread]
+		//"ThreadMapping" logicalThread=[room::LogicalThread] "->" physicalThread=[phys::PhysicalThread]
 		public Group getGroup() { return cGroup; }
 
 		//"ThreadMapping"
@@ -237,14 +237,14 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 		//"->"
 		public Keyword getHyphenMinusGreaterThanSignKeyword_2() { return cHyphenMinusGreaterThanSignKeyword_2; }
 
-		//physicalThread=[phys::PhysThread]
+		//physicalThread=[phys::PhysicalThread]
 		public Assignment getPhysicalThreadAssignment_3() { return cPhysicalThreadAssignment_3; }
 
-		//[phys::PhysThread]
-		public CrossReference getPhysicalThreadPhysThreadCrossReference_3_0() { return cPhysicalThreadPhysThreadCrossReference_3_0; }
+		//[phys::PhysicalThread]
+		public CrossReference getPhysicalThreadPhysicalThreadCrossReference_3_0() { return cPhysicalThreadPhysicalThreadCrossReference_3_0; }
 
 		//ID
-		public RuleCall getPhysicalThreadPhysThreadIDTerminalRuleCall_3_0_1() { return cPhysicalThreadPhysThreadIDTerminalRuleCall_3_0_1; }
+		public RuleCall getPhysicalThreadPhysicalThreadIDTerminalRuleCall_3_0_1() { return cPhysicalThreadPhysicalThreadIDTerminalRuleCall_3_0_1; }
 	}
 
 	public class ImportElements extends AbstractParserRuleElementFinder {
@@ -432,7 +432,7 @@ public class ETMapGrammarAccess extends AbstractGrammarElementFinder {
 
 	//ThreadMapping:
 	//
-	//	"ThreadMapping" logicalThread=[room::LogicalThread] "->" physicalThread=[phys::PhysThread];
+	//	"ThreadMapping" logicalThread=[room::LogicalThread] "->" physicalThread=[phys::PhysicalThread];
 	public ThreadMappingElements getThreadMappingAccess() {
 		return (pThreadMapping != null) ? pThreadMapping : (pThreadMapping = new ThreadMappingElements());
 	}