inline split transformation, not working possilbly because of TelluIo…

…T/ThingML#242
SINTEF-9012 · Sep 3, 2018 · 654ab9e · 654ab9e
1 parent 78c730b
commit 654ab9e
Show file tree

Hide file tree

Showing 8 changed files with 421 additions and 36 deletions.
diff --git a/src/main/java/no/sintef/thingml/diversifier/CLI.java b/src/main/java/no/sintef/thingml/diversifier/CLI.java
@@ -19,6 +19,7 @@
 import no.sintef.thingml.diversifier.strategies.ShuffleMessages;
 import no.sintef.thingml.diversifier.strategies.ShuffleParameters;
 import no.sintef.thingml.diversifier.strategies.SplitMessages;
+import no.sintef.thingml.diversifier.strategies.SplitMessagesInline;
 import no.sintef.thingml.diversifier.strategies.UpsizeParameters;
 
 public class CLI {
@@ -79,6 +80,7 @@ public static void main(String[] args) throws Exception {
 				manager.add(new ShuffleParameters()); 
 			} else if (s.equals(Strategies.SPLIT_MSG.name)) {
 				manager.add(new SplitMessages()); 
+				//manager.add(new SplitMessagesInline());
 			} else if (s.equals(Strategies.UP_PARAM.name)) {
 				manager.add(new UpsizeParameters()); 
 			} else if (s.equals(Strategies.CODE_MSG.name)) {

diff --git a/src/main/java/no/sintef/thingml/diversifier/strategies/Helper.java b/src/main/java/no/sintef/thingml/diversifier/strategies/Helper.java
@@ -1,25 +1,37 @@
 package no.sintef.thingml.diversifier.strategies;
 
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.thingml.xtext.constraints.ThingMLHelpers;
+import org.thingml.xtext.helpers.TyperHelper;
 import org.thingml.xtext.thingML.InternalPort;
 import org.thingml.xtext.thingML.Port;
+import org.thingml.xtext.thingML.PrimitiveType;
 import org.thingml.xtext.thingML.Thing;
 import org.thingml.xtext.thingML.ThingMLFactory;
+import org.thingml.xtext.thingML.Type;
 
 public class Helper {
-    public static Port createOrGetInternalPort(Thing thing) {
-        Port result = null;
+
+	public static InternalPort createOrGetInternalPort(Thing thing) {        
         for (Port p : thing.getPorts()) {
             if (!(p instanceof InternalPort)) continue;
             if (p.getName().equals("diversified")) {
-                result = p;
-                break;
+                return (InternalPort)p;
             }
         }
-        if (result == null) {
-            result = ThingMLFactory.eINSTANCE.createInternalPort();
-            result.setName("diversified");
-            thing.getPorts().add(result);
-        }
+        final InternalPort result = ThingMLFactory.eINSTANCE.createInternalPort(); 
+        result.setName("diversified");
+        thing.getPorts().add(result);
         return result;
     }
+
+	public static PrimitiveType getPrimitiveType(Type t, EObject o) {
+		for(Type ty : ThingMLHelpers.findContainingModel(o).getTypes()) {
+			if (ty instanceof PrimitiveType && EcoreUtil.equals(TyperHelper.getBroadType(ty), t)) {
+				return (PrimitiveType) ty;
+			}
+		}
+		throw new NullPointerException("Cannot find Type " + t.getName() +"in the ThingML model containing " + o);	
+	}
 }
diff --git a/src/main/java/no/sintef/thingml/diversifier/strategies/SplitMessages.java b/src/main/java/no/sintef/thingml/diversifier/strategies/SplitMessages.java
@@ -46,6 +46,7 @@
 import no.sintef.thingml.diversifier.Manager;
 import no.sintef.thingml.diversifier.Mode;
 
+@Deprecated
 public class SplitMessages extends Strategy {
 
 	final Map<Thing, Map<Message, Port>> mappings = new HashMap<>();