chore: remove builtin library xtext dependency

3 files changed, 2 insertions, 115 deletions

diff --git a/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java b/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java
index 2ace27f4..d37c9ec7 100644
--- a/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java
+++ b/language-to-store/src/main/java/tools/refinery/language/mapping/PartialModelMapper.java
@@ -7,7 +7,7 @@ import java.util.Optional;
 
 import org.eclipse.emf.common.util.EList;
 
-import tools.refinery.language.ProblemUtil;
+import tools.refinery.language.model.ProblemUtil;
 import tools.refinery.language.model.problem.Assertion;
 import tools.refinery.language.model.problem.AssertionArgument;
 import tools.refinery.language.model.problem.ClassDeclaration;
diff --git a/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend b/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend
index 86dd47ae..dcdea332 100644
--- a/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend
+++ b/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.^extension.ExtendWith
 import tools.refinery.language.mapping.PartialModelMapper
 import tools.refinery.language.model.problem.Problem
+import tools.refinery.language.model.tests.ProblemTestUtil
 import tools.refinery.language.tests.ProblemInjectorProvider
 import tools.refinery.store.model.Tuple
 import tools.refinery.store.model.representation.TruthValue
diff --git a/language-to-store/src/test/java/tools/refinery/language/mapping/tests/ProblemTestUtil.xtend b/language-to-store/src/test/java/tools/refinery/language/mapping/tests/ProblemTestUtil.xtend
deleted file mode 100644
index b3b8145e..00000000
--- a/language-to-store/src/test/java/tools/refinery/language/mapping/tests/ProblemTestUtil.xtend
+++ /dev/null
@@ -1,114 +0,0 @@
-package tools.refinery.language.mapping.tests
-
-import tools.refinery.language.ProblemUtil
-import tools.refinery.language.model.problem.Argument
-import tools.refinery.language.model.problem.Assertion
-import tools.refinery.language.model.problem.AssertionArgument
-import tools.refinery.language.model.problem.Atom
-import tools.refinery.language.model.problem.ClassDeclaration
-import tools.refinery.language.model.problem.Conjunction
-import tools.refinery.language.model.problem.EnumDeclaration
-import tools.refinery.language.model.problem.Literal
-import tools.refinery.language.model.problem.NegativeLiteral
-import tools.refinery.language.model.problem.Node
-import tools.refinery.language.model.problem.NodeAssertionArgument
-import tools.refinery.language.model.problem.NodeValueAssertion
-import tools.refinery.language.model.problem.PredicateDefinition
-import tools.refinery.language.model.problem.Problem
-import tools.refinery.language.model.problem.UniqueDeclaration
-import tools.refinery.language.model.problem.Variable
-import tools.refinery.language.model.problem.VariableOrNodeArgument
-
-class ProblemTestUtil {
-        def builtin(Problem it) {
-                ProblemUtil.getBuiltInLibrary(it).get
-        }
-        
-        def errors(Problem it) {
-                eResource.errors
-        }
-        
-        def nodeNames(Problem it) {
-                nodes.map[name]
-        }
-        
-        def pred(Problem it, String name) {
-                statements.filter(PredicateDefinition).findFirst[it.name == name]
-        }
-        
-        def param(PredicateDefinition it, int i) {
-                parameters.get(i)
-        } 
-
-        def conj(PredicateDefinition it, int i) {
-                bodies.get(i)
-        }
-
-        def lit(Conjunction it, int i) {
-                literals.get(i)
-        }
-
-        def negated(Literal it) {
-                (it as NegativeLiteral).atom
-        }
-
-        def relation(Literal it) {
-                (it as Atom).relation
-        }
-
-        def arg(Atom it, int i) {
-                it.arguments.get(i)
-        }
-
-        def arg(Literal it, int i) {
-                (it as Atom).arg(i)
-        }
-
-        def variable(Argument it) {
-                (it as VariableOrNodeArgument).variableOrNode as Variable
-        }
-
-        def node(Argument it) {
-                (it as VariableOrNodeArgument).variableOrNode as Node
-        }
-        
-        def assertion(Problem it, int i) {
-                statements.filter(Assertion).get(i)
-        }
-        
-        def nodeValueAssertion(Problem it, int i) {
-                statements.filter(NodeValueAssertion).get(i)
-        }
-        
-        def arg(Assertion it, int i) {
-                arguments.get(i)
-        }
-        
-        def node(AssertionArgument it) {
-                (it as NodeAssertionArgument).node
-        }
-        
-        def node(Problem it, String name) {
-                nodes.findFirst[it.name == name]
-        }
-        
-        def uniqueNode(Problem it, String name) {
-                statements.filter(UniqueDeclaration).flatMap[nodes].findFirst[it.name == name]
-        }
-        
-        def findClass(Problem it, String name) {
-                statements.filter(ClassDeclaration).findFirst[it.name == name]
-        }
-        
-        def reference(ClassDeclaration it, String name) {
-                it.referenceDeclarations.findFirst[it.name == name]
-        }
-        
-        def findEnum(Problem it, String name) {
-                statements.filter(EnumDeclaration).findFirst[it.name == name]
-        }
-        
-        def literal(EnumDeclaration it, String name) {
-                literals.findFirst[it.name == name]
-        }
-}