Sfoglia il codice sorgente

Remove old language options to adapt the CLI and the java language.

Timur Sağlam 4 anni fa
parent
commit
274dcf9bbc

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

@@ -29,7 +29,7 @@ public class Language implements de.jplag.Language {
 
 
     @Override
     @Override
     public String getShortName() {
     public String getShortName() {
-        return "java19";
+        return "java";
     }
     }
 
 
     @Override
     @Override

+ 2 - 7
jplag/src/main/java/de/jplag/options/LanguageOption.java

@@ -9,12 +9,7 @@ import java.util.Collection;
  * The available languages.
  * The available languages.
  */
  */
 public enum LanguageOption {
 public enum LanguageOption {
-    JAVA_1_1("java1", "de.jplag.javax.Language"),
-    JAVA_1_2("java2", "de.jplag.java.Language"),
-    JAVA_1_5("java5", "de.jplag.java15.Language"),
-    JAVA_1_5_DM("java5dm", "de.jplag.java15.LanguageWithDelimitedMethods"),
-    JAVA_1_7("java7", "de.jplag.java17.Language"),
-    JAVA_1_9("java9", "de.jplag.java.Language"),
+    JAVA("java", "de.jplag.java.Language"),
     PYTHON_3("python3", "de.jplag.python3.Language"),
     PYTHON_3("python3", "de.jplag.python3.Language"),
     C_CPP("cpp", "de.jplag.cpp.Language"),
     C_CPP("cpp", "de.jplag.cpp.Language"),
     C_SHARP("csharp", "de.jplag.csharp.Language"),
     C_SHARP("csharp", "de.jplag.csharp.Language"),
@@ -48,6 +43,6 @@ public enum LanguageOption {
     }
     }
 
 
     public static LanguageOption getDefault() {
     public static LanguageOption getDefault() {
-        return LanguageOption.JAVA_1_9;
+        return LanguageOption.JAVA;
     }
     }
 }
 }

+ 1 - 1
jplag/src/test/java/de/jplag/TestBase.java

@@ -27,7 +27,7 @@ public abstract class TestBase {
     }
     }
 
 
     protected JPlagResult runJPlag(String testSampleName, Consumer<JPlagOptions> customization) throws ExitException {
     protected JPlagResult runJPlag(String testSampleName, Consumer<JPlagOptions> customization) throws ExitException {
-        JPlagOptions options = new JPlagOptions(Path.of(BASE_PATH, testSampleName).toString(), LanguageOption.JAVA_1_9);
+        JPlagOptions options = new JPlagOptions(Path.of(BASE_PATH, testSampleName).toString(), LanguageOption.JAVA);
         options.setVerbosity(Verbosity.LONG);
         options.setVerbosity(Verbosity.LONG);
         customization.accept(options);
         customization.accept(options);
         JPlag jplag = new JPlag(options);
         JPlag jplag = new JPlag(options);