Merge pull request #33 from axonivy-market/s17

fix: comply with ivy-core sprint 17 interfaces of 'project'
axonivy-market · Oct 17, 2023 · ebc4413 · ebc4413
2 parents 23c6cac + a0eb746
commit ebc4413
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/dmn-decision-table/META-INF/MANIFEST.MF b/dmn-decision-table/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Require-Bundle: ch.ivyteam.ivy.components,
  ch.ivyteam.ivy.designer.inscription.ui;resolution:=optional,
  ch.ivyteam.swt;resolution:=optional,
  ch.ivyteam.ivy.process.config,
+ ch.ivyteam.ivy.scripting.dataclass,
  ch.ivyteam.icons;resolution:=optional,
  ch.ivyteam.lib.jackson;resolution:=optional,
  ch.ivyteam.lib.jaxb;resolution:=optional,

diff --git a/dmn-decision-table/src/com/axonivy/ivy/process/element/rule/ui/DecisionTableEditor.java b/dmn-decision-table/src/com/axonivy/ivy/process/element/rule/ui/DecisionTableEditor.java
@@ -33,8 +33,8 @@
 
 import ch.ivyteam.icons.Size;
 import ch.ivyteam.ivy.designer.ui.attribute.SelectAttributeDialog;
-import ch.ivyteam.ivy.project.IIvyProject;
 import ch.ivyteam.ivy.project.model.Project;
+import ch.ivyteam.ivy.scripting.dataclass.IDataClassManager;
 import ch.ivyteam.ivy.scripting.language.IIvyScriptContext;
 import ch.ivyteam.ivy.scripting.language.IIvyScriptEngine;
 import ch.ivyteam.ivy.scripting.language.IvyScriptContextFactory;
@@ -226,9 +226,10 @@ private static IVariable[] getSampleScriptContext() {
     return new IVariable[] {};
   }
 
-  public void setProject(IIvyProject ivyProject) {
-    scriptEngine = ivyProject.getIvyScriptEngine();
-    project = ivyProject.project();
+  public void setProject(Project project) {
+    this.project = project;
+    var data = IDataClassManager.instance().getProjectDataModelFor(project);
+    scriptEngine = data.getIvyScriptEngine();
   }
 
 }