Merge pull request #2235 from jplag/feature/language-interfaces

Clean up the language interfaces

Author: tsaglam

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

@@ -12,7 +12,7 @@
 public interface Language {
 
     /**
-     * Suffixes for the files containing code of the language. An empty array means all suffixes are valid.
+     * File extensions for the files containing code of the language. An empty array means all suffixes are valid.
      */
     String[] suffixes();
 

languages/c/src/main/java/de/jplag/c/CLanguage.java

@@ -10,24 +10,23 @@
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
-@MetaInfServices(de.jplag.Language.class)
+@MetaInfServices(Language.class)
 public class CLanguage implements Language {
-    private static final String NAME = "C";
-    private static final String IDENTIFIER = "c";
 
     @Override
     public String[] suffixes() {
-        return new String[] {".cpp", ".CPP", ".cxx", ".CXX", ".c++", ".C++", ".c", ".C", ".cc", ".CC", ".h", ".H", ".hpp", ".HPP", ".hh", ".HH"};
+        return new String[] {".cpp", ".CPP", ".cxx", ".CXX", ".c++", ".C++", ".c", ".C", ".cc", ".CC", ".h", ".H", ".hpp", ".HPP", ".hh", ".HH",
+                ".hxx", ".HXX"};
     }
 
     @Override
     public String getName() {
-        return NAME;
+        return "C";
     }
 
     @Override
     public String getIdentifier() {
-        return IDENTIFIER;
+        return "c";
     }
 
     @Override

languages/cpp/src/main/java/de/jplag/cpp/CPPLanguage.java

@@ -15,22 +15,21 @@
  */
 @MetaInfServices(Language.class)
 public class CPPLanguage implements Language {
-    private static final String NAME = "C++";
-    private static final String IDENTIFIER = "cpp";
 
     @Override
     public String[] suffixes() {
-        return new String[] {".cpp", ".CPP", ".cxx", ".CXX", ".c++", ".C++", ".c", ".C", ".cc", ".CC", ".h", ".H", ".hpp", ".HPP", ".hh", ".HH"};
+        return new String[] {".cpp", ".CPP", ".cxx", ".CXX", ".c++", ".C++", ".c", ".C", ".cc", ".CC", ".h", ".H", ".hpp", ".HPP", ".hh", ".HH",
+                ".hxx"};
     }
 
     @Override
     public String getName() {
-        return NAME;
+        return "C++";
     }
 
     @Override
     public String getIdentifier() {
-        return IDENTIFIER;
+        return "cpp";
     }
 
     @Override

languages/csharp/src/main/java/de/jplag/csharp/CSharpLanguage.java

@@ -13,31 +13,27 @@
 /**
  * C# language with full support of C# 6 features and below.
  */
-@MetaInfServices(de.jplag.Language.class)
+@MetaInfServices(Language.class)
 public class CSharpLanguage implements Language {
-    private static final String NAME = "C#";
-    private static final String IDENTIFIER = "csharp";
-    private static final String[] FILE_ENDINGS = new String[] {".cs", ".CS"};
-    private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
 
     @Override
     public String[] suffixes() {
-        return FILE_ENDINGS;
+        return new String[] {".cs", ".CS"};
     }
 
     @Override
     public String getName() {
-        return NAME;
+        return "C#";
     }
 
     @Override
     public String getIdentifier() {
-        return IDENTIFIER;
+        return "csharp";
     }
 
     @Override
     public int minimumTokenMatch() {
-        return DEFAULT_MIN_TOKEN_MATCH;
+        return 8;
     }
 
     @Override

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

@@ -15,24 +15,20 @@
  * @author Timur Saglam
  */
 public class DynamicEmfLanguage extends EmfLanguage { // currently not included in the CLI
-    private static final String NAME = "EMF metamodels (dynamically created token set)";
-    private static final String IDENTIFIER = "emf-dynamic";
-
-    private static final int DEFAULT_MIN_TOKEN_MATCH = 10;
 
     @Override
     public String getName() {
-        return NAME;
+        return "EMF metamodels (dynamically created token set)";
     }
 
     @Override
     public String getIdentifier() {
-        return IDENTIFIER;
+        return "emf-dynamic";
     }
 
     @Override
     public int minimumTokenMatch() {
-        return DEFAULT_MIN_TOKEN_MATCH;
+        return 10;
     }
 
     @Override

languages/emf-metamodel/src/main/java/de/jplag/emf/EmfLanguage.java

@@ -7,6 +7,7 @@
 import org.eclipse.emf.ecore.EcorePackage;
 import org.kohsuke.MetaInfServices;
 
+import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 import de.jplag.emf.parser.EcoreParser;
@@ -15,33 +16,30 @@
  * Language for EMF metamodels from the Eclipse Modeling Framework (EMF).
  * @author Timur Saglam
  */
-@MetaInfServices(de.jplag.Language.class)
-public class EmfLanguage implements de.jplag.Language {
+@MetaInfServices(Language.class)
+public class EmfLanguage implements Language {
+
     public static final String VIEW_FILE_SUFFIX = ".emfatic";
     public static final String FILE_ENDING = "." + EcorePackage.eNAME;
 
-    private static final String NAME = "EMF metamodel";
-    private static final String IDENTIFIER = "emf";
-    private static final int DEFAULT_MIN_TOKEN_MATCH = 6;
-
     @Override
     public String[] suffixes() {
         return new String[] {FILE_ENDING};
     }
 
     @Override
     public String getName() {
-        return NAME;
+        return "EMF metamodel";
     }
 
     @Override
     public String getIdentifier() {
-        return IDENTIFIER;
+        return "emf";
     }
 
     @Override
     public int minimumTokenMatch() {
-        return DEFAULT_MIN_TOKEN_MATCH;
+        return 6;
     }
 
     @Override

languages/emf-model/src/main/java/de/jplag/emf/model/EmfModelLanguage.java

@@ -7,6 +7,7 @@
 
 import org.kohsuke.MetaInfServices;
 
+import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 import de.jplag.emf.dynamic.DynamicEmfLanguage;
@@ -17,12 +18,8 @@
  * created token set.
  * @author Timur Saglam
  */
-@MetaInfServices(de.jplag.Language.class)
+@MetaInfServices(Language.class)
 public class EmfModelLanguage extends DynamicEmfLanguage {
-    private static final String NAME = "EMF models (dynamically created token set)";
-    private static final String IDENTIFIER = "emf-model";
-
-    public static final String VIEW_FILE_SUFFIX = ".treeview";
 
     @Override
     public String[] suffixes() {
@@ -31,17 +28,17 @@ public String[] suffixes() {
 
     @Override
     public String getName() {
-        return NAME;
+        return "EMF models (dynamically created token set)";
     }
 
     @Override
     public String getIdentifier() {
-        return IDENTIFIER;
+        return "emf-model";
     }
 
     @Override
     public String viewFileSuffix() {
-        return VIEW_FILE_SUFFIX;
+        return ".treeview";
     }
 
     @Override

languages/golang/src/main/java/de/jplag/golang/GoLanguage.java

@@ -10,31 +10,27 @@
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
-@MetaInfServices(de.jplag.Language.class)
+@MetaInfServices(Language.class)
 public class GoLanguage implements Language {
-    private static final String NAME = "Go";
-    private static final String IDENTIFIER = "go";
-    private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
-    private static final String[] FILE_EXTENSIONS = {".go"};
 
     @Override
     public String[] suffixes() {
-        return FILE_EXTENSIONS;
+        return new String[] {".go"};
     }
 
     @Override
     public String getName() {
-        return NAME;
+        return "Go";
     }
 
     @Override
     public String getIdentifier() {
-        return IDENTIFIER;
+        return "go";
     }
 
     @Override
     public int minimumTokenMatch() {
-        return DEFAULT_MIN_TOKEN_MATCH;
+        return 8;
     }
 
     @Override

languages/java/src/main/java/de/jplag/java/JavaLanguage.java

@@ -6,16 +6,15 @@
 
 import org.kohsuke.MetaInfServices;
 
+import de.jplag.Language;
 import de.jplag.ParsingException;
 import de.jplag.Token;
 
 /**
  * Language for Java 9 and newer.
  */
-@MetaInfServices(de.jplag.Language.class)
-public class JavaLanguage implements de.jplag.Language {
-    private static final String NAME = "Java";
-    private static final String IDENTIFIER = "java";
+@MetaInfServices(Language.class)
+public class JavaLanguage implements Language {
 
     @Override
     public String[] suffixes() {
@@ -24,12 +23,12 @@ public String[] suffixes() {
 
     @Override
     public String getName() {
-        return NAME;
+        return "Java";
     }
 
     @Override
     public String getIdentifier() {
-        return IDENTIFIER;
+        return "java";
     }
 
     @Override

languages/javascript/src/main/java/de/jplag/javascript/JavaScriptLanguage.java

@@ -2,20 +2,18 @@
 
 import org.kohsuke.MetaInfServices;
 
+import de.jplag.Language;
 import de.jplag.typescript.TypeScriptLanguage;
 
 /**
  * Represents the JavaScript Language as a variance of TypeScript
  */
-@MetaInfServices(de.jplag.Language.class)
+@MetaInfServices(Language.class)
 public class JavaScriptLanguage extends TypeScriptLanguage {
 
-    private static final String IDENTIFIER = "javascript";
-    private static final String NAME = "JavaScript";
-
     @Override
     public String getIdentifier() {
-        return IDENTIFIER;
+        return "javascript";
     }
 
     @Override
@@ -25,6 +23,6 @@ public String[] suffixes() {
 
     @Override
     public String getName() {
-        return NAME;
+        return "JavaScript";
     }
 }