diff --git a/org.framed.iorm.model.edit/.gitignore b/org.framed.iorm.model.edit/.gitignore
deleted file mode 100644
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..0000000000000000000000000000000000000000
--- a/org.framed.iorm.model.edit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/featuremodel/provider/FRaMEDConfigurationItemProvider.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/featuremodel/provider/FRaMEDConfigurationItemProvider.class
new file mode 100644
index 0000000000000000000000000000000000000000..d5cde9e136ccf6ceddf814987e0e2376a790450c
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/featuremodel/provider/FRaMEDConfigurationItemProvider.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/featuremodel/provider/FRaMEDFeatureItemProvider.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/featuremodel/provider/FRaMEDFeatureItemProvider.class
new file mode 100644
index 0000000000000000000000000000000000000000..21a32a79cf9486bc0fb6e5fde78db72516b1118e
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/featuremodel/provider/FRaMEDFeatureItemProvider.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/featuremodel/provider/FeaturemodelItemProviderAdapterFactory.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/featuremodel/provider/FeaturemodelItemProviderAdapterFactory.class
new file mode 100644
index 0000000000000000000000000000000000000000..0cdd548fe2d62a1213b2ccf7a1b50875cc8e9efc
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/featuremodel/provider/FeaturemodelItemProviderAdapterFactory.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ModelElementItemProvider.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ModelElementItemProvider.class
new file mode 100644
index 0000000000000000000000000000000000000000..f1a5c5dccd0d6f407999aafa2a604543a4426e8d
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ModelElementItemProvider.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ModelItemProvider.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ModelItemProvider.class
new file mode 100644
index 0000000000000000000000000000000000000000..18f812f4570f3aad752ff55c597df49476e000df
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ModelItemProvider.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/NamedElementItemProvider.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/NamedElementItemProvider.class
new file mode 100644
index 0000000000000000000000000000000000000000..855eaac2327e291532a4fdd46c717deaf46a601c
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/NamedElementItemProvider.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ORMEditPlugin$Implementation.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ORMEditPlugin$Implementation.class
new file mode 100644
index 0000000000000000000000000000000000000000..1a3e4958fb6794e089c932429a336342ac580c1b
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ORMEditPlugin$Implementation.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ORMEditPlugin.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ORMEditPlugin.class
new file mode 100644
index 0000000000000000000000000000000000000000..84f1d7bc0c5c2648041abf3c57bbc557d72b827c
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ORMEditPlugin.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/OrmItemProviderAdapterFactory.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/OrmItemProviderAdapterFactory.class
new file mode 100644
index 0000000000000000000000000000000000000000..2a1a783183269ac290123e6fc9913ffc0238dc8e
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/OrmItemProviderAdapterFactory.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/RelationItemProvider.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/RelationItemProvider.class
new file mode 100644
index 0000000000000000000000000000000000000000..0c6a2fbf76ae6c992cf3ce8a01619cc25c1340a0
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/RelationItemProvider.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/SegmentItemProvider.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/SegmentItemProvider.class
new file mode 100644
index 0000000000000000000000000000000000000000..608060dd43f3cea3ba9e7fe1bf456fed58bae4c6
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/SegmentItemProvider.class differ
diff --git a/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ShapeItemProvider.class b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ShapeItemProvider.class
new file mode 100644
index 0000000000000000000000000000000000000000..bf6c49bb1027017f6cd3360120c8f9c813d29afc
Binary files /dev/null and b/org.framed.iorm.model.edit/bin/org/framed/iorm/model/provider/ShapeItemProvider.class differ
diff --git a/org.framed.iorm.model.edit/plugin.properties b/org.framed.iorm.model.edit/plugin.properties
index 1b328f571a5605405bf7c235b390a92c51c2fe02..5c0cf60365942adc254fcc0334b8d872b2394687 100644
--- a/org.framed.iorm.model.edit/plugin.properties
+++ b/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
diff --git a/org.framed.iorm.model.edit/src/org/framed/iorm/model/provider/RelationItemProvider.java b/org.framed.iorm.model.edit/src/org/framed/iorm/model/provider/RelationItemProvider.java
index 5e54085d85072200cde002463f4b4e73c255f918..ba3b71ed1bbe079fef8957913dc5ef7d9897912d 100644
--- a/org.framed.iorm.model.edit/src/org/framed/iorm/model/provider/RelationItemProvider.java
+++ b/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
diff --git a/org.framed.iorm.model/model/IORM.ecore b/org.framed.iorm.model/model/IORM.ecore
index 05297994aafba2eac51255980a7048f71c64488b..43723b14ae830e6c8bcdd3e5575e6b8376089e4d 100644
--- a/org.framed.iorm.model/model/IORM.ecore
+++ b/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"
diff --git a/org.framed.iorm.model/model/IORM.genmodel b/org.framed.iorm.model/model/IORM.genmodel
index 52c0daafe8d488afb638cf1c2e73baad0f1a4136..42196deeede8b221f3a3c17576977a64652e0fc0 100644
--- a/org.framed.iorm.model/model/IORM.genmodel
+++ b/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"/>
diff --git a/org.framed.iorm.model/src/org/framed/iorm/model/OrmPackage.java b/org.framed.iorm.model/src/org/framed/iorm/model/OrmPackage.java
index 6b9cf616eaf56e38e7ceb80d906bfb952bc2b4c8..c422b9f66019003d401bfd9a69d1915fd78229d0 100644
--- a/org.framed.iorm.model/src/org/framed/iorm/model/OrmPackage.java
+++ b/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 -->
diff --git a/org.framed.iorm.model/src/org/framed/iorm/model/Relation.java b/org.framed.iorm.model/src/org/framed/iorm/model/Relation.java
index e1a2e1865c4efc77bf3f27235a145dad51e136ab..6a98684eac6781e520238d513935c064bb3ec372 100644
--- a/org.framed.iorm.model/src/org/framed/iorm/model/Relation.java
+++ b/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
diff --git a/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java b/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java
index cfbde4ca9aeb5196d829075506f8b8a64fb1313d..fad75ed28167b301eecc145ef3b04cba51cd3ddf 100644
--- a/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java
+++ b/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,
diff --git a/org.framed.iorm.model/src/org/framed/iorm/model/impl/RelationImpl.java b/org.framed.iorm.model/src/org/framed/iorm/model/impl/RelationImpl.java
index 0f8b4b5bb1c0ab70352d81a820c737d3827943f1..ac39c3f2fb91f24d1f1f130b0743e62511103116 100644
--- a/org.framed.iorm.model/src/org/framed/iorm/model/impl/RelationImpl.java
+++ b/org.framed.iorm.model/src/org/framed/iorm/model/impl/RelationImpl.java
@@ -26,7 +26,6 @@ import org.framed.iorm.model.Shape;
* <li>{@link org.framed.iorm.model.impl.RelationImpl#getTargetLabel <em>Target Label</em>}</li>
* <li>{@link org.framed.iorm.model.impl.RelationImpl#getReferencedRelation <em>Referenced Relation</em>}</li>
* <li>{@link org.framed.iorm.model.impl.RelationImpl#getReferencedRoles <em>Referenced Roles</em>}</li>
- * <li>{@link org.framed.iorm.model.impl.RelationImpl#getConnectionAnchor <em>Connection Anchor</em>}</li>
* </ul>
*
* @generated
@@ -143,22 +142,4 @@ public class RelationImpl extends ModelElementImpl implements Relation {
return (EList<Shape>) eGet(OrmPackage.Literals.RELATION__REFERENCED_ROLES, true);
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Shape getConnectionAnchor() {
- return (Shape) eGet(OrmPackage.Literals.RELATION__CONNECTION_ANCHOR, true);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConnectionAnchor(Shape newConnectionAnchor) {
- eSet(OrmPackage.Literals.RELATION__CONNECTION_ANCHOR, newConnectionAnchor);
- }
-
} //RelationImpl
diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/graphitifeatures/FRaMEDDeleteConnectionFeature.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/graphitifeatures/FRaMEDDeleteConnectionFeature.java
index 3f4fe843c4b7d06b824a26fae7847f26d23d25dc..18f910ea237c196789bba73fb92632bb621bc9e4 100644
--- a/org.framed.iorm.ui/src/org/framed/iorm/ui/graphitifeatures/FRaMEDDeleteConnectionFeature.java
+++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/graphitifeatures/FRaMEDDeleteConnectionFeature.java
@@ -15,8 +15,6 @@ import org.framed.iorm.model.Type;
import org.framed.iorm.ui.literals.IdentifierLiterals;
import org.framed.iorm.ui.providers.FeatureProvider;
import org.framed.iorm.ui.util.ConnectionPatternUtil;
-import org.framed.iorm.ui.util.GeneralUtil;
-import org.framed.iorm.ui.util.PropertyUtil;
/**
* This graphiti custom feature is used to disabling the possibility of deleting connection decorators and the
diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/interrelationship/RelationshipExclusionConstraintPattern.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/interrelationship/RelationshipExclusionConstraintPattern.java
index 88ec693e1d29e7f64bbeea0728bfbdf8022131cf..846df58d00092db1c59baf5cb18db07be74d6c25 100644
--- a/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/interrelationship/RelationshipExclusionConstraintPattern.java
+++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/interrelationship/RelationshipExclusionConstraintPattern.java
@@ -2,7 +2,6 @@ package org.framed.iorm.ui.pattern.connections.interrelationship;
import org.eclipse.graphiti.features.context.IAddContext;
import org.eclipse.graphiti.features.context.ICreateConnectionContext;
-import org.eclipse.graphiti.mm.algorithms.Polygon;
import org.eclipse.graphiti.mm.algorithms.Polyline;
import org.eclipse.graphiti.mm.pictograms.Connection;
import org.eclipse.graphiti.mm.pictograms.ConnectionDecorator;