Procházet zdrojové kódy

Add emf languages to metainf

Dominik Fuchß před 4 roky
rodič
revize
b15b1f9fcf

+ 1 - 1
jplag.cli/src/test/java/de/jplag/cli/LanguageTest.java

@@ -28,7 +28,7 @@ class LanguageTest extends CommandLineInterfaceTest {
     @Test
     void testLoading() {
         var languages = LanguageLoader.getAllAvailableLanguages();
-        Assertions.assertEquals(11, languages.size(), "Loaded Languages: " + languages.keySet());
+        Assertions.assertEquals(13, languages.size(), "Loaded Languages: " + languages.keySet());
     }
 
     @Test

+ 1 - 0
jplag.frontend-utils/src/main/java/de/jplag/Language.java

@@ -51,6 +51,7 @@ public interface Language {
     /**
      * Determines whether a fixed-width font should be used to display that language.
      */
+    // TODO DF: This method is not used!
     default boolean isPreformatted() {
         return true;
     }

+ 6 - 3
jplag.frontend.emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/Language.java

@@ -1,5 +1,7 @@
 package de.jplag.emf.dynamic;
 
+import org.kohsuke.MetaInfServices;
+
 import de.jplag.emf.dynamic.parser.DynamicEcoreParser;
 
 /**
@@ -7,9 +9,10 @@ import de.jplag.emf.dynamic.parser.DynamicEcoreParser;
  * created token set instead of a hand-picked one.
  * @author Timur Saglam
  */
+@MetaInfServices(de.jplag.Language.class)
 public class Language extends de.jplag.emf.Language {
     private static final String NAME = "EMF metamodels (dynamically created token set)";
-    private static final String SHORT_NAME = "EMF metamodel (dynamic)";
+    public static final String IDENTIFIER = "emf-metamodel-dynamic";
 
     private static final int DEFAULT_MIN_TOKEN_MATCH = 10;
 
@@ -23,8 +26,8 @@ public class Language extends de.jplag.emf.Language {
     }
 
     @Override
-    public String getShortName() {
-        return SHORT_NAME;
+    public String getIdentifier() {
+        return IDENTIFIER;
     }
 
     @Override

+ 5 - 3
jplag.frontend.emf-metamodel/src/main/java/de/jplag/emf/Language.java

@@ -4,6 +4,7 @@ import java.io.File;
 import java.util.Arrays;
 
 import org.eclipse.emf.ecore.EcorePackage;
+import org.kohsuke.MetaInfServices;
 
 import de.jplag.TokenList;
 import de.jplag.emf.parser.EcoreParser;
@@ -12,12 +13,13 @@ import de.jplag.emf.parser.EcoreParser;
  * Language for EMF metamodels from the Eclipse Modeling Framework (EMF).
  * @author Timur Saglam
  */
+@MetaInfServices(de.jplag.Language.class)
 public class Language implements de.jplag.Language {
     public static final String VIEW_FILE_SUFFIX = ".TreeView";
     public static final String FILE_ENDING = "." + EcorePackage.eNAME;
 
     private static final String NAME = "EMF metamodel";
-    private static final String SHORT_NAME = "EMF metamodel";
+    public static final String IDENTIFIER = "emf-metamodel";
     private static final int DEFAULT_MIN_TOKEN_MATCH = 6;
 
     protected final EcoreParser parser;
@@ -41,8 +43,8 @@ public class Language implements de.jplag.Language {
     }
 
     @Override
-    public String getShortName() {
-        return SHORT_NAME;
+    public String getIdentifier() {
+        return IDENTIFIER;
     }
 
     @Override