From 6ebcee9436a6268a4be32a0a068ef4717511c323 Mon Sep 17 00:00:00 2001
From: nullsub <chrisudeussen@gmail.com>
Date: Fri, 4 May 2018 22:23:48 +0200
Subject: [PATCH] remove editpolicyhandler from modelPattern
---
org.framed.iorm.ui/core/model/ModelPattern.java | 6 ++----
.../org/framed/iorm/ui/editPolicy/EditPolicyHandler.java | 2 ++
.../org/framed/iorm/ui/editPolicy/EditPolicyService.java | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/org.framed.iorm.ui/core/model/ModelPattern.java b/org.framed.iorm.ui/core/model/ModelPattern.java
index 7bf08395..44f61415 100644
--- a/org.framed.iorm.ui/core/model/ModelPattern.java
+++ b/org.framed.iorm.ui/core/model/ModelPattern.java
@@ -99,10 +99,8 @@ public class ModelPattern extends FRaMEDShapePattern implements IPattern {
*/
@Override
public boolean canAdd(IAddContext addContext) {
- if(addContext.getNewObject() instanceof Model && ((Model)addContext.getNewObject()).getParent() != null) {
- Type type = ((Model) addContext.getNewObject()).getParent().getType();
- return (UIUtil.getLinkedModelForDiagram(getDiagram()) == null)
- && EditPolicyService.getHandler(this.getDiagram()).canAdd(addContext, type);
+ if(addContext.getNewObject() instanceof Model) {
+ return (UIUtil.getLinkedModelForDiagram(getDiagram()) == null);
}
return false;
}
diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyHandler.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyHandler.java
index 5c8fa5bd..c4bcaf94 100644
--- a/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyHandler.java
+++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyHandler.java
@@ -60,6 +60,8 @@ public class EditPolicyHandler {
* @return
*/
private List<ConstraintRule> getConstraints(ActionEnum action, Type type) {
+ System.out.println("Action: " + action.toString() + ", Type: " + type.toString());
+
List<ConstraintRule> rules = new LinkedList<>();
if(type == null)
diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyService.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyService.java
index 579cb638..9a24468f 100644
--- a/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyService.java
+++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/EditPolicyService.java
@@ -34,7 +34,6 @@ public class EditPolicyService {
* For every diagram one editpolicyHandler
*/
private static Map<String, EditPolicyHandler> editPolicyHandlers;
-
public static void initEditPolicyService() {
EditPolicyService.editpolicymodels = new LinkedList<>();
--
GitLab