diff --git a/pom.xml b/pom.xml index 33240f494910610c0a4619ae0dfe07d1c55c3acb..ac5e6716c6e804f38062697b582406e45daa3144 100644 --- a/pom.xml +++ b/pom.xml @@ -18,15 +18,13 @@ 1.7.7 - - 0.0.18-SNAPSHOT + + 0.1.9-SNAPSHOT 0.1.3-SNAPSHOT 0.1.1-SNAPSHOT 0.2.4 0.2.6-SNAPSHOT - - 0.0.6 18.0 4.12 @@ -55,8 +53,8 @@ de.monticore.lang.monticar - struct - ${struct.version} + embedded-montiarc + ${embedded-montiarc.version} @@ -109,13 +107,6 @@ - - - de.monticore.lang - Tagging - ${Tagging.version} - - de.se_rwth.commons se-commons-groovy 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 e044edca6adb5278d2b433e6e5d6710063f79d9a..4d51dbe65a53a62de43fbc0e7a5c30af2e9ad595 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> resolvingFilters = inst.getSpannedScope().getResolvingFilters(); - List tmpSubcomps = cluster.stream().map(ClusterHelper::realClone).collect(Collectors.toList()); + List 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 subcomps = inst.getSubComponents().stream().map(ClusterHelper::realClone).collect(Collectors.toList()); - Collection connectors = inst.getConnectorInstances().stream().map(EMAConnectorBuilder::clone).collect(Collectors.toList()); - Collection 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(); - } - }