From c23bb276fc70e9d8a33995812fe994aa95d94176 Mon Sep 17 00:00:00 2001
From: nullsub <chrisudeussen@gmail.com>
Date: Mon, 4 Jun 2018 20:45:59 +0200
Subject: [PATCH] throw RuntimeException when override is used
---
.../org/framed/iorm/ui/editPolicy/ConstraintRuleVisitor.java | 1 +
.../src/org/framed/iorm/ui/editPolicy/EditPolicyHandler.java | 3 +++
.../src/org/framed/iorm/ui/editPolicy/EditPolicyService.java | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/ConstraintRuleVisitor.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/ConstraintRuleVisitor.java
index ca9a9688..54be3f23 100644
--- a/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/ConstraintRuleVisitor.java
+++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/editPolicy/ConstraintRuleVisitor.java
@@ -62,6 +62,7 @@ public class ConstraintRuleVisitor {
}
return null;
}
+
/**
* dispatch abstract rule
*
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 32177f3b..14bf3a96 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
@@ -47,6 +47,9 @@ public class EditPolicyHandler {
for(editpolicymodel.Model model : models) {
for(editpolicymodel.Policy policy : model.getPolicies()) {
if(featureRuleVisitor.checkRule(policy.getFeatureRule())) {
+ if(policy.getOverride()) {
+ throw new RuntimeException("Override is not supported");
+ }
activatedPolicies.add(policy);
}
}
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 e635211a..52c5cf71 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
@@ -61,7 +61,7 @@ public class EditPolicyService {
return EditPolicyService.editPolicyHandlers.get(diagram.getName());
}
- public static void setConfiguration(Diagram diagram, FRaMEDConfiguration config)
+ public static void setConfiguration(Diagram diagram, FRaMEDConfiguration config)
{
diagram = UIUtil.getMainDiagramForAnyDiagram(diagram);
EditPolicyService.getHandler(diagram).updateConfig(editpolicymodels, config);
--
GitLab