Use language-specific option for metamodel loading when using emf-model language

core/src/main/java/de/jplag/SubmissionSet.java

@@ -159,13 +159,7 @@ private void parseSubmissions(List<Submission> submissions) throws ExitException
 
         ProgressBar progressBar = ProgressBarLogger.createProgressBar(ProgressBarType.PARSING, submissions.size());
 
-        if (options.language().expectsSubmissionOrder()) {
-            for (Submission submission : submissions) {
-                parseSingleSubmission(progressBar, submission);
-            }
-        } else {
-            parseSubmissionsInParallel(submissions, progressBar);
-        }
+        parseSubmissionsInParallel(submissions, progressBar);
 
         progressBar.dispose();
 

core/src/main/java/de/jplag/SubmissionSetBuilder.java

@@ -94,12 +94,6 @@ public SubmissionSet buildSubmissionSet() throws ExitException {
         // Merge everything in a submission set.
         List<Submission> submissions = new ArrayList<>(foundSubmissions.values());
 
-        // Some languages expect a certain order, which is ensured here:
-        if (options.language().expectsSubmissionOrder()) {
-            List<File> rootFiles = foundSubmissions.values().stream().map(Submission::getRoot).toList();
-            rootFiles = options.language().customizeSubmissionOrder(rootFiles);
-            submissions = new ArrayList<>(rootFiles.stream().map(foundSubmissions::get).toList());
-        }
         return new SubmissionSet(submissions, baseCodeSubmission.orElse(null), options);
     }
 

coverage-report/pom.xml

@@ -96,6 +96,7 @@
             <artifactId>emf-metamodel</artifactId>
         </dependency>
         <dependency>
+            <!-- deprecated dependency (only included to not break CI checks) -->
             <groupId>de.jplag</groupId>
             <artifactId>emf-metamodel-dynamic</artifactId>
         </dependency>

language-api/src/main/java/de/jplag/Language.java

@@ -117,8 +117,10 @@
     /**
      * Specifies if the submission order is relevant for this language.
      * @return defaults to false.
+     * @deprecated No longer used (replaced by language option) and will be removed.
      */
+    @Deprecated(since = "7.0.0", forRemoval = true)
     default boolean expectsSubmissionOrder() {
         return false;
     }
 
@@ -126,8 +128,10 @@
      * Reorders the provided submission according the requirements of the language.
      * @param submissions is the list of submissions.
      * @return the reordered list.
+     * @deprecated No longer used (replaced by language option) and will be removed.
      */
+    @Deprecated(since = "7.0.0", forRemoval = true)
     default List<File> customizeSubmissionOrder(List<File> submissions) {
         return submissions;
     }
 

language-api/src/main/java/de/jplag/options/LanguageOptions.java

@@ -75,6 +75,14 @@ protected <T> LanguageOption<T> createOption(OptionType<T> type, String name) {
         return createOption(type, name, "");
     }
 
+    /**
+     * Adds an option to the list of language options.
+     * @param option is the language option to add.
+     */
+    protected void addOption(LanguageOption<?> option) {
+        options.add(option);
+    }
+
     /**
      * @return The list of all options.
      */

languages/emf-metamodel-dynamic/pom.xml

@@ -8,6 +8,7 @@
     </parent>
     <artifactId>emf-metamodel-dynamic</artifactId>
     <name>JPlag: EMF Metamodel (Dynamic) Language Module</name>
+    <description>DEPRECATED: This module has been removed as of v7.0.0.</description>
 
     <dependencies>
         <dependency>

languages/emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/DynamicEmfLanguage.java

@@ -7,14 +7,16 @@
 import de.jplag.ParsingException;
 import de.jplag.Token;
 import de.jplag.emf.EmfLanguage;
-import de.jplag.emf.dynamic.parser.DynamicEcoreParser;
 
 /**
  * Language for EMF metamodels from the Eclipse Modeling Framework (EMF). This language is based on a dynamically
  * created token set instead of a hand-picked one.
  * @author Timur Saglam
+ * @deprecated this language module was never available in JPlag as it was prototypical. It is now deprecated and should
+ * not be used, as it is non-functional and only serves as deprecation placeholder.
  */
+@Deprecated(since = "7.0.0", forRemoval = true)
 public class DynamicEmfLanguage extends EmfLanguage { // currently not included in the CLI
 
     @Override
     public String getName() {
@@ -26,13 +28,8 @@
         return "emf-dynamic";
     }
 
-    @Override
-    public int minimumTokenMatch() {
-        return 10;
-    }
-
     @Override
     public List<Token> parse(Set<File> files, boolean normalize) throws ParsingException {
-        return new DynamicEcoreParser().parse(files, normalize);
+        throw new UnsupportedOperationException("Language module is deprecated and no longer supported!");
     }
 }

languages/emf-metamodel/src/main/java/de/jplag/emf/util/ModelingElementIdentifierManager.java

@@ -28,7 +28,7 @@ public ModelingElementIdentifierManager() {
      * @return the identifier, that is unique for all elements of the same EClass.
      */
     public int getIdentifier(EObject element) {
-        Set<EObject> elements = elementToIdentifer.computeIfAbsent(element.eClass(), key -> new LinkedHashSet<>());
+        Set<EObject> elements = elementToIdentifer.computeIfAbsent(element.eClass(), _ -> new LinkedHashSet<>());
         int index = 0;
         for (EObject containedElement : elements) {
             if (containedElement.equals(element)) {

languages/emf-model/README.md

@@ -1,5 +1,5 @@
 # Dynamic EMF model language module
-The dynamic EMF model language module allows the use of JPlag with model submissions.
+The EMF model language module allows the use of JPlag with EMF based modeling file submissions.
 It is based on the EMF API.
 
 ### EMF specification compatibility
@@ -10,8 +10,13 @@ For the token extraction, we visit the containment tree of the model and extract
 
 ### Usage
 The input for this is an EMF metamodel and a set of corresponding instances.
-To ensure only the intended files are parsed, you can use `-p` to specify allowed file types: `-p ecore,xmi,mysuffix`.
-To use this module, add the `-l emf-model` flag in the CLI, or use a `JPlagOption` object with `new DynamicEmfLanguage()` as `language` in the Java API as described in the usage information in the [readme of the main project](https://github.com/jplag/JPlag#usage) and [in the wiki](https://github.com/jplag/JPlag/wiki/1.-How-to-Use-JPlag).
+To use this module, add the `emf-model` subcommand in the CLI, or use a `JPlagOption` object with `new EmfModelLanguage()` as `language` in the Java API as described in the usage information in the [readme of the main project](https://github.com/jplag/JPlag#usage) and [in the wiki](https://github.com/jplag/JPlag/wiki/1.-How-to-Use-JPlag).
+
+In order to correctly parse model instances, the required metamodel files need to be specified. This can be done via the language options of the `emf-model` language (see the language options via `jplag.jar emf-model -h`). Specify one or more metamodel files like this (multiple paths are comma-separated):
+
+`java -jar jplag.jar path/to/model/instances emf-model --metamodel path/to/metamodel/file.ecore`
+
+To ensure only the intended model files are parsed in the submissions, you can use `-p` to specify allowed file types, for example: `-p ecore,xmi,mysuffix`. Note: Normal JPlag parameters need to be specified before the `emf-model` language identifier.
 
 ### Report Viewer
 In the report viewer, a simple textual syntax is used to generate a tree-based model view.

languages/emf-model/pom.xml

@@ -12,7 +12,7 @@
     <dependencies>
         <dependency>
             <groupId>de.jplag</groupId>
-            <artifactId>emf-metamodel-dynamic</artifactId>
+            <artifactId>emf-metamodel</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.emf</groupId>