rename EditPolicyHandler to EditPolicyService

org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyRuleVisitor.java

@@ -20,15 +20,15 @@ public class EditPolicyRuleVisitor {
 	/**
 	 * command to check rules against
 	 */
-	private Command cmd;
+	private Object context;
 
 	/**
 	 * whether editor is in StepIn/StepOut-View
 	 */
 	private boolean isStepOut;
 
-	public EditPolicyRuleVisitor(Command cmd, boolean isStepOut) {
-		this.cmd = cmd;
+	public EditPolicyRuleVisitor(Object context, boolean isStepOut) {
+		this.context = context;
 		this.isStepOut = isStepOut;
 	}
 

org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyHandler.java → org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyService.java

 package org.framed.iorm.ui.editPolicy;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import javax.naming.Context;
@@ -18,10 +20,10 @@ import org.eclipse.graphiti.features.context.IReconnectionContext;
 import org.eclipse.graphiti.mm.pictograms.Diagram;
 import org.framed.iorm.featuremodel.FRaMEDConfiguration;
 import org.framed.iorm.featuremodel.FRaMEDFeature;
-import org.framed.iorm.model.Model;
 import org.framed.iorm.ui.util.DiagramUtil;
 import org.framed.iorm.model.*;
-import model.*;;
+import model.*;
+import model.Model;;
 
 /**
  * This class provides canExecute(Command cmd) which checks whether a given command may execute according to editPolicies
@@ -29,115 +31,101 @@ import model.*;;
  * @author Christian Deussen
  *
  */
-public class EditPolicyHandler{
+public class EditPolicyService {
 
 	/**
 	 * current configuration
 	 */
-	private FRaMEDConfiguration configuration;
+	private static Map<String, FRaMEDConfiguration> configurations;
 
 	/**
 	 * xmi model
 	 */
-	private Model model;
+	private static Model model;
 	/**
 	 * list of Policy-Rules which need to be evaluated
 	 */
-	private Set<Policy> policies;
+	private static Map<String, Set<Policy>> policies;
 
-	public EditPolicyHandler(FRaMEDConfiguration configuration)
+	public static void initEditPolicyService()
 	{
-		this.configuration = configuration;
-		model = this.loadModel();
-
-		this.loadPolicyRules();
+		configurations = new HashMap<>();
+		policies = new HashMap<>();
+		System.out.println("loading model: ...");
+		model = loadModel();
 	}
 	
-	/**
-	 * loads all Policies which are activated by current configuration
-	 */
-	private void loadPolicyRules()
+	private static Set<Policy> getPolicies(Diagram diagram)
 	{
-		  System.out.println("-------------------------------");
-		  System.out.println("---Loading editPolicy rules----");
-		 /* for (FRaMEDFeature feature : this.configuration.getFeatures()) {
-			  System.out.println("EditPolicyHandler feature: " + feature.getName().getName());
-		  }
-		  System.out.println("-------------------------------");
+		Diagram mainDiagram = DiagramUtil.getMainDiagramForAnyDiagram(diagram);
 		
+		if(!configurations.containsKey(mainDiagram.getName())) {
+			//get config from diagram
+			FRaMEDConfiguration config = DiagramUtil.getRootModelForAnyDiagram(mainDiagram).getFramedConfiguration();
+			configurations.put(diagram.getName(), config);
 			
-		policies = new HashSet<>();
+			//load all rules which are activated by current configuration
+			Set<Policy> policySet = new HashSet<>();
 
-		EditPolicyConfigurationVisitor editPolicyConfigurationVisitor = new EditPolicyConfigurationVisitor(configuration);
-		for (Mapping mapping : (Mapping[]) model.getConfiguration()
-				.getMappings().toArray()) {
+			EditPolicyConfigurationVisitor editPolicyConfigurationVisitor = new EditPolicyConfigurationVisitor(config);
+			for (Mapping mapping : (Mapping[])  model.getConfiguration().getMappings().toArray()) {
 				if (editPolicyConfigurationVisitor.abstractMappingRuleVisitor(mapping.getRule()))
-				policies.add(mapping.getPolicy());
+					policySet.add(mapping.getPolicy());
 			}
-		 */
+			
+			policies.put(diagram.getName(), policySet);
 		}
-	public static boolean canAdd(IAddContext context, Diagram diagram) {
-		  System.out.println("---can add check----");
 
-		return true;
+		return policies.get(diagram.getName());
 	}
 
-	public static boolean canCreate(ICreateConnectionContext context, Diagram diagram) {
-		  System.out.println("---can create check----");
+	public static boolean canAdd(IAddContext context, Diagram diagram) {
+		  System.out.println("---can add check----");
 
 		return true;
 	}
 	
-	public static boolean canCreate(ICreateContext context, Diagram diagram) {
-		
-		FRaMEDConfiguration configuration = DiagramUtil.getRootModelForAnyDiagram(diagram).getFramedConfiguration();
-
+	public static boolean canCreate(ICreateConnectionContext context, Diagram diagram) {
 		  System.out.println("---can create check----");
 
-		for (FRaMEDFeature feature : configuration.getFeatures()) {
-		  System.out.println("EditPolicyHandler feature: " + feature.getName().getName());
-	  }
-	  System.out.println("-------------------------------");
-
-		
 		return true;
 	}
 	
 	/**
-	 * canExecute is called to check whether a command is allowed to execute in a given situation
+	 * canCreate is called to check whether a command is allowed to execute in a given situation
 	 * checks each policy
 	 *
 	 * this function
 	 * @param cmd
 	 * @return Boolean
 	 */
-	public boolean canExecute( FRaMEDConfiguration configuration)
+	public static boolean canCreate(ICreateContext context, Diagram diagram) 
 	{	
-		/*
-		EditPolicyRuleVisitor editPolicyRuleVisitor = new EditPolicyRuleVisitor(cmd, this.isStepOut);
+		  System.out.println("---can create check----");
 		  
-		for (Policy policy : policies) {
+			EditPolicyRuleVisitor editPolicyRuleVisitor = new EditPolicyRuleVisitor(context, false);
+			for (Policy policy : getPolicies(diagram)) {
 				if (!editPolicyRuleVisitor.abstractRuleVisitor(policy.getRule())) {
 					System.out.println("Not Allowed because of: " + policy.getName());
 					return false;
 				}
 			}
-				*/
+			System.out.println("-------------------------------");
+
 		
 		return true;
 	} 
 
-
 	/*
 	 * Load editPolicy ecore Model from file.
 	 */
-	private Model loadModel()
+	private static Model loadModel()
 	{
-		/*
+		
 		//String("platform:/plugin/org.framed.orm.editPolicy.model/model/noRules.xmi");
 		//String filename = new String("platform:/plugin/org.framed.orm.editPolicy.model/model/basicRules.xmi");
 		//String filename = new String("platform:/plugin/org.framed.orm.editPolicy.model/model/featureRules.xmi");
-		String filename = new String("platform:/plugin/org.framed.orm.editPolicy.model/model/allRules.xmi");
+		String filename = new String("platform:/plugin/org.framed.iorm.editPolicy.model/model/allRules.xmi");
 		
 		try {
 			ResourceSet set = new ResourceSetImpl();
@@ -155,8 +143,8 @@ public class EditPolicyHandler{
 			for (StackTraceElement el : e.getStackTrace())
 				System.err.println(el.toString());
 		}
-				*/
 		
+		System.err.println("Was not able to load xmi:  \"" + filename + "\" due : null");
 		return null;
 	}
 

org.framed.iorm.ui/src/org/framed/iorm/ui/multipage/MultipageEditor.java

@@ -34,7 +34,7 @@ import org.eclipse.ui.forms.editor.FormEditor;
 import org.eclipse.ui.part.FileEditorInput;
 import org.framed.iorm.model.Model;
 import org.framed.iorm.transformation.TransformationExecutor;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.exceptions.InvalidTypeOfEditorInputException;
 import org.framed.iorm.ui.exceptions.TransformationFailedException;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
@@ -152,6 +152,7 @@ public class MultipageEditor extends FormEditor implements ISelectionListener, I
 	 */
 	public MultipageEditor() {
 		super();
+		EditPolicyService.initEditPolicyService();
 	}
 	
 	/**

org.framed.iorm.ui/src/org/framed/iorm/ui/multipage/MultipageEditorSynchronizationService.java

@@ -20,7 +20,7 @@ import org.eclipse.ui.forms.editor.FormEditor;
 import org.framed.iorm.featuremodel.FRaMEDConfiguration;
 import org.framed.iorm.model.Model;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.exceptions.InvalidTypeOfEditorInputException;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.util.DiagramUtil;
@@ -58,16 +58,16 @@ public class MultipageEditorSynchronizationService {
 	 */
 	private static List<Boolean> dirtyStatesOfEditors = new ArrayList<Boolean>();
 	
-	private static Map<String, EditPolicyHandler> diagramEditPolicyHandlers= new HashMap<>();
+	//private static Map<String, EditPolicyHandler> diagramEditPolicyHandlers= new HashMap<>();
 
-	public static EditPolicyHandler getEditPolicyHandlerForDiagram(Diagram diagram) {
+	//public static EditPolicyHandler getEditPolicyHandlerForDiagram(Diagram diagram) {
 	//	System.out.println("Model1: " + diagram.getName());
 	//	System.out.println("Model2: " + ((Diagram)diagramEditPolicyHandlers.keySet().toArray()[0]).getName());
 
 		//System.out.println("getting: " + diagram.toString());
 	//	System.out.println("map: " + diagramEditPolicyHandlers.keySet().toString());
-		return diagramEditPolicyHandlers.get(diagram.getName());
-	}
+	//	return diagramEditPolicyHandlers.get(diagram.getName());
+	//}
 	/**
 	 * operation to add a multipage editor to the register
 	 * @param multipageEditor the multipage editor to add
@@ -76,9 +76,9 @@ public class MultipageEditorSynchronizationService {
 		
 		//Resource resource = EditorInputUtil.getResourceFromEditorInput(multipageEditor.getEditorInput());
 		//Diagram diagram = DiagramUtil.getDiagramForResourceOfDiagramEditorInput(resource);
-		Diagram diagram = DiagramUtil.getMainDiagramForIEditorInput(multipageEditor.getEditorInput());
-		FRaMEDConfiguration config = DiagramUtil.getRootModelForAnyDiagram(diagram).getFramedConfiguration();
-		diagramEditPolicyHandlers.put(diagram.getName(), new EditPolicyHandler(config));
+		//Diagram diagram = DiagramUtil.getMainDiagramForIEditorInput(multipageEditor.getEditorInput());
+		//FRaMEDConfiguration config = DiagramUtil.getRootModelForAnyDiagram(diagram).getFramedConfiguration();
+		//diagramEditPolicyHandlers.put(diagram.getName(), new EditPolicyHandler(config));
 		registeredEditors.add(multipageEditor);
 	}
 	

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

@@ -17,7 +17,7 @@ import org.eclipse.graphiti.util.IColorConstant;
 import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.graphitifeatures.EditFulfillmentFeature;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.LayoutLiterals;
@@ -122,7 +122,7 @@ public class FulfillmentPattern extends FRaMEDConnectionPattern {
 		if (addContext.getNewObject() instanceof Relation) {
 			Relation relation = (Relation) addContext.getNewObject();
 			if (relation.getType() == Type.FULFILLMENT)
-				   return true && EditPolicyHandler.canAdd(addContext, this.getDiagram());
+				   return true && EditPolicyService.canAdd(addContext, this.getDiagram());
 		}
 		return false;
 	}
@@ -205,7 +205,7 @@ public class FulfillmentPattern extends FRaMEDConnectionPattern {
 		if (sourceShape != null && targetShape != null) {
 			if (sourceShape.getContainer() == targetShape.getContainer()) {
 				if (targetShape.getType() == Type.COMPARTMENT_TYPE)
-					   return true && EditPolicyHandler.canCreate(createContext, this.getDiagram());
+					   return true && EditPolicyService.canCreate(createContext, this.getDiagram());
 			}
 		}
 		return false;

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

@@ -15,7 +15,7 @@ import org.framed.iorm.model.ModelElement;
 import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.LayoutLiterals;
 import org.framed.iorm.ui.literals.NameLiterals;
@@ -98,7 +98,7 @@ public class InheritancePattern extends FRaMEDConnectionPattern {
 		if(addContext.getNewObject() instanceof Relation) {
 		   Relation relation = (Relation) addContext.getNewObject();
 		   if(relation.getType() == Type.INHERITANCE)
-			   return true && EditPolicyHandler.canAdd(addContext, this.getDiagram());
+			   return true && EditPolicyService.canAdd(addContext, this.getDiagram());
 		}
 		return false;
 	}
@@ -165,7 +165,7 @@ public class InheritancePattern extends FRaMEDConnectionPattern {
 	    		   sourceShape.getType() == Type.COMPARTMENT_TYPE ||
 	    		   sourceShape.getType() == Type.ROLE_TYPE)
 	    			if(targetShape.getType() == sourceShape.getType())
-						   return true && EditPolicyHandler.canCreate(createContext, this.getDiagram());
+						   return true && EditPolicyService.canCreate(createContext, this.getDiagram());
 	    }	}
 	    return false;
 	}

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

@@ -18,7 +18,7 @@ import org.framed.iorm.model.NamedElement;
 import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.graphitifeatures.EditRelationshipFeature;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.LayoutLiterals;
@@ -117,7 +117,7 @@ public class RelationshipPattern extends FRaMEDConnectionPattern {
 		if(addContext.getNewObject() instanceof Relation) {
 		   Relation relation = (Relation) addContext.getNewObject();
 		   if(relation.getType() == Type.RELATIONSHIP) {
-			   return true && EditPolicyHandler.canAdd(addContext, this.getDiagram());
+			   return true && EditPolicyService.canAdd(addContext, this.getDiagram());
 		}	}
 		return false;
 	}
@@ -224,7 +224,7 @@ public class RelationshipPattern extends FRaMEDConnectionPattern {
 	    	if(sourceShape.getContainer() == targetShape.getContainer()) {
 	    		if(sourceShape.getType() == Type.ROLE_TYPE)
 		    		if(targetShape.getType() == sourceShape.getType())
-						   return true && EditPolicyHandler.canCreate(createContext, this.getDiagram());
+						   return true && EditPolicyService.canCreate(createContext, this.getDiagram());
 		}	}
 		return false;
 	}

org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/interrelationship/AbstractInterRelationshipConstraintPattern.java

@@ -13,7 +13,7 @@ import org.eclipse.graphiti.util.IColorConstant;
 import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.LayoutLiterals;
 import org.framed.iorm.ui.pattern.connections.FRaMEDConnectionPattern;
@@ -66,7 +66,7 @@ public class AbstractInterRelationshipConstraintPattern extends FRaMEDConnection
 		if(addContext.getNewObject() instanceof Relation) {
 			Relation relation = (Relation) addContext.getNewObject();
 			if(relation.getType() == type) {
-				return EditPolicyHandler.canAdd(addContext, this.getDiagram());
+				return EditPolicyService.canAdd(addContext, this.getDiagram());
 			}   
 		}
 		return false;
@@ -123,7 +123,7 @@ public class AbstractInterRelationshipConstraintPattern extends FRaMEDConnection
 	    	   !(sourceConnection.equals(targetConnection))) {
 	    		if(sourceConnection.getType() == Type.RELATIONSHIP)
 	    			if(targetConnection.getType() == sourceConnection.getType())
-						   return true && EditPolicyHandler.canCreate(createContext, this.getDiagram());
+						   return true && EditPolicyService.canCreate(createContext, this.getDiagram());
 		}	}
 	    return false;
 	}

org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/interrelationship/RelationshipExclusionConstraintPattern.java

@@ -8,7 +8,7 @@ import org.eclipse.graphiti.mm.pictograms.ConnectionDecorator;
 import org.eclipse.graphiti.mm.pictograms.PictogramElement;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.NameLiterals;
 import org.framed.iorm.ui.util.PropertyUtil;

org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/connections/interrelationship/RelationshipImplicationConstraintPattern.java

@@ -8,7 +8,7 @@ import org.eclipse.graphiti.mm.pictograms.ConnectionDecorator;
 import org.eclipse.graphiti.mm.pictograms.PictogramElement;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.NameLiterals;
 import org.framed.iorm.ui.util.PropertyUtil;

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

@@ -18,7 +18,7 @@ import org.framed.iorm.model.Model;
 import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.LayoutLiterals;
 import org.framed.iorm.ui.pattern.shapes.FRaMEDShapePattern;
@@ -127,7 +127,7 @@ public abstract class AbstractIntraRelationshipConstraintPattern extends FRaMEDS
 		if(addContext.getNewObject() instanceof Relation) {
 		   Relation relation = (Relation) addContext.getNewObject();
 		   if(relation.getType() == type) {
-				return EditPolicyHandler.canAdd(addContext, this.getDiagram());
+				return EditPolicyService.canAdd(addContext, this.getDiagram());
 		}	}
 		return false;
 	}
@@ -170,7 +170,7 @@ public abstract class AbstractIntraRelationshipConstraintPattern extends FRaMEDS
 		if(targetConnection != null &&
 		   getBusinessObjectForPictogramElement(targetConnection) instanceof Relation) {
 			Relation relation = (Relation) getBusinessObjectForPictogramElement(targetConnection);
-			return (relation.getType() == Type.RELATIONSHIP) && EditPolicyHandler.canCreate(createContext, this.getDiagram());
+			return (relation.getType() == Type.RELATIONSHIP) && EditPolicyService.canCreate(createContext, this.getDiagram());
 		}
 	    return false;
 	}

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

@@ -5,7 +5,7 @@ import org.eclipse.graphiti.features.context.ICreateContext;
 import org.eclipse.graphiti.mm.pictograms.PictogramElement;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.NameLiterals;
 
 /**

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

@@ -5,7 +5,7 @@ import org.eclipse.graphiti.features.context.ICreateContext;
 import org.eclipse.graphiti.mm.pictograms.PictogramElement;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.NameLiterals;
 
 /**

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

@@ -5,7 +5,7 @@ import org.eclipse.graphiti.features.context.ICreateContext;
 import org.eclipse.graphiti.mm.pictograms.PictogramElement;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.NameLiterals;
 
 /**

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

@@ -5,7 +5,7 @@ import org.eclipse.graphiti.features.context.ICreateContext;
 import org.eclipse.graphiti.mm.pictograms.PictogramElement;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.NameLiterals;
 
 /**

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

@@ -5,7 +5,7 @@ import org.eclipse.graphiti.features.context.ICreateContext;
 import org.eclipse.graphiti.mm.pictograms.PictogramElement;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.NameLiterals;
 
 /**

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

@@ -9,7 +9,7 @@ import org.eclipse.graphiti.util.IColorConstant;
 import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Relation;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.LayoutLiterals;
 import org.framed.iorm.ui.pattern.connections.FRaMEDConnectionPattern;
@@ -59,7 +59,7 @@ public abstract class AbstractRoleConstraintPattern extends FRaMEDConnectionPatt
 		if(addContext.getNewObject() instanceof Relation) {
 		   Relation relation = (Relation) addContext.getNewObject();
 		   if(relation.getType() == type)
-				return EditPolicyHandler.canAdd(addContext, this.getDiagram());
+				return EditPolicyService.canAdd(addContext, this.getDiagram());
 		}
 		return false;
 	}
@@ -88,7 +88,7 @@ public abstract class AbstractRoleConstraintPattern extends FRaMEDConnectionPatt
 	    	   !(sourceShape.equals(targetShape))) {
 	    		if(sourceShape.getType() == Type.ROLE_TYPE)
 	    			if(targetShape.getType() == sourceShape.getType())
-	    				return true && EditPolicyHandler.canCreate(createContext, this.getDiagram());
+	    				return true && EditPolicyService.canCreate(createContext, this.getDiagram());
 		}	}
 	    return false;
 	}

org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/AttributeOperationCommonPattern.java

@@ -18,7 +18,7 @@ import org.eclipse.graphiti.util.IColorConstant;
 import org.framed.iorm.model.ModelElement;
 import org.framed.iorm.model.NamedElement;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.LayoutLiterals;
 import org.framed.iorm.ui.literals.NameLiterals;
@@ -165,7 +165,7 @@ public class AttributeOperationCommonPattern extends FRaMEDShapePattern implemen
 					   shape.getType() == Type.DATA_TYPE ||
 					   shape.getType() == Type.COMPARTMENT_TYPE ||
 					   shape.getType() == Type.ROLE_TYPE)	
-						   return true && EditPolicyHandler.canAdd(addContext, this.getDiagram());
+						   return true && EditPolicyService.canAdd(addContext, this.getDiagram());
 		}	}	}	
 		return false;
 	}

org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/AttributePattern.java

@@ -9,7 +9,7 @@ import org.framed.iorm.model.ModelElement;
 import org.framed.iorm.model.NamedElement;
 import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Type;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.NameLiterals;
 import org.framed.iorm.ui.pattern.shapes.AttributeOperationCommonPattern; //*import for javadoc link
@@ -132,7 +132,7 @@ public class AttributePattern extends FRaMEDShapePattern implements IPattern {
 				   !(PropertyUtil.isShape_IdValue((Shape) pictogramElement, SHAPE_ID_COMPARTMENTTYPE_SHADOW)) &&
 				   !(PropertyUtil.isShape_IdValue((Shape) pictogramElement, SHAPE_ID_DATATYPE_SHADOW)) &&
 				   !(PropertyUtil.isShape_IdValue((Shape) pictogramElement, SHAPE_ID_ROLETYPE_SHADOW)))	   
-    				return true && EditPolicyHandler.canCreate(createContext, this.getDiagram());
+    				return true && EditPolicyService.canCreate(createContext, this.getDiagram());
 		}	}
 		return false;
 	}

org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/CompartmentTypePattern.java

@@ -43,7 +43,7 @@ import org.framed.iorm.model.OrmFactory;
 import org.framed.iorm.model.Segment;
 import org.framed.iorm.model.Type;
 import org.framed.iorm.ui.contexts.AddGroupOrCompartmentTypeContext;
-import org.framed.iorm.ui.editPolicy.EditPolicyHandler;
+import org.framed.iorm.ui.editPolicy.EditPolicyService;
 import org.framed.iorm.ui.exceptions.NoDiagramFoundException;
 import org.framed.iorm.ui.literals.IdentifierLiterals;
 import org.framed.iorm.ui.literals.LayoutLiterals;
@@ -241,7 +241,7 @@ public class CompartmentTypePattern extends FRaMEDShapePattern implements IPatte
 			org.framed.iorm.model.Shape shape = (org.framed.iorm.model.Shape) addContext.getNewObject();
 			if(shape.getType()==Type.COMPARTMENT_TYPE) {
 				if(DiagramUtil.getLinkedModelForDiagram(getDiagram()) != null) {
-					   return true && EditPolicyHandler.canAdd(addContext, this.getDiagram());
+					   return true && EditPolicyService.canAdd(addContext, this.getDiagram());
 		}	}	}
 		return false;
 	}
@@ -418,7 +418,7 @@ public class CompartmentTypePattern extends FRaMEDShapePattern implements IPatte
 	@Override
 	public boolean canCreate(ICreateContext createContext) {
 		if(DiagramUtil.getLinkedModelForDiagram(getDiagram()) != null) {
-			return true && EditPolicyHandler.canCreate(createContext, this.getDiagram());
+			return true && EditPolicyService.canCreate(createContext, this.getDiagram());
 		}   
 		return false;
 	}