Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EMAM2Middleware
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Middleware
Commits
3d3b83fc
Commit
3d3b83fc
authored
Jan 18, 2019
by
Alexander David Hellwig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove workaround for EMAComponentInstanceBuider::clone
parent
ac05acfa
Pipeline
#98278
passed with stages
in 8 minutes and 21 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
34 deletions
+5
-34
pom.xml
pom.xml
+4
-13
src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterHelper.java
.../monticar/generator/middleware/helpers/ClusterHelper.java
+1
-21
No files found.
pom.xml
View file @
3d3b83fc
...
@@ -18,15 +18,13 @@
...
@@ -18,15 +18,13 @@
<!-- .. SE-Libraries .................................................. -->
<!-- .. SE-Libraries .................................................. -->
<se-commons.version>
1.7.7
</se-commons.version>
<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-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>
<Embedded-montiarc-math-roscpp-generator.version>
0.1.1-SNAPSHOT
</Embedded-montiarc-math-roscpp-generator.version>
<EMADL.version>
0.2.4
</EMADL.version>
<EMADL.version>
0.2.4
</EMADL.version>
<EMADL2CPP.version>
0.2.6-SNAPSHOT
</EMADL2CPP.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 .................................................. -->
<!-- .. Libraries .................................................. -->
<guava.version>
18.0
</guava.version>
<guava.version>
18.0
</guava.version>
<junit.version>
4.12
</junit.version>
<junit.version>
4.12
</junit.version>
...
@@ -55,8 +53,8 @@
...
@@ -55,8 +53,8 @@
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
de.monticore.lang.monticar
</groupId>
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
struct
</artifactId>
<artifactId>
embedded-montiarc
</artifactId>
<version>
${
struct
.version}
</version>
<version>
${
embedded-montiarc
.version}
</version>
</dependency>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
...
@@ -109,13 +107,6 @@
...
@@ -109,13 +107,6 @@
</dependency>
</dependency>
<!-- MontiCore Dependencies -->
<!-- MontiCore Dependencies -->
<dependency>
<groupId>
de.monticore.lang
</groupId>
<artifactId>
Tagging
</artifactId>
<version>
${Tagging.version}
</version>
</dependency>
<dependency>
<dependency>
<groupId>
de.se_rwth.commons
</groupId>
<groupId>
de.se_rwth.commons
</groupId>
<artifactId>
se-commons-groovy
</artifactId>
<artifactId>
se-commons-groovy
</artifactId>
...
...
src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterHelper.java
View file @
3d3b83fc
...
@@ -135,7 +135,7 @@ public class ClusterHelper {
...
@@ -135,7 +135,7 @@ public class ClusterHelper {
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
Set
<
ResolvingFilter
<?
extends
Symbol
>>
resolvingFilters
=
inst
.
getSpannedScope
().
getResolvingFilters
();
Set
<
ResolvingFilter
<?
extends
Symbol
>>
resolvingFilters
=
inst
.
getSpannedScope
().
getResolvingFilters
();
List
<
EMAComponentInstanceSymbol
>
tmpSubcomps
=
cluster
.
stream
().
map
(
ClusterHelper:
:
realC
lone
).
collect
(
Collectors
.
toList
());
List
<
EMAComponentInstanceSymbol
>
tmpSubcomps
=
cluster
.
stream
().
map
(
EMAComponentInstanceBuilder:
:
c
lone
).
collect
(
Collectors
.
toList
());
tmpSubcomps
.
forEach
(
sc
->
((
CommonScope
)
sc
.
getSpannedScope
()).
setResolvingFilters
(
resolvingFilters
));
tmpSubcomps
.
forEach
(
sc
->
((
CommonScope
)
sc
.
getSpannedScope
()).
setResolvingFilters
(
resolvingFilters
));
EMAComponentInstanceSymbol
res
=
new
EMAComponentInstanceBuilder
()
EMAComponentInstanceSymbol
res
=
new
EMAComponentInstanceBuilder
()
.
setName
(
clusterName
)
.
setName
(
clusterName
)
...
@@ -152,24 +152,4 @@ public class ClusterHelper {
...
@@ -152,24 +152,4 @@ public class ClusterHelper {
return
res
;
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
();
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment