#Commit 29.7 20:00

fixed bug when reseting the layout on an relationship with intra
relationship constraints,
relationships, inheritances and role constraints now have their source
and target roles as referenced roles also 

org.framed.iorm.ui/src/org/framed/iorm/ui/graphitifeatures/ResetLayoutForElementFeature.java

@@ -33,18 +33,19 @@ public class ResetLayoutForElementFeature extends AbstractCustomFeature {
 	private final String RESET_LAYOUT_FEATURE_NAME = NameLiterals.RESET_LAYOUT_FEATURE_NAME;
 	
 	/**
-	 * the values for the property shape id of the roles shapes needed to execute this feature
+	 * the values for the property shape id needed to execute this feature
 	 * gathered from {@link IdentifierLiterals}
 	 */
 	private final String SHAPE_ID_ROLETYPE_OCCURRENCE_CONSTRAINT = IdentifierLiterals.SHAPE_ID_ROLETYPE_OCCURRENCE_CONSTRAINT,
-						 SHAPE_ID_ROLETYPE_TYPEBODY = IdentifierLiterals.SHAPE_ID_ROLETYPE_TYPEBODY;
+						 SHAPE_ID_ROLETYPE_TYPEBODY = IdentifierLiterals.SHAPE_ID_ROLETYPE_TYPEBODY,
+						 SHAPE_ID_INTRA_REL_CON_NAME_DECORATOR = IdentifierLiterals.SHAPE_ID_INTRA_REL_CON_NAME_DECORATOR;
 	
 	/**
 	 * layout integers gathered from {@link LayoutLiterals}
 	 */
 	private final int DISTANCE_FROM_CONNECTION_LINE = LayoutLiterals.DISTANCE_FROM_CONNECTION_LINE,
 					  PUFFER_BETWEEN_ELEMENTS = LayoutLiterals.PUFFER_BETWEEN_ELEMENTS,
-					  HEIGHT_OCCURRENCE_CONSTRAINT = LayoutLiterals.HEIGHT_CONSTRAINT;
+					  HEIGHT_CONSTRAINT = LayoutLiterals.HEIGHT_CONSTRAINT;
 
 	/**
 	 * the graphics algorithm service used to edit graphics algorithms
@@ -107,10 +108,14 @@ public class ResetLayoutForElementFeature extends AbstractCustomFeature {
 		}
 		if(connection == null) return;
 		connection.getBendpoints().clear();
+		int intraRelConsAdded = 0;
 		for(ConnectionDecorator decorator : connection.getConnectionDecorators()) {
+			if(PropertyUtil.isShape_IdValue(decorator, SHAPE_ID_INTRA_REL_CON_NAME_DECORATOR)) {
+				graphicAlgorithmService.setLocation(decorator.getGraphicsAlgorithm(), DISTANCE_FROM_CONNECTION_LINE, intraRelConsAdded*HEIGHT_CONSTRAINT);
+				intraRelConsAdded++;
+			} else {
 				graphicAlgorithmService.setLocation(decorator.getGraphicsAlgorithm(), DISTANCE_FROM_CONNECTION_LINE, -1*DISTANCE_FROM_CONNECTION_LINE);
-		}
-	}
+	}	}	}
 	
 	/**
 	 * executes the feature for the role types
@@ -126,10 +131,10 @@ public class ResetLayoutForElementFeature extends AbstractCustomFeature {
 		}
 		if(typeBodyShape != null && occurenceConstraintShape != null) {
 			RoundedRectangle typeBodyRectangle = (RoundedRectangle) typeBodyShape.getGraphicsAlgorithm();
-			System.out.println(typeBodyRectangle.getX()+typeBodyRectangle.getWidth()/2-HEIGHT_OCCURRENCE_CONSTRAINT/2);
+			System.out.println(typeBodyRectangle.getX()+typeBodyRectangle.getWidth()/2-HEIGHT_CONSTRAINT/2);
 			graphicAlgorithmService.setLocation(occurenceConstraintShape.getGraphicsAlgorithm(),
-				typeBodyRectangle.getX()+typeBodyRectangle.getWidth()/2-HEIGHT_OCCURRENCE_CONSTRAINT/2, 
-				typeBodyRectangle.getY()-HEIGHT_OCCURRENCE_CONSTRAINT-PUFFER_BETWEEN_ELEMENTS);
+				typeBodyRectangle.getX()+typeBodyRectangle.getWidth()/2-HEIGHT_CONSTRAINT/2, 
+				typeBodyRectangle.getY()-HEIGHT_CONSTRAINT-PUFFER_BETWEEN_ELEMENTS);
 		}
 	}
 }

org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/InheritancePattern.java

@@ -13,6 +13,7 @@ import org.eclipse.graphiti.mm.pictograms.PictogramElement;
 import org.eclipse.graphiti.util.IColorConstant;
 import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Relation;
+import org.framed.iorm.model.Shape;
 import org.framed.iorm.model.Type;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.LayoutLiterals;
@@ -195,7 +196,7 @@ public class InheritancePattern extends FRaMEDConnectionPattern {
 	 * <p>
 	 * Step 1: get source and target shapes<br>
 	 * Step 2: get new inheritance and add it to the resource of the diagram<br>
-	 * Step 3: set source, target and container of inheritance<br>
+	 * Step 3: set source, target, referenced roles and container of inheritance<br>
 	 * Step 4: call add operation of this pattern
 	 */
 	@Override
@@ -214,6 +215,10 @@ public class InheritancePattern extends FRaMEDConnectionPattern {
 	    sourceShape.getContainer().getElements().add(newInheritance);
 	    newInheritance.setSource(sourceShape);
 	    newInheritance.setTarget(targetShape);
+	    if(sourceShape.getType() == Type.ROLE_TYPE) {	
+	    	newInheritance.getReferencedRoles().add((Shape) sourceShape);
+	    	newInheritance.getReferencedRoles().add((Shape) targetShape);
+	    }	
 	    //Step 4
 	    AddConnectionContext addContext = new AddConnectionContext(sourceAnchor, targetAnchor);
 	    addContext.setNewObject(newInheritance);

org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/RelationshipPattern.java

@@ -17,6 +17,7 @@ import org.eclipse.graphiti.util.IColorConstant;
 import org.framed.iorm.model.NamedElement;
 import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Relation;
+import org.framed.iorm.model.Shape;
 import org.framed.iorm.model.Type;
 import org.framed.iorm.ui.graphitifeatures.EditRelationshipFeature;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
@@ -257,7 +258,7 @@ public class RelationshipPattern extends FRaMEDConnectionPattern {
 	 * <p>
 	 * Step 1: get source and target shapes<br>
 	 * Step 2: get new relationship and add it to the resource of the diagram<br>
-	 * Step 3: set source, target and container of inheritance<br>
+	 * Step 3: set source, target, referenced roles and container of inheritance<br>
 	 * Step 4: sets the cardinalities of the relationship to the standard value <b>*</b><br>
 	 * Step 5: call add operation of this pattern
 	 */
@@ -279,7 +280,9 @@ public class RelationshipPattern extends FRaMEDConnectionPattern {
 	    newRelationship.setContainer(sourceShape.getContainer());
 	    sourceShape.getContainer().getElements().add(newRelationship);
 	    newRelationship.setSource(sourceShape);
+	    newRelationship.getReferencedRoles().add((Shape) sourceShape);
 	    newRelationship.setTarget(targetShape);
+	    newRelationship.getReferencedRoles().add((Shape) targetShape);
 	    //Step 4
 	    NamedElement sourceLabel = OrmFactory.eINSTANCE.createNamedElement();
 	    NamedElement targetLabel = OrmFactory.eINSTANCE.createNamedElement();

org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/intrarelationship/AbstractIntraRelationshipConstraintPattern.java

@@ -50,9 +50,10 @@ public abstract class AbstractIntraRelationshipConstraintPattern extends FRaMEDS
 	private final String SHAPE_ID_INTRA_REL_CON_NAME_DECORATOR = IdentifierLiterals.SHAPE_ID_INTRA_REL_CON_NAME_DECORATOR;
 	
 	/**
-	 * height of the text shape for the intra relationship constraint
+	 * layout integers gathered from {@link LayoutLiterals}
 	 */
-	private final int HEIGHT_CONSTRAINT = LayoutLiterals.HEIGHT_CONSTRAINT;
+	private final int HEIGHT_CONSTRAINT = LayoutLiterals.HEIGHT_CONSTRAINT,
+					  DISTANCE_FROM_CONNECTION_LINE = LayoutLiterals.DISTANCE_FROM_CONNECTION_LINE;
 	
 	/**
 	 * the color values gathered from {@link LayoutLiterals}
@@ -148,7 +149,7 @@ public abstract class AbstractIntraRelationshipConstraintPattern extends FRaMEDS
 			pictogramElementCreateService.createConnectionDecorator(targetConnection, true, 0.5, true); 
 		Text nameText = graphicAlgorithmService.createText(constraintName, type.getName().toLowerCase());
 		nameText.setForeground(manageColor(COLOR_CONSTRAINT_TEXT));
-		graphicAlgorithmService.setLocation(nameText, 0, (numberOfReferencedRelations-1)*HEIGHT_CONSTRAINT);
+		graphicAlgorithmService.setLocation(nameText, DISTANCE_FROM_CONNECTION_LINE, (numberOfReferencedRelations-1)*HEIGHT_CONSTRAINT);
 		PropertyUtil.setShape_IdValue(constraintName, SHAPE_ID_INTRA_REL_CON_NAME_DECORATOR);
 		link(constraintName, addContext.getNewObject());
 		return constraintName;

org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/roleconstraint/AbstractRoleConstraintPattern.java

@@ -8,6 +8,7 @@ import org.eclipse.graphiti.mm.pictograms.Connection;
 import org.eclipse.graphiti.util.IColorConstant;
 import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Relation;
+import org.framed.iorm.model.Shape;
 import org.framed.iorm.model.Type;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.LayoutLiterals;
@@ -135,7 +136,9 @@ public abstract class AbstractRoleConstraintPattern extends FRaMEDConnectionPatt
 	    newRoleConstraint.setContainer(sourceShape.getContainer());
 	    sourceShape.getContainer().getElements().add(newRoleConstraint);
 		newRoleConstraint.setSource(sourceShape);
+		newRoleConstraint.getReferencedRoles().add((Shape) sourceShape);
 		newRoleConstraint.setTarget(targetShape);
+		newRoleConstraint.getReferencedRoles().add((Shape) targetShape);
 	    //Step 4
 	    AddConnectionContext addContext = new AddConnectionContext(sourceAnchor, targetAnchor);
 	    addContext.setNewObject(newRoleConstraint);