refactor(language): simplify default module kinds

Use a transient attribute instead of an adapter.

3 files changed, 7 insertions, 29 deletions

diff --git a/subprojects/language/src/main/java/tools/refinery/language/parser/ProblemEcoreElementFactory.java b/subprojects/language/src/main/java/tools/refinery/language/parser/ProblemEcoreElementFactory.java
index b54c6970..7d246117 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/parser/ProblemEcoreElementFactory.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/parser/ProblemEcoreElementFactory.java
@@ -5,9 +5,7 @@
  */
 package tools.refinery.language.parser;
 
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.conversion.ValueConverterException;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.parser.DefaultEcoreElementFactory;
@@ -20,29 +18,7 @@ public class ProblemEcoreElementFactory extends DefaultEcoreElementFactory {
                         EObject object, String feature, Object value, String ruleName, INode node) throws ValueConverterException {
                 super.set(object, feature, value, ruleName, node);
                 if (object instanceof Problem problem && ProblemPackage.Literals.PROBLEM__KIND.getName().equals(feature)) {
-                        ExplicitAssignmentTracker.install(problem);
-                }
-        }
-
-        public static boolean hasExplicitlySetProblemKind(Problem problem) {
-                return ExplicitAssignmentTracker.hasAdapter(problem);
-        }
-
-        private static class ExplicitAssignmentTracker extends AdapterImpl {
-                @Override
-                public boolean isAdapterForType(Object type) {
-                        return type == ExplicitAssignmentTracker.class;
-                }
-
-                public static boolean hasAdapter(Problem problem) {
-                        return EcoreUtil.getAdapter(problem.eAdapters(), ExplicitAssignmentTracker.class) != null;
-                }
-
-                public static void install(Problem problem) {
-                        if (hasAdapter(problem)) {
-                                throw new IllegalStateException("Duplicate explicit assignment of module kind");
-                        }
-                        problem.eAdapters().add(new ExplicitAssignmentTracker());
+                        problem.setExplicitKind(true);
                 }
         }
 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResource.java b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResource.java
index 57b7bb45..440a238e 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResource.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/resource/ProblemResource.java
@@ -25,7 +25,6 @@ import org.eclipse.xtext.resource.DerivedStateAwareResource;
 import org.eclipse.xtext.util.Triple;
 import org.jetbrains.annotations.Nullable;
 import tools.refinery.language.model.problem.Problem;
-import tools.refinery.language.parser.ProblemEcoreElementFactory;
 import tools.refinery.language.utils.ProblemUtil;
 
 import java.util.Arrays;
@@ -48,7 +47,11 @@ public class ProblemResource extends DerivedStateAwareResource {
         protected void updateInternalState(IParseResult oldParseResult, IParseResult newParseResult) {
                 if (isNewRootElement(oldParseResult, newParseResult) &&
                                 newParseResult.getRootASTElement() instanceof Problem newRootProblem &&
-                                !ProblemEcoreElementFactory.hasExplicitlySetProblemKind(newRootProblem)) {
+                                !newRootProblem.isExplicitKind()) {
+                        // Post-process the parsed model to set its URI-dependent module kind.
+                        // We can't set the default module kind in {@link tools.refinery.language.serializer
+                        // .ProblemTransientValueService}, because the {@link Problem} does not get added into the EMF resource
+                        // before parsing is fully completed.
                         var defaultModuleKind = ProblemUtil.getDefaultModuleKind(getURI());
                         newRootProblem.setKind(defaultModuleKind);
                 }
diff --git a/subprojects/language/src/main/java/tools/refinery/language/serializer/ProblemTransientValueService.java b/subprojects/language/src/main/java/tools/refinery/language/serializer/ProblemTransientValueService.java
index c364b30b..269e1243 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/serializer/ProblemTransientValueService.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/serializer/ProblemTransientValueService.java
@@ -10,7 +10,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.xtext.parsetree.reconstr.impl.DefaultTransientValueService;
 import tools.refinery.language.model.problem.Problem;
 import tools.refinery.language.model.problem.ProblemPackage;
-import tools.refinery.language.parser.ProblemEcoreElementFactory;
 import tools.refinery.language.utils.ProblemUtil;
 
 public class ProblemTransientValueService extends DefaultTransientValueService {
@@ -18,7 +17,7 @@ public class ProblemTransientValueService extends DefaultTransientValueService {
         public boolean isTransient(EObject owner, EStructuralFeature feature, int index) {
                 if (owner instanceof Problem problem && feature == ProblemPackage.Literals.PROBLEM__KIND) {
                         return problem.getName() == null && problem.getKind() == ProblemUtil.getDefaultModuleKind(problem) &&
-                                        !ProblemEcoreElementFactory.hasExplicitlySetProblemKind(problem);
+                                        !problem.isExplicitKind();
                 }
                 return super.isTransient(owner, feature, index);
         }