added four missing fields to QualityOfService, LeaseDuration, Liveliness, LifeSpan, Deadline

Author: EGAlberts

plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros/validation/RosValidator.xtend

@@ -14,6 +14,7 @@ import ros.ServiceClient
 import ros.ServiceServer
 import ros.Subscriber
 import ros.Parameter
+import ros.QualityOfService
 
 /**
  * This class contains custom validation rules.
@@ -142,4 +143,24 @@ class RosValidator extends AbstractRosValidator {
 //  // allow the use of numbers
 //
 
-}
+  public static val INVALID_VALUE = 'invalidValue'
+  @Check
+  def void CheckQoS (QualityOfService qos){
+  	CheckDuration(qos.leaseDuration)
+  	CheckDuration(qos.lifespan)
+  	CheckDuration(qos.deadline)
+  }
+  
+  def void CheckDuration(String duration)
+  {
+  	if(duration != 'infinite' && duration !== null){
+  		try{
+  			Integer.parseInt(duration)
+  		}
+  		catch (NumberFormatException e){
+  			error("Durations of lease_duration, lifespan, deadline should be specified as a string of nanoseconds which can convert to int, or as infinite", null, INVALID_VALUE)
+  		}
+  	}
+  }
+
+}

plugins/de.fraunhofer.ipa.ros/model/ros.ecore

@@ -221,6 +221,10 @@
         defaultValueLiteral="reliable"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="Durability" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         defaultValueLiteral="transient_local"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Liveliness" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="LeaseDuration" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Lifespan" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Deadline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TopicSpecMsgRef" eSuperTypes="PrimitivesTypes.ecore#//AbstractType">
     <eStructuralFeatures xsi:type="ecore:EReference" name="Reference" lowerBound="1"

plugins/de.fraunhofer.ipa.ros/model/ros.genmodel

@@ -169,6 +169,10 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Depth"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Reliability"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Durability"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Liveliness"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/LeaseDuration"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Lifespan"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Deadline"/>
     </genClasses>
     <genClasses ecoreClass="ros.ecore#//TopicSpecMsgRef">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ros.ecore#//TopicSpecMsgRef/Reference"/>

plugins/de.fraunhofer.ipa.ros/src/primitives/MessagePart.java

@@ -25,55 +25,55 @@
  */
 public interface MessagePart extends EObject {
     /**
-     * Returns the value of the '<em><b>Type</b></em>' containment reference.
-     * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Type</em>' containment reference isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * @return the value of the '<em>Type</em>' containment reference.
-     * @see #setType(AbstractType)
-     * @see primitives.PrimitivesPackage#getMessagePart_Type()
-     * @model containment="true" required="true"
-     * @generated
-     */
+	 * @return the value of the '<em>Type</em>' containment reference.
+	 * @see #setType(AbstractType)
+	 * @see primitives.PrimitivesPackage#getMessagePart_Type()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
     AbstractType getType();
 
     /**
-     * Sets the value of the '{@link primitives.MessagePart#getType <em>Type</em>}' containment reference.
-     * <!-- begin-user-doc -->
+	 * Sets the value of the '{@link primitives.MessagePart#getType <em>Type</em>}' containment reference.
+	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Type</em>' containment reference.
-     * @see #getType()
-     * @generated
-     */
+	 * @param value the new value of the '<em>Type</em>' containment reference.
+	 * @see #getType()
+	 * @generated
+	 */
     void setType(AbstractType value);
 
     /**
-     * Returns the value of the '<em><b>Data</b></em>' attribute.
-     * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Data</em>' attribute isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * @return the value of the '<em>Data</em>' attribute.
-     * @see #setData(String)
-     * @see primitives.PrimitivesPackage#getMessagePart_Data()
-     * @model required="true"
-     * @generated
-     */
+	 * @return the value of the '<em>Data</em>' attribute.
+	 * @see #setData(String)
+	 * @see primitives.PrimitivesPackage#getMessagePart_Data()
+	 * @model required="true"
+	 * @generated
+	 */
     String getData();
 
     /**
-     * Sets the value of the '{@link primitives.MessagePart#getData <em>Data</em>}' attribute.
-     * <!-- begin-user-doc -->
+	 * Sets the value of the '{@link primitives.MessagePart#getData <em>Data</em>}' attribute.
+	 * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Data</em>' attribute.
-     * @see #getData()
-     * @generated
-     */
+	 * @param value the new value of the '<em>Data</em>' attribute.
+	 * @see #getData()
+	 * @generated
+	 */
     void setData(String value);
 
 } // MessagePart