Review messages, services and actions specifications: grammar, lexico…

plugins/de.fraunhofer.ipa.ros.edit/plugin.properties

@@ -192,3 +192,12 @@ _UI_QualityOfService_History_feature = History
 _UI_QualityOfService_Depth_feature = Depth
 _UI_QualityOfService_Reliability_feature = Reliability
 _UI_QualityOfService_Durability_feature = Durability
+_UI_TopicSpecRef_Reference_feature = Reference
+_UI_SpecRef_type = Spec Ref
+_UI_SpecRef_Reference_feature = Reference
+_UI_ArraySpecRef_type = Array Spec Ref
+_UI_ArraySpecRef_Reference_feature = Reference
+_UI_TopicSpecMsgRef_type = Topic Spec Msg Ref
+_UI_TopicSpecMsgRef_Reference_feature = Reference
+_UI_ArrayTopicSpecMsgRef_type = Array Topic Spec Msg Ref
+_UI_ArrayTopicSpecMsgRef_Reference_feature = Reference

plugins/de.fraunhofer.ipa.ros.edit/src/primitives/provider/MessagePartItemProvider.java

@@ -320,12 +320,12 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors
         newChildDescriptors.add
             (createChildParameter
                 (PrimitivesPackage.Literals.MESSAGE_PART__TYPE,
-                 RosFactory.eINSTANCE.createTopicSpecRef()));
+                 RosFactory.eINSTANCE.createTopicSpecMsgRef()));
 
         newChildDescriptors.add
             (createChildParameter
                 (PrimitivesPackage.Literals.MESSAGE_PART__TYPE,
-                 RosFactory.eINSTANCE.createArrayTopicSpecRef()));
+                 RosFactory.eINSTANCE.createArrayTopicSpecMsgRef()));
     }
 
     /**

plugins/de.fraunhofer.ipa.ros.edit/src/ros/provider/ArrayTopicSpecRefItemProvider.java → plugins/de.fraunhofer.ipa.ros.edit/src/ros/provider/ArrayTopicSpecMsgRefItemProvider.java

@@ -19,19 +19,19 @@
 import ros.RosPackage;
 
 /**
- * This is the item provider adapter for a {@link ros.ArrayTopicSpecRef} object.
+ * This is the item provider adapter for a {@link ros.ArrayTopicSpecMsgRef} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ArrayTopicSpecRefItemProvider extends AbstractTypeItemProvider {
+public class ArrayTopicSpecMsgRefItemProvider extends AbstractTypeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ArrayTopicSpecRefItemProvider(AdapterFactory adapterFactory) {
+	public ArrayTopicSpecMsgRefItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -46,25 +46,25 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addTopicSpecPropertyDescriptor(object);
+			addReferencePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This adds a property descriptor for the Topic Spec feature.
+	 * This adds a property descriptor for the Reference feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addTopicSpecPropertyDescriptor(Object object) {
+	protected void addReferencePropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_ArrayTopicSpecRef_TopicSpec_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ArrayTopicSpecRef_TopicSpec_feature", "_UI_ArrayTopicSpecRef_type"),
-				 RosPackage.Literals.ARRAY_TOPIC_SPEC_REF__TOPIC_SPEC,
+				 getString("_UI_ArrayTopicSpecMsgRef_Reference_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ArrayTopicSpecMsgRef_Reference_feature", "_UI_ArrayTopicSpecMsgRef_type"),
+				 RosPackage.Literals.ARRAY_TOPIC_SPEC_MSG_REF__REFERENCE,
 				 true,
 				 false,
 				 true,
@@ -74,14 +74,14 @@ protected void addTopicSpecPropertyDescriptor(Object object) {
 	}
 
 	/**
-	 * This returns ArrayTopicSpecRef.gif.
+	 * This returns ArrayTopicSpecMsgRef.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArrayTopicSpecRef"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArrayTopicSpecMsgRef"));
 	}
 
 	/**
@@ -92,7 +92,7 @@ public Object getImage(Object object) {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_ArrayTopicSpecRef_type");
+		return getString("_UI_ArrayTopicSpecMsgRef_type");
 	}
 
 

plugins/de.fraunhofer.ipa.ros.edit/src/ros/provider/RosItemProviderAdapterFactory.java

@@ -1107,52 +1107,52 @@ public Adapter createQualityOfServiceAdapter() {
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link ros.TopicSpecRef} instances.
+     * This keeps track of the one adapter used for all {@link ros.TopicSpecMsgRef} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected TopicSpecRefItemProvider topicSpecRefItemProvider;
+    protected TopicSpecMsgRefItemProvider topicSpecMsgRefItemProvider;
 
                 /**
-     * This creates an adapter for a {@link ros.TopicSpecRef}.
+     * This creates an adapter for a {@link ros.TopicSpecMsgRef}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createTopicSpecRefAdapter() {
-        if (topicSpecRefItemProvider == null) {
-            topicSpecRefItemProvider = new TopicSpecRefItemProvider(this);
+    public Adapter createTopicSpecMsgRefAdapter() {
+        if (topicSpecMsgRefItemProvider == null) {
+            topicSpecMsgRefItemProvider = new TopicSpecMsgRefItemProvider(this);
         }
 
-        return topicSpecRefItemProvider;
+        return topicSpecMsgRefItemProvider;
     }
 
                 /**
-     * This keeps track of the one adapter used for all {@link ros.ArrayTopicSpecRef} instances.
+     * This keeps track of the one adapter used for all {@link ros.ArrayTopicSpecMsgRef} instances.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
-    protected ArrayTopicSpecRefItemProvider arrayTopicSpecRefItemProvider;
+    protected ArrayTopicSpecMsgRefItemProvider arrayTopicSpecMsgRefItemProvider;
 
-                /**
-     * This creates an adapter for a {@link ros.ArrayTopicSpecRef}.
+                                                                /**
+     * This creates an adapter for a {@link ros.ArrayTopicSpecMsgRef}.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
     @Override
-    public Adapter createArrayTopicSpecRefAdapter() {
-        if (arrayTopicSpecRefItemProvider == null) {
-            arrayTopicSpecRefItemProvider = new ArrayTopicSpecRefItemProvider(this);
+    public Adapter createArrayTopicSpecMsgRefAdapter() {
+        if (arrayTopicSpecMsgRefItemProvider == null) {
+            arrayTopicSpecMsgRefItemProvider = new ArrayTopicSpecMsgRefItemProvider(this);
         }
 
-        return arrayTopicSpecRefItemProvider;
+        return arrayTopicSpecMsgRefItemProvider;
     }
 
-                /**
+                                                                /**
      * This returns the root adapter factory that contains this factory.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1302,8 +1302,8 @@ public void dispose() {
         if (parameterDateItemProvider != null) parameterDateItemProvider.dispose();
         if (amentPackageItemProvider != null) amentPackageItemProvider.dispose();
         if (qualityOfServiceItemProvider != null) qualityOfServiceItemProvider.dispose();
-        if (topicSpecRefItemProvider != null) topicSpecRefItemProvider.dispose();
-        if (arrayTopicSpecRefItemProvider != null) arrayTopicSpecRefItemProvider.dispose();
+        if (topicSpecMsgRefItemProvider != null) topicSpecMsgRefItemProvider.dispose();
+        if (arrayTopicSpecMsgRefItemProvider != null) arrayTopicSpecMsgRefItemProvider.dispose();
     }
 
 }

plugins/de.fraunhofer.ipa.ros.edit/src/ros/provider/TopicSpecRefItemProvider.java → plugins/de.fraunhofer.ipa.ros.edit/src/ros/provider/TopicSpecMsgRefItemProvider.java

@@ -13,25 +13,23 @@
 
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-
 import primitives.provider.AbstractTypeItemProvider;
-
 import ros.RosPackage;
 
 /**
- * This is the item provider adapter for a {@link ros.TopicSpecRef} object.
+ * This is the item provider adapter for a {@link ros.TopicSpecMsgRef} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class TopicSpecRefItemProvider extends AbstractTypeItemProvider {
+public class TopicSpecMsgRefItemProvider extends AbstractTypeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public TopicSpecRefItemProvider(AdapterFactory adapterFactory) {
+	public TopicSpecMsgRefItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -46,25 +44,25 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addTopicSpecPropertyDescriptor(object);
+			addReferencePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This adds a property descriptor for the Topic Spec feature.
+	 * This adds a property descriptor for the Reference feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addTopicSpecPropertyDescriptor(Object object) {
+	protected void addReferencePropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_TopicSpecRef_TopicSpec_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_TopicSpecRef_TopicSpec_feature", "_UI_TopicSpecRef_type"),
-				 RosPackage.Literals.TOPIC_SPEC_REF__TOPIC_SPEC,
+				 getString("_UI_TopicSpecMsgRef_Reference_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_TopicSpecMsgRef_Reference_feature", "_UI_TopicSpecMsgRef_type"),
+				 RosPackage.Literals.TOPIC_SPEC_MSG_REF__REFERENCE,
 				 true,
 				 false,
 				 true,
@@ -74,14 +72,14 @@ protected void addTopicSpecPropertyDescriptor(Object object) {
 	}
 
 	/**
-	 * This returns TopicSpecRef.gif.
+	 * This returns TopicSpecMsgRef.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TopicSpecRef"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TopicSpecMsgRef"));
 	}
 
 	/**
@@ -92,7 +90,7 @@ public Object getImage(Object object) {
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_TopicSpecRef_type");
+		return getString("_UI_TopicSpecMsgRef_type");
 	}
 
 

plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/BasicsParser.java

@@ -113,7 +113,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
 			builder.put(grammarAccess.getString0ArrayAccess().getGroup(), "rule__String0Array__Group__0");
 			builder.put(grammarAccess.getByteArrayAccess().getGroup(), "rule__ByteArray__Group__0");
 			builder.put(grammarAccess.getHeaderAccess().getGroup(), "rule__Header__Group__0");
-			builder.put(grammarAccess.getArrayTopicSpecRefAccess().getGroup(), "rule__ArrayTopicSpecRef__Group__0");
+			builder.put(grammarAccess.getArraySpecRefAccess().getGroup(), "rule__ArraySpecRef__Group__0");
 			builder.put(grammarAccess.getGlobalNamespaceAccess().getPartsAssignment_2_1(), "rule__GlobalNamespace__PartsAssignment_2_1");
 			builder.put(grammarAccess.getGlobalNamespaceAccess().getPartsAssignment_2_2_1(), "rule__GlobalNamespace__PartsAssignment_2_2_1");
 			builder.put(grammarAccess.getRelativeNamespace_ImplAccess().getPartsAssignment_2_1(), "rule__RelativeNamespace_Impl__PartsAssignment_2_1");
@@ -154,8 +154,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
 			builder.put(grammarAccess.getParameterStructTypeMemberAccess().getTypeAssignment_1(), "rule__ParameterStructTypeMember__TypeAssignment_1");
 			builder.put(grammarAccess.getMessagePartAccess().getTypeAssignment_0(), "rule__MessagePart__TypeAssignment_0");
 			builder.put(grammarAccess.getMessagePartAccess().getDataAssignment_1(), "rule__MessagePart__DataAssignment_1");
-			builder.put(grammarAccess.getTopicSpecRefAccess().getTopicSpecAssignment(), "rule__TopicSpecRef__TopicSpecAssignment");
-			builder.put(grammarAccess.getArrayTopicSpecRefAccess().getTopicSpecAssignment_0(), "rule__ArrayTopicSpecRef__TopicSpecAssignment_0");
+			builder.put(grammarAccess.getSpecBaseRefAccess().getReferenceAssignment(), "rule__SpecBaseRef__ReferenceAssignment");
+			builder.put(grammarAccess.getArraySpecRefAccess().getReferenceAssignment_0(), "rule__ArraySpecRef__ReferenceAssignment_0");
 		}
 	}