refactor: simplify language project

* Move all utilities for language-model to language, since they do not
  make sense on their own
* Convert xtend code into java

9 files changed, 22 insertions, 68 deletions

diff --git a/subprojects/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java b/subprojects/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java
index d753a119..41c96114 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/ProblemStandaloneSetup.java
@@ -3,14 +3,11 @@
  */
 package tools.refinery.language;
 
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.resource.IResourceFactory;
-import org.eclipse.xtext.resource.IResourceServiceProvider;
+import org.eclipse.emf.ecore.EPackage;
 
-import com.google.inject.Guice;
 import com.google.inject.Injector;
 
-import tools.refinery.language.model.ProblemEMFSetup;
+import tools.refinery.language.model.problem.ProblemPackage;
 
 /**
  * Initialization support for running Xtext languages without Equinox extension
@@ -22,23 +19,16 @@ public class ProblemStandaloneSetup extends ProblemStandaloneSetupGenerated {
                 new ProblemStandaloneSetup().createInjectorAndDoEMFRegistration();
         }
 
+        // Here we can't rely on java.util.HashMap#putIfAbsent, because
+        // org.eclipse.emf.ecore.impl.EPackageRegistryImpl#containsKey is overridden
+        // without also overriding putIfAbsent. We must make sure to call the
+        // overridden containsKey implementation.
+        @SuppressWarnings("squid:S3824")
         @Override
         public Injector createInjectorAndDoEMFRegistration() {
-                ProblemEMFSetup.doEMFRegistration();
-                var xmiInjector = createXmiInjector();
-                registerXmiInjector(xmiInjector);
+                if (!EPackage.Registry.INSTANCE.containsKey(ProblemPackage.eNS_URI)) {
+                        EPackage.Registry.INSTANCE.put(ProblemPackage.eNS_URI, ProblemPackage.eINSTANCE);
+                }
                 return super.createInjectorAndDoEMFRegistration();
         }
-        
-        protected Injector createXmiInjector() {
-                return Guice.createInjector(new ProblemXmiRuntimeModule());
-        }
-
-        protected void registerXmiInjector(Injector injector) {
-                IResourceFactory resourceFactory = injector.getInstance(IResourceFactory.class);
-                IResourceServiceProvider serviceProvider = injector.getInstance(IResourceServiceProvider.class);
-                
-                Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(ProblemEMFSetup.XMI_RESOURCE_EXTENSION, resourceFactory);
-                IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put(ProblemEMFSetup.XMI_RESOURCE_EXTENSION, serviceProvider);
-        }
 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/ProblemUtil.java b/subprojects/language/src/main/java/tools/refinery/language/ProblemUtil.java
index d8958381..b1e39176 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/ProblemUtil.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/ProblemUtil.java
@@ -1,4 +1,4 @@
-package tools.refinery.language.model;
+package tools.refinery.language;
 
 import java.util.ArrayDeque;
 import java.util.Collection;
@@ -34,15 +34,15 @@ public final class ProblemUtil {
         public static boolean isSingletonVariable(Variable variable) {
                 return variable.eContainingFeature() == ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE;
         }
-        
+
         public static boolean isImplicitVariable(Variable variable) {
                 return variable instanceof ImplicitVariable;
         }
-        
+
         public static boolean isImplicitNode(Node node) {
                 return node.eContainingFeature() == ProblemPackage.Literals.PROBLEM__NODES;
         }
-        
+
         public static boolean isImplicit(EObject eObject) {
                 if (eObject instanceof Node node) {
                         return isImplicitNode(node);
@@ -115,7 +115,6 @@ public final class ProblemUtil {
 
         private static URI getLibraryUri(String libraryName) {
                 return URI.createURI(ProblemUtil.class.getClassLoader()
-                                .getResource("model/" + libraryName + "." + ProblemEMFSetup.XMI_RESOURCE_EXTENSION)
-                                .toString());
+                                .getResource("tools/refinery/language/%s.problem".formatted(libraryName)).toString());
         }
 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/ProblemXmiRuntimeModule.java b/subprojects/language/src/main/java/tools/refinery/language/ProblemXmiRuntimeModule.java
deleted file mode 100644
index 03a33bee..00000000
--- a/subprojects/language/src/main/java/tools/refinery/language/ProblemXmiRuntimeModule.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package tools.refinery.language;
-
-import org.eclipse.xtext.naming.IQualifiedNameConverter;
-import org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy;
-import org.eclipse.xtext.resource.IResourceFactory;
-import org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule;
-
-import tools.refinery.language.model.ProblemEMFSetup;
-import tools.refinery.language.naming.ProblemQualifiedNameConverter;
-import tools.refinery.language.resource.ProblemResourceDescriptionStrategy;
-import tools.refinery.language.resource.ProblemXmiResourceFactory;
-
-public class ProblemXmiRuntimeModule extends AbstractGenericResourceRuntimeModule {
-        @Override
-        protected String getLanguageName() {
-                return "tools.refinery.language.ProblemXmi";
-        }
-
-        @Override
-        protected String getFileExtensions() {
-                return ProblemEMFSetup.XMI_RESOURCE_EXTENSION;
-        }
-        
-        public Class<? extends IResourceFactory> bindIResourceFactory() {
-                return ProblemXmiResourceFactory.class;
-        }
-        
-        public Class<? extends IQualifiedNameConverter> bindIQualifiedNameConverter() {
-                return ProblemQualifiedNameConverter.class;
-        }
-
-        public Class<? extends IDefaultResourceDescriptionStrategy> bindIDefaultResourceDescriptionStrategy() {
-                return ProblemResourceDescriptionStrategy.class;
-        }
-}
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java
index 7aa75833..f6ae4f1e 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemLocationInFileProvider.java
@@ -4,7 +4,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.resource.DefaultLocationInFileProvider;
 import org.eclipse.xtext.util.ITextRegion;
 
-import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.ProblemUtil;
 import tools.refinery.language.model.problem.ImplicitVariable;
 import tools.refinery.language.model.problem.Node;
 
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
index f86ebd38..24d00f07 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResourceDescriptionStrategy.java
@@ -12,7 +12,7 @@ import org.eclipse.xtext.util.IAcceptor;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
-import tools.refinery.language.model.ProblemUtil;
+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;
diff --git a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java
index b582d16b..ea4682f9 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemGlobalScopeProvider.java
@@ -6,7 +6,7 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider;
 
-import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.ProblemUtil;
 
 public class ProblemGlobalScopeProvider extends ImportUriGlobalScopeProvider {
         @Override
diff --git a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java
index 85797025..53815e37 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemLocalScopeProvider.java
@@ -13,7 +13,7 @@ import org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider;
 
 import com.google.inject.Inject;
 
-import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.ProblemUtil;
 
 public class ProblemLocalScopeProvider extends ImportedNamespaceAwareLocalScopeProvider {
         private static final QualifiedName BUILTIN_LIBRARY_QUALIFIED_NAME = QualifiedName
diff --git a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java
index d31a5308..7a3e77a4 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java
@@ -12,12 +12,12 @@ import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.scoping.IScope;
 import org.eclipse.xtext.scoping.Scopes;
 
-import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.ProblemUtil;
+import tools.refinery.language.model.problem.Action;
 import tools.refinery.language.model.problem.ClassDeclaration;
 import tools.refinery.language.model.problem.ExistentialQuantifier;
 import tools.refinery.language.model.problem.NewActionLiteral;
 import tools.refinery.language.model.problem.ParametricDefinition;
-import tools.refinery.language.model.problem.Action;
 import tools.refinery.language.model.problem.Problem;
 import tools.refinery.language.model.problem.ProblemPackage;
 import tools.refinery.language.model.problem.ReferenceDeclaration;
diff --git a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
index 975fdca2..6b0982eb 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
@@ -8,7 +8,7 @@ import org.eclipse.xtext.validation.Check;
 
 import com.google.inject.Inject;
 
-import tools.refinery.language.model.ProblemUtil;
+import tools.refinery.language.ProblemUtil;
 import tools.refinery.language.model.problem.Node;
 import tools.refinery.language.model.problem.Problem;
 import tools.refinery.language.model.problem.ProblemPackage;