Commit 26.7 20:30

removed connection anchor from model and regenerated model code

org.framed.iorm.model.edit/.gitignore

-/bin/

org.framed.iorm.model.edit/plugin.properties

@@ -38,7 +38,6 @@ _UI_Relation_sourceLabel_feature = Source Label
 _UI_Relation_targetLabel_feature = Target Label
 _UI_Relation_referencedRelation_feature = Referenced Relation
 _UI_Relation_referencedRoles_feature = Referenced Roles
-_UI_Relation_connectionAnchor_feature = Connection Anchor
 _UI_Shape_firstSegment_feature = First Segment
 _UI_Shape_secondSegment_feature = Second Segment
 _UI_Shape_model_feature = Model

org.framed.iorm.model.edit/src/org/framed/iorm/model/provider/RelationItemProvider.java

@@ -50,7 +50,6 @@ public class RelationItemProvider extends ModelElementItemProvider {
 			addSourcePropertyDescriptor(object);
 			addReferencedRelationPropertyDescriptor(object);
 			addReferencedRolesPropertyDescriptor(object);
-			addConnectionAnchorPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -115,21 +114,6 @@ public class RelationItemProvider extends ModelElementItemProvider {
 						OrmPackage.Literals.RELATION__REFERENCED_ROLES, true, false, true, null, null, null));
 	}
 
-	/**
-	 * This adds a property descriptor for the Connection Anchor feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addConnectionAnchorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(), getString("_UI_Relation_connectionAnchor_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Relation_connectionAnchor_feature",
-								"_UI_Relation_type"),
-						OrmPackage.Literals.RELATION__CONNECTION_ANCHOR, true, false, true, null, null, null));
-	}
-
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

org.framed.iorm.model/model/IORM.ecore

@@ -34,7 +34,6 @@
         eType="#//Relation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="referencedRoles" upperBound="-1"
         eType="#//Shape"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="connectionAnchor" eType="#//Shape"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Shape" eSuperTypes="#//ModelElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="firstSegment" eType="#//Segment"

org.framed.iorm.model/model/IORM.genmodel

@@ -54,7 +54,6 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference IORM.ecore#//Relation/targetLabel"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference IORM.ecore#//Relation/referencedRelation"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference IORM.ecore#//Relation/referencedRoles"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference IORM.ecore#//Relation/connectionAnchor"/>
     </genClasses>
     <genClasses ecoreClass="IORM.ecore#//Shape">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference IORM.ecore#//Shape/firstSegment"/>

org.framed.iorm.model/src/org/framed/iorm/model/OrmPackage.java

@@ -331,15 +331,6 @@ public interface OrmPackage extends EPackage {
 	 */
 	int RELATION__REFERENCED_ROLES = MODEL_ELEMENT_FEATURE_COUNT + 5;
 
-	/**
-	 * The feature id for the '<em><b>Connection Anchor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATION__CONNECTION_ANCHOR = MODEL_ELEMENT_FEATURE_COUNT + 6;
-
 	/**
 	 * The number of structural features of the '<em>Relation</em>' class.
 	 * <!-- begin-user-doc -->
@@ -347,7 +338,7 @@ public interface OrmPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int RELATION_FEATURE_COUNT = MODEL_ELEMENT_FEATURE_COUNT + 7;
+	int RELATION_FEATURE_COUNT = MODEL_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
 	 * The number of operations of the '<em>Relation</em>' class.
@@ -708,17 +699,6 @@ public interface OrmPackage extends EPackage {
 	 */
 	EReference getRelation_ReferencedRoles();
 
-	/**
-	 * Returns the meta object for the reference '{@link org.framed.iorm.model.Relation#getConnectionAnchor <em>Connection Anchor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Connection Anchor</em>'.
-	 * @see org.framed.iorm.model.Relation#getConnectionAnchor()
-	 * @see #getRelation()
-	 * @generated
-	 */
-	EReference getRelation_ConnectionAnchor();
-
 	/**
 	 * Returns the meta object for class '{@link org.framed.iorm.model.Shape <em>Shape</em>}'.
 	 * <!-- begin-user-doc -->
@@ -979,14 +959,6 @@ public interface OrmPackage extends EPackage {
 		 */
 		EReference RELATION__REFERENCED_ROLES = eINSTANCE.getRelation_ReferencedRoles();
 
-		/**
-		 * The meta object literal for the '<em><b>Connection Anchor</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RELATION__CONNECTION_ANCHOR = eINSTANCE.getRelation_ConnectionAnchor();
-
 		/**
 		 * The meta object literal for the '{@link org.framed.iorm.model.impl.ShapeImpl <em>Shape</em>}' class.
 		 * <!-- begin-user-doc -->

org.framed.iorm.model/src/org/framed/iorm/model/Relation.java

@@ -19,7 +19,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.framed.iorm.model.Relation#getTargetLabel <em>Target Label</em>}</li>
  *   <li>{@link org.framed.iorm.model.Relation#getReferencedRelation <em>Referenced Relation</em>}</li>
  *   <li>{@link org.framed.iorm.model.Relation#getReferencedRoles <em>Referenced Roles</em>}</li>
- *   <li>{@link org.framed.iorm.model.Relation#getConnectionAnchor <em>Connection Anchor</em>}</li>
  * </ul>
  *
  * @see org.framed.iorm.model.OrmPackage#getRelation()
@@ -167,30 +166,4 @@ public interface Relation extends ModelElement {
 	 */
 	EList<Shape> getReferencedRoles();
 
-	/**
-	 * Returns the value of the '<em><b>Connection Anchor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Anchor</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Connection Anchor</em>' reference.
-	 * @see #setConnectionAnchor(Shape)
-	 * @see org.framed.iorm.model.OrmPackage#getRelation_ConnectionAnchor()
-	 * @model
-	 * @generated
-	 */
-	Shape getConnectionAnchor();
-
-	/**
-	 * Sets the value of the '{@link org.framed.iorm.model.Relation#getConnectionAnchor <em>Connection Anchor</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection Anchor</em>' reference.
-	 * @see #getConnectionAnchor()
-	 * @generated
-	 */
-	void setConnectionAnchor(Shape value);
-
 } // Relation

org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java

@@ -313,15 +313,6 @@ public class OrmPackageImpl extends EPackageImpl implements OrmPackage {
 		return (EReference) relationEClass.getEStructuralFeatures().get(5);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRelation_ConnectionAnchor() {
-		return (EReference) relationEClass.getEStructuralFeatures().get(6);
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -444,7 +435,6 @@ public class OrmPackageImpl extends EPackageImpl implements OrmPackage {
 		createEReference(relationEClass, RELATION__TARGET_LABEL);
 		createEReference(relationEClass, RELATION__REFERENCED_RELATION);
 		createEReference(relationEClass, RELATION__REFERENCED_ROLES);
-		createEReference(relationEClass, RELATION__CONNECTION_ANCHOR);
 
 		shapeEClass = createEClass(SHAPE);
 		createEReference(shapeEClass, SHAPE__FIRST_SEGMENT);
@@ -550,9 +540,6 @@ public class OrmPackageImpl extends EPackageImpl implements OrmPackage {
 		initEReference(getRelation_ReferencedRoles(), this.getShape(), null, "referencedRoles", null, 0, -1,
 				Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
 				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRelation_ConnectionAnchor(), this.getShape(), null, "connectionAnchor", null, 0, 1,
-				Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(shapeEClass, Shape.class, "Shape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getShape_FirstSegment(), this.getSegment(), null, "firstSegment", null, 0, 1, Shape.class,