Merge branch 'MontiCore5' into 'master'

Update to Monticore 5

See merge request !3

pom.xml

@@ -9,23 +9,23 @@
 
   <groupId>de.monticore.lang.monticar</groupId>
   <artifactId>embedded-montiarc-math-rosmsg-generator</artifactId>
-  <version>0.0.2-SNAPSHOT</version>
+  <version>0.0.3-SNAPSHOT</version>
 
   <!-- == PROJECT DEPENDENCIES ============================================= -->
 
   <properties>
 
     <!-- .. SE-Libraries .................................................. -->
-    <monticore.version>4.5.4-SNAPSHOT</monticore.version>
+    <monticore.version>5.0.0</monticore.version>
     <se-commons.version>1.7.7</se-commons.version>
     <mc.grammars.assembly.version>0.0.6-SNAPSHOT</mc.grammars.assembly.version>
     <SIUnit.version>0.0.10-SNAPSHOT</SIUnit.version>
-    <Common-MontiCar.version>0.0.13-SNAPSHOT</Common-MontiCar.version>
-    <Embedded-MontiArc.version>0.0.17-SNAPSHOT</Embedded-MontiArc.version>
-    <Embedded-MontiArc-Behaviour.version>0.0.11-SNAPSHOT</Embedded-MontiArc-Behaviour.version>
-    <Math.version>0.0.11</Math.version>
-    <Embedded-MontiArc-Math.version>0.0.14-SNAPSHOT</Embedded-MontiArc-Math.version>
-    <Embedded-montiarc-math-generator.version>0.0.11-SNAPSHOT</Embedded-montiarc-math-generator.version>
+    <Common-MontiCar.version>0.0.14-SNAPSHOT</Common-MontiCar.version>
+    <Embedded-MontiArc.version>0.0.18-SNAPSHOT</Embedded-MontiArc.version>
+    <Embedded-MontiArc-Behaviour.version>0.0.14-SNAPSHOT</Embedded-MontiArc-Behaviour.version>
+    <Math.version>0.0.14-SNAPSHOT</Math.version>
+    <Embedded-MontiArc-Math.version>0.0.15-SNAPSHOT</Embedded-MontiArc-Math.version>
+    <Embedded-montiarc-math-generator.version>0.0.15-SNAPSHOT</Embedded-montiarc-math-generator.version>
     <!-- .. Libraries .................................................. -->
     <guava.version>18.0</guava.version>
     <junit.version>4.12</junit.version>

src/main/java/de/monticore/lang/monticar/generator/rosmsg/GeneratorRosMsg.java

@@ -151,13 +151,13 @@ public class GeneratorRosMsg {
             ASTCommonMatrixType matrixType = (ASTCommonMatrixType) ((MCASTTypeSymbol) type).getAstType();
             String tmpMsgName = "";
             String tmpTypeName = "";
-            if (matrixType.getElementType().isIsRational()) {
+            if (matrixType.getElementType().isRational()) {
                 tmpMsgName = "std_msgs/Float64MultiArray";
                 tmpTypeName = "float64";
-            } else if (matrixType.getElementType().isIsWholeNumberNumber()) {
+            } else if (matrixType.getElementType().isWholeNumber()) {
                 tmpMsgName = "std_msgs/Int32MultiArray";
                 tmpTypeName = "int32";
-            } else if (matrixType.getElementType().isIsBoolean()) {
+            } else if (matrixType.getElementType().isBoolean()) {
                 tmpMsgName = "std_msgs/ByteMultiArray";
                 tmpTypeName = "byte";
             } else {

src/test/java/de/monticore/lang/monticar/generator/rosmsg/BasicTypesTest.java

@@ -59,7 +59,7 @@ public class BasicTypesTest extends AbstractSymtabTest {
         ExpandedComponentInstanceSymbol component = symtab.<ExpandedComponentInstanceSymbol>resolve("tests.matrixTypesComp", ExpandedComponentInstanceSymbol.KIND).orElse(null);
         assertNotNull(component);
 
-        Map<String, RosMsg> portToMsg = component.getPorts().stream()
+        Map<String, RosMsg> portToMsg = component.getPortsList().stream()
                 .collect(Collectors.toMap(CommonSymbol::getName, p -> GeneratorRosMsg.getRosType("std_msgs", p.getTypeReference())));
 
         assertTrue(portToMsg.get("in1").getName().equals("std_msgs/Float64MultiArray"));