chore: change package name

18 files changed, 92 insertions, 83 deletions

diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
index 4dfbb242..1b177c94 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2
+++ b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
@@ -1,9 +1,9 @@
-module org.eclipse.viatra.solver.language.GenerateProblem
+module tools.refinery.language.GenerateProblem
 
 import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
 
-import org.eclipse.viatra.solver.language.mwe2.*
+import tools.refinery.language.mwe2.*
 
 var rootPath = ".."
 
@@ -36,7 +36,7 @@ Workflow {
                 }
 
                 language = StandardLanguage {
-                        name = "org.eclipse.viatra.solver.language.Problem"
+                        name = "tools.refinery.language.Problem"
                         fileExtensions = "problem"
                         referencedResource = "platform:/resource/refinery-language-model/model/problem.genmodel"
                         serializer = {
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext b/language/src/main/java/tools/refinery/language/Problem.xtext
index d4fa6f35..6b46ee86 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
+++ b/language/src/main/java/tools/refinery/language/Problem.xtext
@@ -1,7 +1,7 @@
-grammar org.eclipse.viatra.solver.language.Problem with org.eclipse.xtext.common.Terminals
+grammar tools.refinery.language.Problem with org.eclipse.xtext.common.Terminals
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
-import "http://www.eclipse.org/viatra/solver/language/model/Problem"
+import "https://refinery.tools/emf/2021/Problem"
 
 Problem:
         ("problem" name=Identifier ".")?
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemRuntimeModule.java b/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java
index 9fec7d75..dd7731b4 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemRuntimeModule.java
+++ b/language/src/main/java/tools/refinery/language/ProblemRuntimeModule.java
@@ -1,15 +1,8 @@
 /*
  * generated by Xtext 2.25.0
  */
-package org.eclipse.viatra.solver.language;
+package tools.refinery.language;
 
-import org.eclipse.viatra.solver.language.conversion.ProblemValueConverterService;
-import org.eclipse.viatra.solver.language.naming.ProblemQualifiedNameConverter;
-import org.eclipse.viatra.solver.language.resource.ProblemDerivedStateComputer;
-import org.eclipse.viatra.solver.language.resource.ProblemLocationInFileProvider;
-import org.eclipse.viatra.solver.language.resource.ProblemResourceDescriptionStrategy;
-import org.eclipse.viatra.solver.language.scoping.ProblemGlobalScopeProvider;
-import org.eclipse.viatra.solver.language.scoping.ProblemLocalScopeProvider;
 import org.eclipse.xtext.conversion.IValueConverterService;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.resource.DerivedStateAwareResource;
@@ -28,6 +21,14 @@ import org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceV
 import com.google.inject.Binder;
 import com.google.inject.name.Names;
 
+import tools.refinery.language.conversion.ProblemValueConverterService;
+import tools.refinery.language.naming.ProblemQualifiedNameConverter;
+import tools.refinery.language.resource.ProblemDerivedStateComputer;
+import tools.refinery.language.resource.ProblemLocationInFileProvider;
+import tools.refinery.language.resource.ProblemResourceDescriptionStrategy;
+import tools.refinery.language.scoping.ProblemGlobalScopeProvider;
+import tools.refinery.language.scoping.ProblemLocalScopeProvider;
+
 /**
  * Use this class to register components to be used at runtime / without the
  * Equinox extension registry.
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemStandaloneSetup.java b/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java
index 11e5ad8a..f49069a5 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemStandaloneSetup.java
+++ b/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java
@@ -1,13 +1,14 @@
 /*
  * generated by Xtext 2.25.0
  */
-package org.eclipse.viatra.solver.language;
+package tools.refinery.language;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 
 import com.google.inject.Injector;
 
+import tools.refinery.language.model.problem.ProblemPackage;
+
 /**
  * Initialization support for running Xtext languages without Equinox extension
  * registry.
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java b/language/src/main/java/tools/refinery/language/ProblemUtil.java
index a2938274..ae2efc3d 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java
+++ b/language/src/main/java/tools/refinery/language/ProblemUtil.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.language;
+package tools.refinery.language;
 
 import java.util.ArrayDeque;
 import java.util.Collection;
@@ -9,17 +9,18 @@ import java.util.Set;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
-import org.eclipse.viatra.solver.language.model.problem.Node;
-import org.eclipse.viatra.solver.language.model.problem.Problem;
-import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
-import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
-import org.eclipse.viatra.solver.language.model.problem.Relation;
-import org.eclipse.viatra.solver.language.model.problem.Variable;
-import org.eclipse.viatra.solver.language.scoping.ProblemGlobalScopeProvider;
 
 import com.google.common.collect.ImmutableList;
 
+import tools.refinery.language.model.problem.ClassDeclaration;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.ReferenceDeclaration;
+import tools.refinery.language.model.problem.Relation;
+import tools.refinery.language.model.problem.Variable;
+import tools.refinery.language.scoping.ProblemGlobalScopeProvider;
+
 public final class ProblemUtil {
         private ProblemUtil() {
                 throw new IllegalStateException("This is a static utility class and should not be instantiated directly");
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/conversion/ProblemValueConverterService.java b/language/src/main/java/tools/refinery/language/conversion/ProblemValueConverterService.java
index 1c665e6f..508688ed 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/conversion/ProblemValueConverterService.java
+++ b/language/src/main/java/tools/refinery/language/conversion/ProblemValueConverterService.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.language.conversion;
+package tools.refinery.language.conversion;
 
 import org.eclipse.xtext.common.services.DefaultTerminalConverters;
 import org.eclipse.xtext.conversion.IValueConverter;
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/conversion/UpperBoundValueConverter.java b/language/src/main/java/tools/refinery/language/conversion/UpperBoundValueConverter.java
index 3111b69b..be0d15ad 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/conversion/UpperBoundValueConverter.java
+++ b/language/src/main/java/tools/refinery/language/conversion/UpperBoundValueConverter.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.language.conversion;
+package tools.refinery.language.conversion;
 
 import org.eclipse.xtext.conversion.ValueConverterException;
 import org.eclipse.xtext.conversion.impl.AbstractValueConverter;
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/naming/NamingUtil.java b/language/src/main/java/tools/refinery/language/naming/NamingUtil.java
index edd455bb..e959be74 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/naming/NamingUtil.java
+++ b/language/src/main/java/tools/refinery/language/naming/NamingUtil.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.language.naming;
+package tools.refinery.language.naming;
 
 import java.util.regex.Pattern;
 
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java b/language/src/main/java/tools/refinery/language/naming/ProblemQualifiedNameConverter.java
index e55e5dda..5453906f 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java
+++ b/language/src/main/java/tools/refinery/language/naming/ProblemQualifiedNameConverter.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.language.naming;
+package tools.refinery.language.naming;
 
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/DerivedVariableComputer.java b/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java
index 2789f590..2061c30e 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/DerivedVariableComputer.java
+++ b/language/src/main/java/tools/refinery/language/resource/DerivedVariableComputer.java
@@ -1,24 +1,9 @@
-package org.eclipse.viatra.solver.language.resource;
+package tools.refinery.language.resource;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.viatra.solver.language.model.problem.Argument;
-import org.eclipse.viatra.solver.language.model.problem.Atom;
-import org.eclipse.viatra.solver.language.model.problem.Conjunction;
-import org.eclipse.viatra.solver.language.model.problem.ExistentialQuantifier;
-import org.eclipse.viatra.solver.language.model.problem.ImplicitVariable;
-import org.eclipse.viatra.solver.language.model.problem.Literal;
-import org.eclipse.viatra.solver.language.model.problem.NegativeLiteral;
-import org.eclipse.viatra.solver.language.model.problem.Parameter;
-import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition;
-import org.eclipse.viatra.solver.language.model.problem.Problem;
-import org.eclipse.viatra.solver.language.model.problem.ProblemFactory;
-import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
-import org.eclipse.viatra.solver.language.model.problem.Statement;
-import org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument;
-import org.eclipse.viatra.solver.language.naming.NamingUtil;
 import org.eclipse.xtext.linking.impl.LinkingHelper;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.nodemodel.INode;
@@ -31,6 +16,22 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 
+import tools.refinery.language.model.problem.Argument;
+import tools.refinery.language.model.problem.Atom;
+import tools.refinery.language.model.problem.Conjunction;
+import tools.refinery.language.model.problem.ExistentialQuantifier;
+import tools.refinery.language.model.problem.ImplicitVariable;
+import tools.refinery.language.model.problem.Literal;
+import tools.refinery.language.model.problem.NegativeLiteral;
+import tools.refinery.language.model.problem.Parameter;
+import tools.refinery.language.model.problem.PredicateDefinition;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemFactory;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.Statement;
+import tools.refinery.language.model.problem.VariableOrNodeArgument;
+import tools.refinery.language.naming.NamingUtil;
+
 @Singleton
 public class DerivedVariableComputer {
         @Inject
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/NodeNameCollector.java b/language/src/main/java/tools/refinery/language/resource/NodeNameCollector.java
index 415db9a9..99bf9b64 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/NodeNameCollector.java
+++ b/language/src/main/java/tools/refinery/language/resource/NodeNameCollector.java
@@ -1,18 +1,10 @@
-package org.eclipse.viatra.solver.language.resource;
+package tools.refinery.language.resource;
 
 import java.util.List;
 import java.util.Set;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.viatra.solver.language.model.problem.Assertion;
-import org.eclipse.viatra.solver.language.model.problem.AssertionArgument;
-import org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument;
-import org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion;
-import org.eclipse.viatra.solver.language.model.problem.Problem;
-import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
-import org.eclipse.viatra.solver.language.model.problem.Statement;
-import org.eclipse.viatra.solver.language.naming.NamingUtil;
 import org.eclipse.xtext.linking.impl.LinkingHelper;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.nodemodel.INode;
@@ -25,6 +17,15 @@ import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 
+import tools.refinery.language.model.problem.Assertion;
+import tools.refinery.language.model.problem.AssertionArgument;
+import tools.refinery.language.model.problem.NodeAssertionArgument;
+import tools.refinery.language.model.problem.NodeValueAssertion;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.Statement;
+import tools.refinery.language.naming.NamingUtil;
+
 public class NodeNameCollector {
         @Inject
         private LinkingHelper linkingHelper;
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java b/language/src/main/java/tools/refinery/language/resource/ProblemDerivedStateComputer.java
index 3c6c8273..275feca3 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java
+++ b/language/src/main/java/tools/refinery/language/resource/ProblemDerivedStateComputer.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.language.resource;
+package tools.refinery.language.resource;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -12,11 +12,6 @@ import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
-import org.eclipse.viatra.solver.language.model.problem.Node;
-import org.eclipse.viatra.solver.language.model.problem.Problem;
-import org.eclipse.viatra.solver.language.model.problem.ProblemFactory;
-import org.eclipse.viatra.solver.language.model.problem.Statement;
 import org.eclipse.xtext.Constants;
 import org.eclipse.xtext.resource.DerivedStateAwareResource;
 import org.eclipse.xtext.resource.IDerivedStateComputer;
@@ -29,6 +24,12 @@ import com.google.inject.Provider;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 
+import tools.refinery.language.model.problem.ClassDeclaration;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemFactory;
+import tools.refinery.language.model.problem.Statement;
+
 @Singleton
 public class ProblemDerivedStateComputer implements IDerivedStateComputer {
         public static final String NEW_NODE = "new";
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java b/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java
index bd05e8cf..f6a3ec75 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java
+++ b/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java
@@ -1,12 +1,13 @@
-package org.eclipse.viatra.solver.language.resource;
+package tools.refinery.language.resource;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.viatra.solver.language.ProblemUtil;
-import org.eclipse.viatra.solver.language.model.problem.ImplicitVariable;
-import org.eclipse.viatra.solver.language.model.problem.Node;
 import org.eclipse.xtext.resource.DefaultLocationInFileProvider;
 import org.eclipse.xtext.util.ITextRegion;
 
+import tools.refinery.language.ProblemUtil;
+import tools.refinery.language.model.problem.ImplicitVariable;
+import tools.refinery.language.model.problem.Node;
+
 public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider {
         @Override
         protected ITextRegion doGetTextRegion(EObject obj, RegionDescription query) {
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java b/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
index cd5020e7..c5dea671 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java
+++ b/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
@@ -1,12 +1,6 @@
-package org.eclipse.viatra.solver.language.resource;
+package tools.refinery.language.resource;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.viatra.solver.language.ProblemUtil;
-import org.eclipse.viatra.solver.language.model.problem.NamedElement;
-import org.eclipse.viatra.solver.language.model.problem.Node;
-import org.eclipse.viatra.solver.language.model.problem.Problem;
-import org.eclipse.viatra.solver.language.model.problem.Variable;
-import org.eclipse.viatra.solver.language.naming.NamingUtil;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.QualifiedName;
@@ -18,6 +12,13 @@ import org.eclipse.xtext.util.IAcceptor;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import tools.refinery.language.ProblemUtil;
+import tools.refinery.language.model.problem.NamedElement;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.Variable;
+import tools.refinery.language.naming.NamingUtil;
+
 @Singleton
 public class ProblemResourceDescriptionStrategy extends DefaultResourceDescriptionStrategy {
         @Inject
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemGlobalScopeProvider.java b/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java
index 05da277a..8f4c9374 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemGlobalScopeProvider.java
+++ b/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.language.scoping;
+package tools.refinery.language.scoping;
 
 import java.util.LinkedHashSet;
 
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemLocalScopeProvider.java b/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java
index e832bb09..05a3bcf9 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemLocalScopeProvider.java
+++ b/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.language.scoping;
+package tools.refinery.language.scoping;
 
 import java.util.List;
 
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java b/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java
index 56de6b1b..61a3c8f9 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java
+++ b/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java
@@ -1,26 +1,27 @@
 /*
  * generated by Xtext 2.25.0
  */
-package org.eclipse.viatra.solver.language.scoping;
+package tools.refinery.language.scoping;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.viatra.solver.language.ProblemUtil;
-import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
-import org.eclipse.viatra.solver.language.model.problem.ExistentialQuantifier;
-import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition;
-import org.eclipse.viatra.solver.language.model.problem.Problem;
-import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
-import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
-import org.eclipse.viatra.solver.language.model.problem.Variable;
-import org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.scoping.IScope;
 import org.eclipse.xtext.scoping.Scopes;
 
+import tools.refinery.language.ProblemUtil;
+import tools.refinery.language.model.problem.ClassDeclaration;
+import tools.refinery.language.model.problem.ExistentialQuantifier;
+import tools.refinery.language.model.problem.PredicateDefinition;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.ReferenceDeclaration;
+import tools.refinery.language.model.problem.Variable;
+import tools.refinery.language.model.problem.VariableOrNodeArgument;
+
 /**
  * This class contains custom scoping description.
  * 
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/validation/ProblemValidator.java b/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
index 96b656a3..f2378df6 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/validation/ProblemValidator.java
+++ b/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
@@ -1,7 +1,7 @@
 /*
  * generated by Xtext 2.25.0
  */
-package org.eclipse.viatra.solver.language.validation;
+package tools.refinery.language.validation;
 
 /**
  * This class contains custom validation rules.