From 3d3b83fcc74cfec6120434d20af948ffdde8430a Mon Sep 17 00:00:00 2001
From: Alexander Hellwig <alexander.hellwig@rwth-aachen.de>
Date: Fri, 18 Jan 2019 18:37:01 +0100
Subject: [PATCH] remove workaround for EMAComponentInstanceBuider::clone

---
 pom.xml                                       | 17 ++++----------
 .../middleware/helpers/ClusterHelper.java     | 22 +------------------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index 33240f4..ac5e671 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,15 +18,13 @@
 
         <!-- .. SE-Libraries .................................................. -->
         <se-commons.version>1.7.7</se-commons.version>
-        <!--TODO: remove with update to next emam version -->
-        <struct.version>0.0.18-SNAPSHOT</struct.version>
+
+        <embedded-montiarc.version>0.1.9-SNAPSHOT</embedded-montiarc.version>
         <Embedded-montiarc-math-generator.version>0.1.3-SNAPSHOT</Embedded-montiarc-math-generator.version>
         <Embedded-montiarc-math-roscpp-generator.version>0.1.1-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
         <EMADL.version>0.2.4</EMADL.version>
         <EMADL2CPP.version>0.2.6-SNAPSHOT</EMADL2CPP.version>
 
-        <!--TODO: remove with update to new emam version-->
-        <Tagging.version>0.0.6</Tagging.version>
         <!-- .. Libraries .................................................. -->
         <guava.version>18.0</guava.version>
         <junit.version>4.12</junit.version>
@@ -55,8 +53,8 @@
     <dependencies>
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>struct</artifactId>
-            <version>${struct.version}</version>
+            <artifactId>embedded-montiarc</artifactId>
+            <version>${embedded-montiarc.version}</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
@@ -109,13 +107,6 @@
         </dependency>
 
         <!-- MontiCore Dependencies -->
-
-        <dependency>
-            <groupId>de.monticore.lang</groupId>
-            <artifactId>Tagging</artifactId>
-            <version>${Tagging.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>de.se_rwth.commons</groupId>
             <artifactId>se-commons-groovy</artifactId>
diff --git a/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterHelper.java b/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterHelper.java
index e044edc..4d51dbe 100644
--- a/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterHelper.java
+++ b/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterHelper.java
@@ -135,7 +135,7 @@ public class ClusterHelper {
                 .collect(Collectors.toList());
 
         Set<ResolvingFilter<? extends Symbol>> resolvingFilters = inst.getSpannedScope().getResolvingFilters();
-        List<EMAComponentInstanceSymbol> tmpSubcomps = cluster.stream().map(ClusterHelper::realClone).collect(Collectors.toList());
+        List<EMAComponentInstanceSymbol> tmpSubcomps = cluster.stream().map(EMAComponentInstanceBuilder::clone).collect(Collectors.toList());
         tmpSubcomps.forEach(sc -> ((CommonScope) sc.getSpannedScope()).setResolvingFilters(resolvingFilters));
         EMAComponentInstanceSymbol res = new EMAComponentInstanceBuilder()
                 .setName(clusterName)
@@ -152,24 +152,4 @@ public class ClusterHelper {
         return res;
     }
 
-    //TODO: ports, package name are not cloned in EMAComponentInstanceBuilder::clone
-    private static EMAComponentInstanceSymbol realClone(EMAComponentInstanceSymbol inst) {
-        Collection<EMAComponentInstanceSymbol> subcomps = inst.getSubComponents().stream().map(ClusterHelper::realClone).collect(Collectors.toList());
-        Collection<EMAConnectorSymbol> connectors = inst.getConnectorInstances().stream().map(EMAConnectorBuilder::clone).collect(Collectors.toList());
-        Collection<EMAPortSymbol> ports = inst.getPortInstanceList().stream().map(EMAPortBuilder::clone).collect(Collectors.toList());
-
-        EMAComponentInstanceBuilder res = (new EMAComponentInstanceBuilder());
-
-        ports.forEach(res::addPort);
-
-        res.setName(inst.getName())
-            .setPackageName(inst.getPackageName())
-            .setSymbolReference(inst.getComponentType())
-            .addConnectors(connectors)
-            .addSubComponents(subcomps)
-            .addResolutionDeclarationSymbols(inst.getResolutionDeclarationSymbols());
-
-        return res.build();
-    }
-
 }
-- 
GitLab