Bug 567331 - [Robotics, Assertions] Rename NF-Properties into Properties
- Rename NFProperty stereotype into Property
- Adapt element types
- Adapt table and ME factory
Change-Id: I6e1dab6885064fcc99576b48614621c998df8e5f
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.ecore b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.ecore
index 2912883..66c671c 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.ecore
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.ecore
@@ -16,7 +16,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="base_Comment" ordered="false"
eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Comment"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="NFProperty" eSuperTypes="../../org.eclipse.papyrus.robotics.bpc.profile/model/bpc.ecore#//Entity">
+ <eClassifiers xsi:type="ecore:EClass" name="Property" eSuperTypes="../../org.eclipse.papyrus.robotics.bpc.profile/model/bpc.ecore#//Entity">
<eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"
eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.genmodel b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.genmodel
index 076af64..6519a1e 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.genmodel
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.genmodel
@@ -47,11 +47,11 @@
<genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference assertions.ecore#//Contract/base_Comment"/>
</genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="assertions.ecore#//NFProperty">
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="assertions.ecore#//Property">
<genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference assertions.ecore#//NFProperty/base_Property"/>
+ propertySortChoices="true" ecoreFeature="ecore:EReference assertions.ecore#//Property/base_Property"/>
<genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
- createChild="false" ecoreFeature="ecore:EReference assertions.ecore#//NFProperty/expression"/>
+ createChild="false" ecoreFeature="ecore:EReference assertions.ecore#//Property/expression"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.profile.uml b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.profile.uml
index d7e42eb..9e19bf4 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.profile.uml
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/model/assertions.profile.uml
@@ -62,7 +62,7 @@
<packagedElement xmi:type="uml:Extension" xmi:id="_nnVjYHjSEeq2_NfICybrsA" name="E_Contract_Comment9" memberEnd="_nnWxgHjSEeq2_NfICybrsA _nnXYkHjSEeq2_NfICybrsA">
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_nnWxgHjSEeq2_NfICybrsA" name="extension_Contract" type="_J6A-4HjSEeq2_NfICybrsA" aggregation="composite" association="_nnVjYHjSEeq2_NfICybrsA"/>
</packagedElement>
- <packagedElement xmi:type="uml:Stereotype" xmi:id="_agM7wJ_nEeqlr5gsvzwGuw" name="NFProperty">
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_agM7wJ_nEeqlr5gsvzwGuw" name="Property">
<generalization xmi:type="uml:Generalization" xmi:id="_Ju3KYMD1EeqimKqROTAdog">
<general xmi:type="uml:Stereotype" href="pathmap://ROBOTICS_BPC_PROFILES/bpc.profile.uml#_SbJV57amEeeahOCq3xONIQ"/>
</generalization>
@@ -75,7 +75,7 @@
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JVMSsMgzEeq_dprmWVFttg"/>
</ownedAttribute>
</packagedElement>
- <packagedElement xmi:type="uml:Extension" xmi:id="_lZa-YMEgEeqOn9KXP-HCew" name="E_NFProperty_Property13" memberEnd="_lZdaoMEgEeqOn9KXP-HCew _lZeowMEgEeqOn9KXP-HCew">
- <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_lZdaoMEgEeqOn9KXP-HCew" name="extension_NFProperty" type="_agM7wJ_nEeqlr5gsvzwGuw" aggregation="composite" association="_lZa-YMEgEeqOn9KXP-HCew"/>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_lZa-YMEgEeqOn9KXP-HCew" name="E_Property_Property1" memberEnd="_lZdaoMEgEeqOn9KXP-HCew _lZeowMEgEeqOn9KXP-HCew">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_lZdaoMEgEeqOn9KXP-HCew" name="extension_Property" type="_agM7wJ_nEeqlr5gsvzwGuw" aggregation="composite" association="_lZa-YMEgEeqOn9KXP-HCew"/>
</packagedElement>
</uml:Profile>
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/AssertionsFactory.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/AssertionsFactory.java
index 240dfb1..be389d3 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/AssertionsFactory.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/AssertionsFactory.java
@@ -40,13 +40,13 @@
Contract createContract();
/**
- * Returns a new object of class '<em>NF Property</em>'.
+ * Returns a new object of class '<em>Property</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>NF Property</em>'.
+ * @return a new object of class '<em>Property</em>'.
* @generated
*/
- NFProperty createNFProperty();
+ Property createProperty();
/**
* Returns the package supported by this factory.
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/AssertionsPackage.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/AssertionsPackage.java
index 7f3e976..b75a975 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/AssertionsPackage.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/AssertionsPackage.java
@@ -286,14 +286,14 @@
int CONTRACT_OPERATION_COUNT = BPCPackage.ENTITY_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.NFPropertyImpl <em>NF Property</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.PropertyImpl <em>Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.NFPropertyImpl
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.AssertionsPackageImpl#getNFProperty()
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.PropertyImpl
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.AssertionsPackageImpl#getProperty()
* @generated
*/
- int NF_PROPERTY = 2;
+ int PROPERTY = 2;
/**
* The feature id for the '<em><b>Property</b></em>' reference list.
@@ -302,7 +302,7 @@
* @generated
* @ordered
*/
- int NF_PROPERTY__PROPERTY = BPCPackage.ENTITY__PROPERTY;
+ int PROPERTY__PROPERTY = BPCPackage.ENTITY__PROPERTY;
/**
* The feature id for the '<em><b>Instance uid</b></em>' attribute.
@@ -311,7 +311,7 @@
* @generated
* @ordered
*/
- int NF_PROPERTY__INSTANCE_UID = BPCPackage.ENTITY__INSTANCE_UID;
+ int PROPERTY__INSTANCE_UID = BPCPackage.ENTITY__INSTANCE_UID;
/**
* The feature id for the '<em><b>Description</b></em>' attribute.
@@ -320,7 +320,7 @@
* @generated
* @ordered
*/
- int NF_PROPERTY__DESCRIPTION = BPCPackage.ENTITY__DESCRIPTION;
+ int PROPERTY__DESCRIPTION = BPCPackage.ENTITY__DESCRIPTION;
/**
* The feature id for the '<em><b>Authorship</b></em>' attribute.
@@ -329,7 +329,7 @@
* @generated
* @ordered
*/
- int NF_PROPERTY__AUTHORSHIP = BPCPackage.ENTITY__AUTHORSHIP;
+ int PROPERTY__AUTHORSHIP = BPCPackage.ENTITY__AUTHORSHIP;
/**
* The feature id for the '<em><b>Provenance</b></em>' attribute.
@@ -338,7 +338,7 @@
* @generated
* @ordered
*/
- int NF_PROPERTY__PROVENANCE = BPCPackage.ENTITY__PROVENANCE;
+ int PROPERTY__PROVENANCE = BPCPackage.ENTITY__PROVENANCE;
/**
* The feature id for the '<em><b>Model uid</b></em>' attribute.
@@ -347,7 +347,7 @@
* @generated
* @ordered
*/
- int NF_PROPERTY__MODEL_UID = BPCPackage.ENTITY__MODEL_UID;
+ int PROPERTY__MODEL_UID = BPCPackage.ENTITY__MODEL_UID;
/**
* The feature id for the '<em><b>Metamodel uid</b></em>' attribute.
@@ -356,7 +356,7 @@
* @generated
* @ordered
*/
- int NF_PROPERTY__METAMODEL_UID = BPCPackage.ENTITY__METAMODEL_UID;
+ int PROPERTY__METAMODEL_UID = BPCPackage.ENTITY__METAMODEL_UID;
/**
* The feature id for the '<em><b>Base Property</b></em>' reference.
@@ -365,7 +365,7 @@
* @generated
* @ordered
*/
- int NF_PROPERTY__BASE_PROPERTY = BPCPackage.ENTITY_FEATURE_COUNT + 0;
+ int PROPERTY__BASE_PROPERTY = BPCPackage.ENTITY_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Expression</b></em>' reference.
@@ -374,26 +374,25 @@
* @generated
* @ordered
*/
- int NF_PROPERTY__EXPRESSION = BPCPackage.ENTITY_FEATURE_COUNT + 1;
+ int PROPERTY__EXPRESSION = BPCPackage.ENTITY_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>NF Property</em>' class.
+ * The number of structural features of the '<em>Property</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int NF_PROPERTY_FEATURE_COUNT = BPCPackage.ENTITY_FEATURE_COUNT + 2;
+ int PROPERTY_FEATURE_COUNT = BPCPackage.ENTITY_FEATURE_COUNT + 2;
/**
- * The number of operations of the '<em>NF Property</em>' class.
+ * The number of operations of the '<em>Property</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int NF_PROPERTY_OPERATION_COUNT = BPCPackage.ENTITY_OPERATION_COUNT + 0;
-
+ int PROPERTY_OPERATION_COUNT = BPCPackage.ENTITY_OPERATION_COUNT + 0;
/**
* Returns the meta object for class '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.Assertion <em>Assertion</em>}'.
@@ -471,36 +470,36 @@
EReference getContract_Base_Comment();
/**
- * Returns the meta object for class '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty <em>NF Property</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.Property <em>Property</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>NF Property</em>'.
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty
+ * @return the meta object for class '<em>Property</em>'.
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.Property
* @generated
*/
- EClass getNFProperty();
+ EClass getProperty();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty#getBase_Property <em>Base Property</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.Property#getBase_Property <em>Base Property</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Base Property</em>'.
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty#getBase_Property()
- * @see #getNFProperty()
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.Property#getBase_Property()
+ * @see #getProperty()
* @generated
*/
- EReference getNFProperty_Base_Property();
+ EReference getProperty_Base_Property();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty#getExpression <em>Expression</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.Property#getExpression <em>Expression</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the reference '<em>Expression</em>'.
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty#getExpression()
- * @see #getNFProperty()
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.Property#getExpression()
+ * @see #getProperty()
* @generated
*/
- EReference getNFProperty_Expression();
+ EReference getProperty_Expression();
/**
* Returns the factory that creates the instances of the model.
@@ -586,14 +585,14 @@
EReference CONTRACT__BASE_COMMENT = eINSTANCE.getContract_Base_Comment();
/**
- * The meta object literal for the '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.NFPropertyImpl <em>NF Property</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.PropertyImpl <em>Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.NFPropertyImpl
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.AssertionsPackageImpl#getNFProperty()
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.PropertyImpl
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.AssertionsPackageImpl#getProperty()
* @generated
*/
- EClass NF_PROPERTY = eINSTANCE.getNFProperty();
+ EClass PROPERTY = eINSTANCE.getProperty();
/**
* The meta object literal for the '<em><b>Base Property</b></em>' reference feature.
@@ -601,7 +600,7 @@
* <!-- end-user-doc -->
* @generated
*/
- EReference NF_PROPERTY__BASE_PROPERTY = eINSTANCE.getNFProperty_Base_Property();
+ EReference PROPERTY__BASE_PROPERTY = eINSTANCE.getProperty_Base_Property();
/**
* The meta object literal for the '<em><b>Expression</b></em>' reference feature.
@@ -609,7 +608,7 @@
* <!-- end-user-doc -->
* @generated
*/
- EReference NF_PROPERTY__EXPRESSION = eINSTANCE.getNFProperty_Expression();
+ EReference PROPERTY__EXPRESSION = eINSTANCE.getProperty_Expression();
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/NFProperty.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/Property.java
similarity index 73%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/NFProperty.java
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/Property.java
index 3cacd3f..50fcb68 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/NFProperty.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/Property.java
@@ -5,26 +5,25 @@
import org.eclipse.papyrus.robotics.bpc.profile.bpc.Entity;
import org.eclipse.uml2.uml.OpaqueExpression;
-import org.eclipse.uml2.uml.Property;
/**
* <!-- begin-user-doc -->
- * A representation of the model object '<em><b>NF Property</b></em>'.
+ * A representation of the model object '<em><b>Property</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <ul>
- * <li>{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty#getBase_Property <em>Base Property</em>}</li>
- * <li>{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty#getExpression <em>Expression</em>}</li>
+ * <li>{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.Property#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.Property#getExpression <em>Expression</em>}</li>
* </ul>
*
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.AssertionsPackage#getNFProperty()
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.AssertionsPackage#getProperty()
* @model
* @generated
*/
-public interface NFProperty extends Entity {
+public interface Property extends Entity {
/**
* Returns the value of the '<em><b>Base Property</b></em>' reference.
* <!-- begin-user-doc -->
@@ -34,22 +33,22 @@
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Base Property</em>' reference.
- * @see #setBase_Property(Property)
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.AssertionsPackage#getNFProperty_Base_Property()
+ * @see #setBase_Property(org.eclipse.uml2.uml.Property)
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.AssertionsPackage#getProperty_Base_Property()
* @model ordered="false"
* @generated
*/
- Property getBase_Property();
+ org.eclipse.uml2.uml.Property getBase_Property();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty#getBase_Property <em>Base Property</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.Property#getBase_Property <em>Base Property</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Base Property</em>' reference.
* @see #getBase_Property()
* @generated
*/
- void setBase_Property(Property value);
+ void setBase_Property(org.eclipse.uml2.uml.Property value);
/**
* Returns the value of the '<em><b>Expression</b></em>' reference.
@@ -60,10 +59,10 @@
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Expression</em>' reference.
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.AssertionsPackage#getNFProperty_Expression()
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.AssertionsPackage#getProperty_Expression()
* @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
* @generated
*/
OpaqueExpression getExpression();
-} // NFProperty
+} // Property
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/AssertionsFactoryImpl.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/AssertionsFactoryImpl.java
index 395d61d..fb9caa9 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/AssertionsFactoryImpl.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/AssertionsFactoryImpl.java
@@ -58,7 +58,7 @@
switch (eClass.getClassifierID()) {
case AssertionsPackage.ASSERTION: return createAssertion();
case AssertionsPackage.CONTRACT: return createContract();
- case AssertionsPackage.NF_PROPERTY: return createNFProperty();
+ case AssertionsPackage.PROPERTY: return createProperty();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -92,9 +92,9 @@
* @generated
*/
@Override
- public NFProperty createNFProperty() {
- NFPropertyImpl nfProperty = new NFPropertyImpl();
- return nfProperty;
+ public Property createProperty() {
+ PropertyImpl property = new PropertyImpl();
+ return property;
}
/**
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/AssertionsPackageImpl.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/AssertionsPackageImpl.java
index 9cdef53..fba1179 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/AssertionsPackageImpl.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/AssertionsPackageImpl.java
@@ -14,8 +14,7 @@
import org.eclipse.papyrus.robotics.assertions.profile.assertions.AssertionsFactory;
import org.eclipse.papyrus.robotics.assertions.profile.assertions.AssertionsPackage;
import org.eclipse.papyrus.robotics.assertions.profile.assertions.Contract;
-import org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty;
-
+import org.eclipse.papyrus.robotics.assertions.profile.assertions.Property;
import org.eclipse.papyrus.robotics.bpc.profile.bpc.BPCPackage;
import org.eclipse.uml2.types.TypesPackage;
@@ -48,7 +47,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private EClass nfPropertyEClass = null;
+ private EClass propertyEClass = null;
/**
* Creates an instance of the model <b>Package</b>, registered with
@@ -193,8 +192,8 @@
* @generated
*/
@Override
- public EClass getNFProperty() {
- return nfPropertyEClass;
+ public EClass getProperty() {
+ return propertyEClass;
}
/**
@@ -203,8 +202,8 @@
* @generated
*/
@Override
- public EReference getNFProperty_Base_Property() {
- return (EReference)nfPropertyEClass.getEStructuralFeatures().get(0);
+ public EReference getProperty_Base_Property() {
+ return (EReference)propertyEClass.getEStructuralFeatures().get(0);
}
/**
@@ -213,8 +212,8 @@
* @generated
*/
@Override
- public EReference getNFProperty_Expression() {
- return (EReference)nfPropertyEClass.getEStructuralFeatures().get(1);
+ public EReference getProperty_Expression() {
+ return (EReference)propertyEClass.getEStructuralFeatures().get(1);
}
/**
@@ -255,9 +254,9 @@
createEReference(contractEClass, CONTRACT__GUARANTEES);
createEReference(contractEClass, CONTRACT__BASE_COMMENT);
- nfPropertyEClass = createEClass(NF_PROPERTY);
- createEReference(nfPropertyEClass, NF_PROPERTY__BASE_PROPERTY);
- createEReference(nfPropertyEClass, NF_PROPERTY__EXPRESSION);
+ propertyEClass = createEClass(PROPERTY);
+ createEReference(propertyEClass, PROPERTY__BASE_PROPERTY);
+ createEReference(propertyEClass, PROPERTY__EXPRESSION);
}
/**
@@ -295,7 +294,7 @@
// Add supertypes to classes
assertionEClass.getESuperTypes().add(theBPCPackage.getEntity());
contractEClass.getESuperTypes().add(theBPCPackage.getEntity());
- nfPropertyEClass.getESuperTypes().add(theBPCPackage.getEntity());
+ propertyEClass.getESuperTypes().add(theBPCPackage.getEntity());
// Initialize classes, features, and operations; add parameters
initEClass(assertionEClass, Assertion.class, "Assertion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
@@ -307,9 +306,9 @@
initEReference(getContract_Guarantees(), this.getAssertion(), null, "guarantees", null, 0, -1, Contract.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
initEReference(getContract_Base_Comment(), theUMLPackage.getComment(), null, "base_Comment", null, 0, 1, Contract.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
- initEClass(nfPropertyEClass, NFProperty.class, "NFProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getNFProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 0, 1, NFProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
- initEReference(getNFProperty_Expression(), theUMLPackage.getOpaqueExpression(), null, "expression", null, 0, 1, NFProperty.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+ initEClass(propertyEClass, Property.class, "Property", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+ initEReference(getProperty_Expression(), theUMLPackage.getOpaqueExpression(), null, "expression", null, 0, 1, Property.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
// Create resource
createResource(eNS_URI);
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/NFPropertyImpl.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/PropertyImpl.java
similarity index 69%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/NFPropertyImpl.java
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/PropertyImpl.java
index 5d061d4..590436b 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/NFPropertyImpl.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/impl/PropertyImpl.java
@@ -3,35 +3,30 @@
package org.eclipse.papyrus.robotics.assertions.profile.assertions.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.robotics.assertions.profile.assertions.AssertionsPackage;
-import org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty;
-
+import org.eclipse.papyrus.robotics.assertions.profile.assertions.Property;
import org.eclipse.papyrus.robotics.bpc.profile.bpc.impl.EntityImpl;
-
import org.eclipse.uml2.uml.OpaqueExpression;
-import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.ValueSpecification;
/**
* <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>NF Property</b></em>'.
+ * An implementation of the model object '<em><b>Property</b></em>'.
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.NFPropertyImpl#getBase_Property <em>Base Property</em>}</li>
- * <li>{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.NFPropertyImpl#getExpression <em>Expression</em>}</li>
+ * <li>{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.PropertyImpl#getBase_Property <em>Base Property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.impl.PropertyImpl#getExpression <em>Expression</em>}</li>
* </ul>
*
* @generated
*/
-public class NFPropertyImpl extends EntityImpl implements NFProperty {
+public class PropertyImpl extends EntityImpl implements Property {
/**
* The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.
* <!-- begin-user-doc -->
@@ -40,14 +35,14 @@
* @generated
* @ordered
*/
- protected Property base_Property;
+ protected org.eclipse.uml2.uml.Property base_Property;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected NFPropertyImpl() {
+ protected PropertyImpl() {
super();
}
@@ -58,7 +53,7 @@
*/
@Override
protected EClass eStaticClass() {
- return AssertionsPackage.Literals.NF_PROPERTY;
+ return AssertionsPackage.Literals.PROPERTY;
}
/**
@@ -67,13 +62,13 @@
* @generated
*/
@Override
- public Property getBase_Property() {
+ public org.eclipse.uml2.uml.Property getBase_Property() {
if (base_Property != null && base_Property.eIsProxy()) {
InternalEObject oldBase_Property = (InternalEObject)base_Property;
- base_Property = (Property)eResolveProxy(oldBase_Property);
+ base_Property = (org.eclipse.uml2.uml.Property)eResolveProxy(oldBase_Property);
if (base_Property != oldBase_Property) {
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, AssertionsPackage.NF_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, AssertionsPackage.PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));
}
}
return base_Property;
@@ -84,7 +79,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Property basicGetBase_Property() {
+ public org.eclipse.uml2.uml.Property basicGetBase_Property() {
return base_Property;
}
@@ -94,11 +89,11 @@
* @generated
*/
@Override
- public void setBase_Property(Property newBase_Property) {
- Property oldBase_Property = base_Property;
+ public void setBase_Property(org.eclipse.uml2.uml.Property newBase_Property) {
+ org.eclipse.uml2.uml.Property oldBase_Property = base_Property;
base_Property = newBase_Property;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, AssertionsPackage.NF_PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));
+ eNotify(new ENotificationImpl(this, Notification.SET, AssertionsPackage.PROPERTY__BASE_PROPERTY, oldBase_Property, base_Property));
}
/**
@@ -115,13 +110,14 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
public OpaqueExpression basicGetExpression() {
- // TODO: implement this method to return the 'Expression' reference
- // -> do not perform proxy resolution
- // Ensure that you remove @generated or mark it @generated NOT
- throw new UnsupportedOperationException();
+ ValueSpecification vs = getBase_Property().getDefaultValue();
+ if (vs instanceof OpaqueExpression) {
+ return (OpaqueExpression) vs;
+ }
+ return null;
}
/**
@@ -132,10 +128,10 @@
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case AssertionsPackage.NF_PROPERTY__BASE_PROPERTY:
+ case AssertionsPackage.PROPERTY__BASE_PROPERTY:
if (resolve) return getBase_Property();
return basicGetBase_Property();
- case AssertionsPackage.NF_PROPERTY__EXPRESSION:
+ case AssertionsPackage.PROPERTY__EXPRESSION:
if (resolve) return getExpression();
return basicGetExpression();
}
@@ -150,8 +146,8 @@
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case AssertionsPackage.NF_PROPERTY__BASE_PROPERTY:
- setBase_Property((Property)newValue);
+ case AssertionsPackage.PROPERTY__BASE_PROPERTY:
+ setBase_Property((org.eclipse.uml2.uml.Property)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -165,8 +161,8 @@
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case AssertionsPackage.NF_PROPERTY__BASE_PROPERTY:
- setBase_Property((Property)null);
+ case AssertionsPackage.PROPERTY__BASE_PROPERTY:
+ setBase_Property((org.eclipse.uml2.uml.Property)null);
return;
}
super.eUnset(featureID);
@@ -180,12 +176,12 @@
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case AssertionsPackage.NF_PROPERTY__BASE_PROPERTY:
+ case AssertionsPackage.PROPERTY__BASE_PROPERTY:
return base_Property != null;
- case AssertionsPackage.NF_PROPERTY__EXPRESSION:
+ case AssertionsPackage.PROPERTY__EXPRESSION:
return basicGetExpression() != null;
}
return super.eIsSet(featureID);
}
-} //NFPropertyImpl
+} //PropertyImpl
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/util/AssertionsAdapterFactory.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/util/AssertionsAdapterFactory.java
index 0279ebd..a0a1cd7 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/util/AssertionsAdapterFactory.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/util/AssertionsAdapterFactory.java
@@ -78,8 +78,8 @@
return createContractAdapter();
}
@Override
- public Adapter caseNFProperty(NFProperty object) {
- return createNFPropertyAdapter();
+ public Adapter caseProperty(Property object) {
+ return createPropertyAdapter();
}
@Override
public Adapter caseEntity(Entity object) {
@@ -134,16 +134,16 @@
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty <em>NF Property</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.robotics.assertions.profile.assertions.Property <em>Property</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty
+ * @see org.eclipse.papyrus.robotics.assertions.profile.assertions.Property
* @generated
*/
- public Adapter createNFPropertyAdapter() {
+ public Adapter createPropertyAdapter() {
return null;
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/util/AssertionsSwitch.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/util/AssertionsSwitch.java
index 95fabcb..7c7b19d 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/util/AssertionsSwitch.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.profile/src-gen/org/eclipse/papyrus/robotics/assertions/profile/assertions/util/AssertionsSwitch.java
@@ -82,10 +82,10 @@
if (result == null) result = defaultCase(theEObject);
return result;
}
- case AssertionsPackage.NF_PROPERTY: {
- NFProperty nfProperty = (NFProperty)theEObject;
- T result = caseNFProperty(nfProperty);
- if (result == null) result = caseEntity(nfProperty);
+ case AssertionsPackage.PROPERTY: {
+ Property property = (Property)theEObject;
+ T result = caseProperty(property);
+ if (result == null) result = caseEntity(property);
if (result == null) result = defaultCase(theEObject);
return result;
}
@@ -124,17 +124,17 @@
}
/**
- * Returns the result of interpreting the object as an instance of '<em>NF Property</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Property</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>NF Property</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Property</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public T caseNFProperty(NFProperty object) {
+ public T caseProperty(Property object) {
return null;
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/properties/assertions/assertions.ctx b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/properties/assertions/assertions.ctx
index 0842d0d..14a4902 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/properties/assertions/assertions.ctx
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/properties/assertions/assertions.ctx
@@ -10,8 +10,8 @@
<sections xmi:id="section.robotics.OpaqueExpression" name="Single OpaqueExpression" sectionFile="ui/SingleOpaqueExpression.xwt">
<widget href="ui/SingleOpaqueExpression.xwt#/"/>
</sections>
- <sections xmi:id="section.robotics.NFProperty" name="Single NFProperty" sectionFile="ui/SingleNFProperty.xwt">
- <widget href="ui/SingleNFProperty.xwt#/"/>
+ <sections xmi:id="section.robotics.Property" name="Single Property" sectionFile="ui/SingleProperty.xwt">
+ <widget href="ui/SingleProperty.xwt#/"/>
</sections>
</tabs>
<views xmi:id="_NcDrlyXJEeiyksdfkjxcxw" name="Single Constraint" sections="section.robotics.Constraint" automaticContext="true">
@@ -26,15 +26,15 @@
<properties xsi:type="constraints:ValueProperty" xmi:id="_NcDrmSXJEeiyk8Rsdf0xsw" name="umlClassName" value="OpaqueExpression"/>
</constraints>
</views>
- <views xmi:id="_NcDrlvafqwvbvjsdqwdqvw" name="Single NFProperty" sections="section.robotics.NFProperty" automaticContext="true" datacontexts="datactx.robotics.assertions">
+ <views xmi:id="_NcDrlvafqwvbvjsdqwdqvw" name="Single Property" sections="section.robotics.Property" automaticContext="true" datacontexts="datactx.robotics.assertions">
<constraints xsi:type="constraints:SimpleConstraint" xmi:id="_NsdfhsXJEeiyk8lv-B0xsw" name="isProperty">
<constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>
<properties xsi:type="constraints:ValueProperty" xmi:id="_NcDrmSXJEeiyk8Rsdf0xsw" name="umlClassName" value="Property"/>
</constraints>
</views>
<dataContexts xmi:id="datactx.robotics.assertions" name="assertions">
- <elements xmi:id="datactx.robotics.assertions.NFProperty" name="NFProperty">
- <properties xmi:id="datactx.robotics.assertions.NFProperty.expression" name="expression" type="Reference"/>
+ <elements xmi:id="datactx.robotics.assertions.Property" name="Property">
+ <properties xmi:id="datactx.robotics.assertions.Property.expression" name="expression" type="Reference"/>
<supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_690yG6DJEeSZxfCXzZz3-w"/>
</elements>
<modelElementFactory href="ppe:/environment/org.eclipse.papyrus.robotics.assertions.properties/environment/Environment.xmi#//@modelElementFactories.0"/>
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/properties/assertions/ui/SingleNFProperty.xwt b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/properties/assertions/ui/SingleProperty.xwt
similarity index 86%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/properties/assertions/ui/SingleNFProperty.xwt
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/properties/assertions/ui/SingleProperty.xwt
index 032967b..d23ebc2 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/properties/assertions/ui/SingleNFProperty.xwt
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/properties/assertions/ui/SingleProperty.xwt
@@ -15,7 +15,7 @@
<ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog>
<uml:MultiplicityDialog input="{Binding}"
property="Multiplicity:multiplicity"></uml:MultiplicityDialog>
- <pprms:NFPExpressionEditor input="{Binding}"
- property="assertions:NFProperty:expression.language"></pprms:NFPExpressionEditor>
+ <pprms:PropertyExpressionEditor input="{Binding}"
+ property="assertions:Property:expression.language"></pprms:PropertyExpressionEditor>
</Composite>
</Composite>
\ No newline at end of file
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/modelelement/AssertionsMEFactory.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/modelelement/AssertionsMEFactory.java
index b6d049a..d0d9d09 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/modelelement/AssertionsMEFactory.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/modelelement/AssertionsMEFactory.java
@@ -20,7 +20,6 @@
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
-import org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty;
import org.eclipse.papyrus.robotics.assertions.properties.Activator;
import org.eclipse.papyrus.uml.properties.modelelement.StereotypeModelElementFactory;
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
@@ -35,11 +34,12 @@
EObject source = EMFHelper.getEObject(sourceElement);
EMFModelElement modelElement = null;
if (source != null) {
- if (source instanceof Property && StereotypeUtil.isApplied((Property) source, NFProperty.class)) {
+ if (source instanceof Property && StereotypeUtil.isApplied((Property) source, org.eclipse.papyrus.robotics.assertions.profile.assertions.Property.class)) {
Property nfp = (Property) source;
Stereotype st = nfp.getAppliedStereotypes().get(0);
- NFProperty nfpSt = UMLUtil.getStereotypeApplication(nfp, NFProperty.class);
- modelElement = new AssertionsStereotypeME(nfpSt, st);
+ org.eclipse.papyrus.robotics.assertions.profile.assertions.Property propertySt
+ = UMLUtil.getStereotypeApplication(nfp, org.eclipse.papyrus.robotics.assertions.profile.assertions.Property.class);
+ modelElement = new AssertionsStereotypeME(propertySt, st);
}
else {
modelElement = super.doCreateFromSource(sourceElement, context);
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/modelelement/AssertionsStereotypeME.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/modelelement/AssertionsStereotypeME.java
index 58c5580..75fa386 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/modelelement/AssertionsStereotypeME.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/modelelement/AssertionsStereotypeME.java
@@ -19,7 +19,7 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty;
+import org.eclipse.papyrus.robotics.assertions.profile.assertions.Property;
import org.eclipse.papyrus.uml.properties.modelelement.StereotypeModelElement;
import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement;
import org.eclipse.uml2.uml.OpaqueExpression;
@@ -27,7 +27,7 @@
/**
* A ModelElement provider for assertion stereotypes, currently used for displaying the opaque expression
- * of an NFProperty (enabling the use of the OpaqueExpression property view, if a NFProperty is selected).
+ * of a Property (enabling the use of the OpaqueExpression property view, if a Property is selected).
*/
public class AssertionsStereotypeME extends StereotypeModelElement {
@@ -67,9 +67,9 @@
}
protected IObservable getExpressionObservable(String language) {
- if (source instanceof NFProperty) {
- NFProperty nfProperty = (NFProperty) source;
- OpaqueExpression oe = nfProperty.getExpression();
+ if (source instanceof Property) {
+ Property property = (Property) source;
+ OpaqueExpression oe = property.getExpression();
if (oe != null) {
return new UMLModelElement(oe, domain).getObservable(language);
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/widgets/NFPExpressionEditor.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/widgets/PropertyExpressionEditor.java
similarity index 88%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/widgets/NFPExpressionEditor.java
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/widgets/PropertyExpressionEditor.java
index 7b0ac23..c4c83eb 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/widgets/NFPExpressionEditor.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.properties/src/org/eclipse/papyrus/robotics/assertions/properties/widgets/PropertyExpressionEditor.java
@@ -20,9 +20,9 @@
import org.eclipse.papyrus.uml.properties.widgets.ExpressionEditor;
import org.eclipse.swt.widgets.Composite;
-public class NFPExpressionEditor extends ExpressionEditor {
+public class PropertyExpressionEditor extends ExpressionEditor {
- public NFPExpressionEditor(Composite parent, int style) {
+ public PropertyExpressionEditor(Composite parent, int style) {
super(parent, style);
}
@@ -39,7 +39,7 @@
@Override
public ModelElement getModelElement(String propertyPath) {
if (propertyPath.endsWith("body")) {
- propertyPath = "assertions:NFProperty:expression.body";
+ propertyPath = "assertions:Property:expression.body";
}
return ds.getModelElement(propertyPath);
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/META-INF/MANIFEST.MF b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/META-INF/MANIFEST.MF
index adb9e7e..cc38713 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/META-INF/MANIFEST.MF
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/META-INF/MANIFEST.MF
@@ -31,4 +31,4 @@
Automatic-Module-Name: org.eclipse.papyrus.robotics.nfps
Export-Package: org.eclipse.papyrus.robotics.assertions.tables.assertions,
org.eclipse.papyrus.robotics.assertions.tables.contracts,
- org.eclipse.papyrus.robotics.assertions.tables.nfproperties
+ org.eclipse.papyrus.robotics.assertions.tables.properties
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/properties/assertionTables.ctx b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/properties/assertionTables.ctx
index 23a1e5f..1f2a844 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/properties/assertionTables.ctx
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/properties/assertionTables.ctx
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="ASCII"?>
<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_eKfg0dfgdfgsaxcU6z4rdw" name="assertionTables">
<dependencies href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_69QJkKDJEeSZxfCXzZz3-w"/>
- <tabs xmi:id="tab.robotics.NFProperties" label="NF Properties" id="NFProperties">
+ <tabs xmi:id="tab.robotics.Properties" label="Properties" id="Properties">
<afterTab href="ppe:/context/org.eclipse.papyrus.robotics.properties/properties/id/id.ctx#tab.bpc.Id"/>
- <sections xmi:id="section.robotics.NFProperties" name="NFProperties" sectionFile="ui/NFProperties.xwt">
- <widget href="ui/NFProperties.xwt#/"/>
+ <sections xmi:id="section.robotics.Properties" name="Properties" sectionFile="ui/Properties.xwt">
+ <widget href="ui/Properties.xwt#/"/>
</sections>
</tabs>
<tabs xmi:id="tab.robotics.Assertions" label="Assertions" id="Assertions">
- <afterTab href="#tab.robotics.NFProperties"/>
+ <afterTab href="#tab.robotics.Properties"/>
<sections xmi:id="section.robotics.Assertions" name="Assertions" sectionFile="ui/Assertions.xwt">
<widget href="ui/Assertions.xwt#/"/>
</sections>
@@ -24,8 +24,8 @@
<widget href="ui/Contracts.xwt#/"/>
</sections>
</tabs>
- <views xmi:id="view.robotics.NFProperties" name="NFProperties" sections="section.robotics.NFProperties">
- <constraints xsi:type="constraints:SimpleConstraint" xmi:id="constraint.robotics.NFProperties" name="IsNFPTableConstraint" overrideable="false">
+ <views xmi:id="view.robotics.Properties" name="Properties" sections="section.robotics.Properties">
+ <constraints xsi:type="constraints:SimpleConstraint" xmi:id="constraint.robotics.Properties" name="IsNFPTableConstraint" overrideable="false">
<constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.4"/>
<properties xsi:type="constraints:ValueProperty" xmi:id="_NHDWoMEwEeaGsMZ2KxG2ZQ" name="className" value="org.eclipse.papyrus.robotics.assertions.tables.IsCompDefOrSystem"/>
</constraints>
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/properties/ui/NFProperties.xwt b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/properties/ui/Properties.xwt
similarity index 78%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/properties/ui/NFProperties.xwt
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/properties/ui/Properties.xwt
index 396d85b..29996a4 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/properties/ui/NFProperties.xwt
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/properties/ui/Properties.xwt
@@ -2,7 +2,7 @@
<Composite xmlns:x="http://www.eclipse.org/xwt"
xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"
- xmlns:ppnfp="clr-namespace:org.eclipse.papyrus.robotics.assertions.tables.nfproperties"
+ xmlns:ppnfp="clr-namespace:org.eclipse.papyrus.robotics.assertions.tables.properties"
xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
@@ -11,9 +11,9 @@
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
</Composite.layout>
- <ppnfp:NFPTable
- tableURI="platform:/plugin/org.eclipse.papyrus.robotics.assertions.tables/config/tables/nfproperties.nattableconfiguration"
- input="{Binding}" property="UML:Class" customLabel="NFProperties">
- </ppnfp:NFPTable>
+ <ppnfp:PropertyTable
+ tableURI="platform:/plugin/org.eclipse.papyrus.robotics.assertions.tables/config/tables/properties.nattableconfiguration"
+ input="{Binding}" property="UML:Class" customLabel="Properties">
+ </ppnfp:PropertyTable>
</Composite>
</Composite>
\ No newline at end of file
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/tables/nfproperties.nattableconfiguration b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/tables/properties.nattableconfiguration
similarity index 94%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/tables/nfproperties.nattableconfiguration
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/tables/properties.nattableconfiguration
index e9a772e..ed554ed 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/tables/nfproperties.nattableconfiguration
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/config/tables/properties.nattableconfiguration
@@ -11,7 +11,7 @@
xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"
xmi:id="_hviMUEkqEeil4MD2OcSjtg"
description="Edit default values of non-functional properties"
- name="NFProperties" type="NFPropertyTable"
+ name="Properties" type="PropertyTable"
cellEditorDeclaration="COLUMN" defaultRowAxisProvider="_hvizYEkqEeil4MD2OcSjtg"
defaultColumnAxisProvider="_hviMW0kqEeil4MD2OcSjtg">
<styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_hviMUUkqEeil4MD2OcSjtg" displayStyle="NORMAL"/>
@@ -20,7 +20,7 @@
<rowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" xmi:id="_hviMVEkqEeil4MD2OcSjtg" indexStyle="NUMERIC" displayLabel="false" displayFilter="false" displayIndex="false">
<styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_hviMVUkqEeil4MD2OcSjtg" name="rowLabelWidth" intValue="250"/>
<ownedLabelConfigurations xmi:type="nattablelabelprovider:ObjectLabelProviderConfiguration" xmi:id="_hviMVkkqEeil4MD2OcSjtg" displayIcon="false" displayLabel="true"/>
- <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_hviMV0kqEeil4MD2OcSjtg" axisManagerId="org.eclipse.papyrus.robotics.assertions.tables.nfproperties.NFPTableRowAxisManager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="_hviMVkkqEeil4MD2OcSjtg"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_hviMV0kqEeil4MD2OcSjtg" axisManagerId="org.eclipse.papyrus.robotics.assertions.tables.properties.PropertyTableRowAxisManager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="_hviMVkkqEeil4MD2OcSjtg"/>
</rowHeaderAxisConfiguration>
<columnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" xmi:id="_hviMWEkqEeil4MD2OcSjtg" displayLabel="true" displayFilter="false" displayIndex="false">
<ownedLabelConfigurations xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" xmi:id="_hviMWUkqEeil4MD2OcSjtg" displayIcon="false" displayLabel="true" displayIsDerived="false" displayType="false" displayMultiplicity="false" displayName="true"/>
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/plugin.xml b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/plugin.xml
index 48cf1d6..3b70e47 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/plugin.xml
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/plugin.xml
@@ -8,7 +8,7 @@
</extension>
<extension point="org.eclipse.papyrus.infra.nattable.configuration">
- <configuration file="config/tables/nfproperties.nattableconfiguration" type="NFProperties">
+ <configuration file="config/tables/properties.nattableconfiguration" type="properties">
</configuration>
</extension>
<extension point="org.eclipse.papyrus.infra.nattable.configuration">
@@ -32,20 +32,20 @@
<extension point="org.eclipse.papyrus.infra.nattable.axismanager">
<axisManager
- id="org.eclipse.papyrus.robotics.assertions.tables.nfproperties.NFPTableRowAxisManager"
- manager="org.eclipse.papyrus.robotics.assertions.tables.nfproperties.NFPTableRowAxisManager">
+ id="org.eclipse.papyrus.robotics.assertions.tables.properties.PropertyTableRowAxisManager"
+ manager="org.eclipse.papyrus.robotics.assertions.tables.properties.PropertyTableRowAxisManager">
</axisManager>
</extension>
<extension point="org.eclipse.papyrus.infra.nattable.cellmanager">
<cellManager
- id="org.eclipse.papyrus.robotics.assertions.tables.nfproperties.NFPTableCellManager"
- manager="org.eclipse.papyrus.robotics.assertions.tables.nfproperties.NFPTableCellManager"
+ id="org.eclipse.papyrus.robotics.assertions.tables.properties.PropertyTableCellManager"
+ manager="org.eclipse.papyrus.robotics.assertions.tables.properties.PropertyTableCellManager"
order="0">
</cellManager>
</extension>
<extension point="org.eclipse.papyrus.infra.nattable.celleditor.configuration">
<cellAxisConfiguration
- class="org.eclipse.papyrus.robotics.assertions.tables.nfproperties.NFPTableCellAxisConfiguration"
+ class="org.eclipse.papyrus.robotics.assertions.tables.properties.PropertyTableCellAxisConfiguration"
order="2">
</cellAxisConfiguration>
</extension>
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/IsCompDefOrSystem.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/IsCompDefOrSystem.java
index eb05c9b..011d119 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/IsCompDefOrSystem.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/IsCompDefOrSystem.java
@@ -35,7 +35,7 @@
boolean matches = false;
if (selection != null) {
final EObject modelElement = EMFHelper.getEObject(selection);
- // NF properties, Assertions or Contract table
+ // Properties, Assertions or Contract table
matches = modelElement instanceof Class && (
StereotypeUtil.isApplied((Class) modelElement, ComponentDefinition.class)
|| StereotypeUtil.isApplied((Class) modelElement, System.class));
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTable.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTable.java
similarity index 83%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTable.java
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTable.java
index ea2d4ae..9b2f6b3 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTable.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTable.java
@@ -14,7 +14,7 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.robotics.assertions.tables.nfproperties;
+package org.eclipse.papyrus.robotics.assertions.tables.properties;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;
@@ -25,16 +25,16 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.uml2.uml.UMLPackage;
-public class NFPTable extends TableEditorPlus {
+public class PropertyTable extends TableEditorPlus {
- public NFPTable(Composite parent, int style) {
+ public PropertyTable(Composite parent, int style) {
super(parent, style);
}
@Override
public AbstractEditCommandRequest createElementRequest() {
CreateElementRequest createAssertionRequest = new CreateElementRequest(context,
- AssertionElementTypesEnumerator.NFPROPERTY, UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());
+ AssertionElementTypesEnumerator.PROPERTY, UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());
return createAssertionRequest;
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTableCellAxisConfiguration.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTableCellAxisConfiguration.java
similarity index 90%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTableCellAxisConfiguration.java
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTableCellAxisConfiguration.java
index c6fabe2..dd9fa45 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTableCellAxisConfiguration.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTableCellAxisConfiguration.java
@@ -14,7 +14,7 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.robotics.assertions.tables.nfproperties;
+package org.eclipse.papyrus.robotics.assertions.tables.properties;
import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
@@ -29,7 +29,7 @@
/**
* The objective of this class is to install a pop-up editor for opaque expressions for NFProperties table
*/
-public class NFPTableCellAxisConfiguration implements ICellAxisConfiguration {
+public class PropertyTableCellAxisConfiguration implements ICellAxisConfiguration {
@Override
public String getConfigurationId() {
@@ -45,9 +45,9 @@
public boolean handles(Table table, Object axisElement) {
String type = table.getTableConfiguration().getType();
Object represents = AxisUtils.getRepresentedElement(axisElement);
- // supports default value in NFProperty table
+ // supports default value in Property table
boolean handles =
- type.equals(NFPTableCellManager.NF_PROPERTY_TABLE) &&
+ type.equals(PropertyTableCellManager.PROPERTY_TABLE) &&
represents.equals(UMLPackage.eINSTANCE.getProperty_DefaultValue());
return handles;
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTableCellManager.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTableCellManager.java
similarity index 95%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTableCellManager.java
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTableCellManager.java
index 97bb58b..41296cf 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTableCellManager.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTableCellManager.java
@@ -14,7 +14,7 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.robotics.assertions.tables.nfproperties;
+package org.eclipse.papyrus.robotics.assertions.tables.properties;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.ecore.EObject;
@@ -37,7 +37,7 @@
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.util.UMLUtil;
-public class NFPTableCellManager extends AbstractCellManager {
+public class PropertyTableCellManager extends AbstractCellManager {
/**
* Alias names as in table definitions
@@ -48,7 +48,7 @@
private static final String DESC = "Description"; //$NON-NLS-1$
// Table type handled by the cell manager
- public static final String NF_PROPERTY_TABLE = "NFPropertyTable"; //$NON-NLS-1$
+ public static final String PROPERTY_TABLE = "PropertyTable"; //$NON-NLS-1$
@Override
public boolean handles(Object columnElement, Object rowElement, INattableModelManager mngr) {
@@ -58,7 +58,7 @@
EObject parent = ((IAxis) columnElement).eContainer(); // SlaveObjectAxisProvider
if (null != parent) {
parent = parent.eContainer();
- if (parent instanceof Table && ((Table) parent).getTableConfiguration().getType().equals(NF_PROPERTY_TABLE)) {
+ if (parent instanceof Table && ((Table) parent).getTableConfiguration().getType().equals(PROPERTY_TABLE)) {
return true;
}
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTableRowAxisManager.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTableRowAxisManager.java
similarity index 85%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTableRowAxisManager.java
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTableRowAxisManager.java
index 34ed58e..5205d31 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/nfproperties/NFPTableRowAxisManager.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/properties/PropertyTableRowAxisManager.java
@@ -13,7 +13,7 @@
* Ansgar Radermacher (CEA LIST)
*
*****************************************************************************/
-package org.eclipse.papyrus.robotics.assertions.tables.nfproperties;
+package org.eclipse.papyrus.robotics.assertions.tables.properties;
import java.util.ArrayList;
import java.util.Collection;
@@ -21,7 +21,6 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty;
import org.eclipse.papyrus.robotics.profile.robotics.components.ComponentDefinition;
import org.eclipse.papyrus.uml.nattable.manager.axis.AbstractUMLSynchronizedOnFeatureAxisManager;
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
@@ -29,7 +28,7 @@
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.UMLPackage;
-public class NFPTableRowAxisManager extends AbstractUMLSynchronizedOnFeatureAxisManager {
+public class PropertyTableRowAxisManager extends AbstractUMLSynchronizedOnFeatureAxisManager {
@Override
protected List<Object> getFeaturesValue() {
@@ -39,7 +38,7 @@
Class contextCl = (Class) context;
if (StereotypeUtil.isApplied(contextCl, ComponentDefinition.class)) {
for (Property p : contextCl.getOwnedAttributes()) {
- if (StereotypeUtil.isApplied(p, NFProperty.class)) {
+ if (StereotypeUtil.isApplied(p, org.eclipse.papyrus.robotics.assertions.profile.assertions.Property.class)) {
featureValue.add(p);
}
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.di.elementtypesconfigurations b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.di.elementtypesconfigurations
index 2cb249b..40757be 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.di.elementtypesconfigurations
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.di.elementtypesconfigurations
@@ -20,14 +20,14 @@
<specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.elementtypesconfigurations#org.eclipse.papyrus.robotics.assertions.Contract"/>
<specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
</elementTypeConfigurations>
- <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.robotics.assertions.di.NFProperty_Constraint_Shape" identifier="org.eclipse.papyrus.robotics.assertions.di.NFProperty_Constraint_Shape" name="NFProperty (Property_Shape)" hint="Property_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+ <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.robotics.assertions.di.Property_Constraint_Shape" identifier="org.eclipse.papyrus.robotics.assertions.di.Property_Constraint_Shape" name="Property (Property_Shape)" hint="Property_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_NTmC1aAvEeq_SbPfmbHPaQ" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.elementtypesconfigurations#org.eclipse.papyrus.robotics.assertions.NFProperty"/>
+ <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.elementtypesconfigurations#org.eclipse.papyrus.robotics.assertions.Property"/>
<specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape"/>
</elementTypeConfigurations>
- <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.robotics.assertions.di.NFProperty_Constraint_Shape_CN" identifier="org.eclipse.papyrus.robotics.assertions.di.NFProperty_Constraint_Shape_CN" name="NFProperty (Property_Shape_CN)" hint="Property_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+ <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.robotics.assertions.di.Property_Constraint_Shape_CN" identifier="org.eclipse.papyrus.robotics.assertions.di.Property_Constraint_Shape_CN" name="Property (Property_Shape_CN)" hint="Property_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_NTmp4aAvEeq_SbPfmbHPaQ" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.elementtypesconfigurations#org.eclipse.papyrus.robotics.assertions.NFProperty"/>
+ <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.elementtypesconfigurations#org.eclipse.papyrus.robotics.assertions.Property"/>
<specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape_CN"/>
</elementTypeConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.elementtypesconfigurations b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.elementtypesconfigurations
index 61f6640..bd578d1 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.elementtypesconfigurations
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/resources/assertions.elementtypesconfigurations
@@ -14,14 +14,14 @@
</matcherConfiguration>
<specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Comment"/>
</elementTypeConfigurations>
- <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.robotics.assertions.NFProperty" identifier="org.eclipse.papyrus.robotics.assertions.NFProperty" name="NFProperty" hint="UML::Property" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+ <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.robotics.assertions.Property" identifier="org.eclipse.papyrus.robotics.assertions.Property" name="Property" hint="UML::Property" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ssdMpp_uEeqKVrOYUnGfWQ" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
<matcherConfiguration xmi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_ssdzsJ_uEeqKVrOYUnGfWQ">
- <stereotypesQualifiedNames>assertions::NFProperty</stereotypesQualifiedNames>
+ <stereotypesQualifiedNames>assertions::Property</stereotypesQualifiedNames>
</matcherConfiguration>
<specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
</elementTypeConfigurations>
- <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="__evLUMEpEeq6pesfr_g4aw" description="NFProperty advice, configures name, adds default value" identifier="org.eclipse.papyrus.robotics.assertions.types.advice.NFPropertyAdvice" target="org.eclipse.papyrus.robotics.assertions.NFProperty" editHelperAdviceClassName="org.eclipse.papyrus.robotics.assertions.types.advice.NFPropertyAdvice"/>
+ <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="__evLUMEpEeq6pesfr_g4aw" description="Property advice, configures name, adds default value" identifier="org.eclipse.papyrus.robotics.assertions.types.advice.PropertyAdvice" target="org.eclipse.papyrus.robotics.assertions.Property" editHelperAdviceClassName="org.eclipse.papyrus.robotics.assertions.types.advice.PropertyAdvice"/>
<adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="__evLUMEpEeqsdfsdf_bfgw" description="Contract advice, configures name" identifier="org.eclipse.papyrus.robotics.assertions.types.advice.ContractAdvice" target="org.eclipse.papyrus.robotics.assertions.Contract" editHelperAdviceClassName="org.eclipse.papyrus.robotics.assertions.types.advice.ContractAdvice"/>
<adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="__evLUMEpEeq6pesfsdgsdg" description="Assertion advice, configures name" identifier="org.eclipse.papyrus.robotics.assertions.types.advice.AssertionAdvice" target="org.eclipse.papyrus.robotics.assertions.Assertion" editHelperAdviceClassName="org.eclipse.papyrus.robotics.assertions.types.advice.AssertionAdvice"/>
</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/AssertionElementTypesEnumerator.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/AssertionElementTypesEnumerator.java
index efed9c3..ee7983b 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/AssertionElementTypesEnumerator.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/AssertionElementTypesEnumerator.java
@@ -26,5 +26,5 @@
public static final IHintedType ASSERTION = (IHintedType) getElementType(ASSERTION_ID);
public static final IHintedType ASSUMPTION = (IHintedType) getElementType(ASSUMPTION_ID);
public static final IHintedType GUARANTEE = (IHintedType) getElementType(GUARANTEE_ID);
- public static final IHintedType NFPROPERTY = (IHintedType) getElementType(NFPROPERTY_ID);
+ public static final IHintedType PROPERTY = (IHintedType) getElementType(PROPERTY_ID);
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/IAssertionElementTypes.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/IAssertionElementTypes.java
index 3e18ae4..88c22cc 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/IAssertionElementTypes.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/IAssertionElementTypes.java
@@ -25,5 +25,5 @@
public static final String ASSERTION_ID = PREFIX + "Assertion"; //$NON-NLS-1$
public static final String ASSUMPTION_ID = PREFIX + "Assumption"; //$NON-NLS-1$
public static final String GUARANTEE_ID = PREFIX + "Guarantee"; //$NON-NLS-1$
- public static final String NFPROPERTY_ID = PREFIX + "NFProperty"; //$NON-NLS-1$
+ public static final String PROPERTY_ID = PREFIX + "Property"; //$NON-NLS-1$
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/advice/ContractAdvice.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/advice/ContractAdvice.java
index b2d0a80..86377c7 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/advice/ContractAdvice.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/advice/ContractAdvice.java
@@ -59,7 +59,7 @@
*/
@Override
protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
- CompositeCommand compositeCommand = new CompositeCommand("Configure NFProperty"); //$NON-NLS-1$
+ CompositeCommand compositeCommand = new CompositeCommand("Configure contract"); //$NON-NLS-1$
EObject newElement = request.getElementToConfigure();
if (!(newElement instanceof Comment)) {
return super.getAfterConfigureCommand(request);
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/advice/NFPropertyAdvice.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/advice/PropertyAdvice.java
similarity index 94%
rename from plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/advice/NFPropertyAdvice.java
rename to plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/advice/PropertyAdvice.java
index ccf010a..69eb295 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/advice/NFPropertyAdvice.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.types/src/org/eclipse/papyrus/robotics/assertions/types/advice/PropertyAdvice.java
@@ -25,7 +25,6 @@
import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;
-import org.eclipse.papyrus.robotics.assertions.profile.assertions.NFProperty;
import org.eclipse.papyrus.robotics.assertions.profile.util.AssertionsResource;
import org.eclipse.papyrus.robotics.core.commands.CancelCommand;
import org.eclipse.papyrus.robotics.core.menu.EnhancedPopupMenu;
@@ -38,8 +37,9 @@
import org.eclipse.uml2.uml.UMLFactory;
import org.eclipse.uml2.uml.UMLPackage;
-public class NFPropertyAdvice extends AbstractApplyStereotypeEditHelperAdvice {
+public class PropertyAdvice extends AbstractApplyStereotypeEditHelperAdvice {
+ // Language to use.
private static final String PARAMETER = "Parameter"; //$NON-NLS-1$
/**
@@ -49,7 +49,7 @@
*/
@Override
protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
- CompositeCommand compositeCommand = new CompositeCommand("Configure NFProperty"); //$NON-NLS-1$
+ CompositeCommand compositeCommand = new CompositeCommand("Configure Property"); //$NON-NLS-1$
EObject newElement = request.getElementToConfigure();
if (!(newElement instanceof Property)) {
return super.getAfterConfigureCommand(request);
@@ -92,6 +92,6 @@
@Override
protected Class<? extends EObject> stereotypeToApply() {
- return NFProperty.class;
+ return org.eclipse.papyrus.robotics.assertions.profile.assertions.Property.class;
}
}
diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.ui/src/org/eclipse/papyrus/robotics/assertions/ui/actions/CalculateNFPropertyHandler.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.ui/src/org/eclipse/papyrus/robotics/assertions/ui/actions/CalculateNFPropertyHandler.java
index e5609d3..84980f3 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.ui/src/org/eclipse/papyrus/robotics/assertions/ui/actions/CalculateNFPropertyHandler.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.ui/src/org/eclipse/papyrus/robotics/assertions/ui/actions/CalculateNFPropertyHandler.java
@@ -9,7 +9,7 @@
*
* Contributors:
* Jabier Martinez, Tecnalia - Initial design and implementation
- * Angel López, Tecnalia - Implementation
+ * Angel L�pez, Tecnalia - Implementation
*
*****************************************************************************/
package org.eclipse.papyrus.robotics.assertions.ui.actions;
@@ -41,7 +41,7 @@
}
// display the value
- MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Calculate NFProperty",
+ MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Calculate Property",
"Value: " + print);
}
