Allow unordered list of interfaces for ROS model and added a quick fix

to clean the model
ipa320 · Jun 9, 2021 · dc66ff8 · dc66ff8
2 parents faa441b + 9eb307c
commit dc66ff8
Show file tree

Hide file tree

Showing 58 changed files with 31,211 additions and 34,288 deletions.
diff --git a/...e/fraunhofer/ipa/componentInterface/ide/contentassist/antlr/ComponentInterfaceParser.java b/...e/fraunhofer/ipa/componentInterface/ide/contentassist/antlr/ComponentInterfaceParser.java
@@ -36,20 +36,20 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
 			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup(), "rule__ComponentInterface__Group__0");
 			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_4(), "rule__ComponentInterface__Group_4__0");
 			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_5(), "rule__ComponentInterface__Group_5__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_0(), "rule__ComponentInterface__Group_6_0__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_0_3(), "rule__ComponentInterface__Group_6_0_3__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_1(), "rule__ComponentInterface__Group_6_1__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_1_3(), "rule__ComponentInterface__Group_6_1_3__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_2(), "rule__ComponentInterface__Group_6_2__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_2_3(), "rule__ComponentInterface__Group_6_2_3__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6(), "rule__ComponentInterface__Group_6__0");
 			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_3(), "rule__ComponentInterface__Group_6_3__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_3_3(), "rule__ComponentInterface__Group_6_3_3__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_4(), "rule__ComponentInterface__Group_6_4__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_4_3(), "rule__ComponentInterface__Group_6_4_3__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_5(), "rule__ComponentInterface__Group_6_5__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_5_3(), "rule__ComponentInterface__Group_6_5_3__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_6(), "rule__ComponentInterface__Group_6_6__0");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_6_3(), "rule__ComponentInterface__Group_6_6_3__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_7(), "rule__ComponentInterface__Group_7__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_7_3(), "rule__ComponentInterface__Group_7_3__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_8(), "rule__ComponentInterface__Group_8__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_8_3(), "rule__ComponentInterface__Group_8_3__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_9(), "rule__ComponentInterface__Group_9__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_9_3(), "rule__ComponentInterface__Group_9_3__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_10(), "rule__ComponentInterface__Group_10__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_10_3(), "rule__ComponentInterface__Group_10_3__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_11(), "rule__ComponentInterface__Group_11__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_11_3(), "rule__ComponentInterface__Group_11_3__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_12(), "rule__ComponentInterface__Group_12__0");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_12_3(), "rule__ComponentInterface__Group_12_3__0");
 			builder.put(grammarAccess.getRosPublisherAccess().getGroup(), "rule__RosPublisher__Group__0");
 			builder.put(grammarAccess.getRosPublisherAccess().getGroup_4(), "rule__RosPublisher__Group_4__0");
 			builder.put(grammarAccess.getRosSubscriberAccess().getGroup(), "rule__RosSubscriber__Group__0");
@@ -76,20 +76,20 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
 			builder.put(grammarAccess.getComponentInterfaceAccess().getNameAssignment_3(), "rule__ComponentInterface__NameAssignment_3");
 			builder.put(grammarAccess.getComponentInterfaceAccess().getNameSpaceAssignment_4_1(), "rule__ComponentInterface__NameSpaceAssignment_4_1");
 			builder.put(grammarAccess.getComponentInterfaceAccess().getFromRosNodeAssignment_5_1(), "rule__ComponentInterface__FromRosNodeAssignment_5_1");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRospublisherAssignment_6_0_2(), "rule__ComponentInterface__RospublisherAssignment_6_0_2");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRospublisherAssignment_6_0_3_1(), "rule__ComponentInterface__RospublisherAssignment_6_0_3_1");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRossubscriberAssignment_6_1_2(), "rule__ComponentInterface__RossubscriberAssignment_6_1_2");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRossubscriberAssignment_6_1_3_1(), "rule__ComponentInterface__RossubscriberAssignment_6_1_3_1");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceserverAssignment_6_2_2(), "rule__ComponentInterface__RosserviceserverAssignment_6_2_2");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceserverAssignment_6_2_3_1(), "rule__ComponentInterface__RosserviceserverAssignment_6_2_3_1");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceclientAssignment_6_3_2(), "rule__ComponentInterface__RosserviceclientAssignment_6_3_2");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceclientAssignment_6_3_3_1(), "rule__ComponentInterface__RosserviceclientAssignment_6_3_3_1");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionserverAssignment_6_4_2(), "rule__ComponentInterface__RosactionserverAssignment_6_4_2");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionserverAssignment_6_4_3_1(), "rule__ComponentInterface__RosactionserverAssignment_6_4_3_1");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionclientAssignment_6_5_2(), "rule__ComponentInterface__RosactionclientAssignment_6_5_2");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionclientAssignment_6_5_3_1(), "rule__ComponentInterface__RosactionclientAssignment_6_5_3_1");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRosparameterAssignment_6_6_2(), "rule__ComponentInterface__RosparameterAssignment_6_6_2");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getRosparameterAssignment_6_6_3_1(), "rule__ComponentInterface__RosparameterAssignment_6_6_3_1");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRospublisherAssignment_6_2(), "rule__ComponentInterface__RospublisherAssignment_6_2");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRospublisherAssignment_6_3_1(), "rule__ComponentInterface__RospublisherAssignment_6_3_1");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRossubscriberAssignment_7_2(), "rule__ComponentInterface__RossubscriberAssignment_7_2");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRossubscriberAssignment_7_3_1(), "rule__ComponentInterface__RossubscriberAssignment_7_3_1");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceserverAssignment_8_2(), "rule__ComponentInterface__RosserviceserverAssignment_8_2");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceserverAssignment_8_3_1(), "rule__ComponentInterface__RosserviceserverAssignment_8_3_1");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceclientAssignment_9_2(), "rule__ComponentInterface__RosserviceclientAssignment_9_2");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceclientAssignment_9_3_1(), "rule__ComponentInterface__RosserviceclientAssignment_9_3_1");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionserverAssignment_10_2(), "rule__ComponentInterface__RosactionserverAssignment_10_2");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionserverAssignment_10_3_1(), "rule__ComponentInterface__RosactionserverAssignment_10_3_1");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionclientAssignment_11_2(), "rule__ComponentInterface__RosactionclientAssignment_11_2");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionclientAssignment_11_3_1(), "rule__ComponentInterface__RosactionclientAssignment_11_3_1");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRosparameterAssignment_12_2(), "rule__ComponentInterface__RosparameterAssignment_12_2");
+			builder.put(grammarAccess.getComponentInterfaceAccess().getRosparameterAssignment_12_3_1(), "rule__ComponentInterface__RosparameterAssignment_12_3_1");
 			builder.put(grammarAccess.getRosPublisherAccess().getNameAssignment_2(), "rule__RosPublisher__NameAssignment_2");
 			builder.put(grammarAccess.getRosPublisherAccess().getNsAssignment_4_1(), "rule__RosPublisher__NsAssignment_4_1");
 			builder.put(grammarAccess.getRosPublisherAccess().getPublisherAssignment_6(), "rule__RosPublisher__PublisherAssignment_6");
@@ -125,7 +125,6 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
 			builder.put(grammarAccess.getParameterStructAccess().getValueAssignment_1_2_2(), "rule__ParameterStruct__ValueAssignment_1_2_2");
 			builder.put(grammarAccess.getParameterStructMemberAccess().getNameAssignment_0(), "rule__ParameterStructMember__NameAssignment_0");
 			builder.put(grammarAccess.getParameterStructMemberAccess().getValueAssignment_3(), "rule__ParameterStructMember__ValueAssignment_3");
-			builder.put(grammarAccess.getComponentInterfaceAccess().getUnorderedGroup_6(), "rule__ComponentInterface__UnorderedGroup_6");
 		}
 	}