Просмотр исходного кода

Implement feedback from revision; remove duplicate dependency

Robin Maisch 4 лет назад
Родитель
Сommit
c73f4d2c82

+ 0 - 4
jplag.cli/pom.xml

@@ -12,10 +12,6 @@
             <groupId>de.jplag</groupId>
             <groupId>de.jplag</groupId>
             <artifactId>jplag</artifactId>
             <artifactId>jplag</artifactId>
         </dependency>
         </dependency>
-        <dependency>
-            <groupId>de.jplag</groupId>
-            <artifactId>jplag</artifactId>
-        </dependency>
         <dependency>
         <dependency>
             <groupId>de.jplag</groupId>
             <groupId>de.jplag</groupId>
             <artifactId>frontend-utils</artifactId>
             <artifactId>frontend-utils</artifactId>

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

@@ -7,8 +7,8 @@ import de.jplag.TokenList;
 
 
 public class Language implements de.jplag.Language {
 public class Language implements de.jplag.Language {
 
 
-    private static final String SHORT_NAME = "Go";
     private static final String NAME = "Go Parser";
     private static final String NAME = "Go Parser";
+    private static final String SHORT_NAME = "Go";
     private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
     private static final int DEFAULT_MIN_TOKEN_MATCH = 8;
     private static final String[] FILE_EXTENSIONS = {".go"};
     private static final String[] FILE_EXTENSIONS = {".go"};
     private final GoParserAdapter parserAdapter;
     private final GoParserAdapter parserAdapter;

+ 6 - 5
jplag.frontend.golang/src/main/java/de/jplag/golang/grammar/GoTokenUtils.java

@@ -5,17 +5,18 @@ import de.jplag.golang.GoToken;
 public class GoTokenUtils {
 public class GoTokenUtils {
 
 
     private static final int NOT_SET = -1;
     private static final int NOT_SET = -1;
-    private static final String NOT_SET_STRING = "";
+    private static final String EMPTY_STRING = "";
+
+    private GoTokenUtils() {
+        // Utility class, should not be instantiated.
+    }
 
 
     public static GoToken getDummyToken(int type) {
     public static GoToken getDummyToken(int type) {
-        return new GoToken(type, NOT_SET_STRING, NOT_SET, NOT_SET, NOT_SET);
+        return new GoToken(type, EMPTY_STRING, NOT_SET, NOT_SET, NOT_SET);
     }
     }
 
 
     public static GoToken getDummyToken(int type, String fileName) {
     public static GoToken getDummyToken(int type, String fileName) {
         return new GoToken(type, fileName, NOT_SET, NOT_SET, NOT_SET);
         return new GoToken(type, fileName, NOT_SET, NOT_SET, NOT_SET);
     }
     }
 
 
-    private GoTokenUtils() {
-        // Utility class, should not be instantiated.
-    }
 }
 }

+ 3 - 3
jplag/pom.xml

@@ -47,15 +47,15 @@
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>de.jplag</groupId>
             <groupId>de.jplag</groupId>
-            <artifactId>rlang</artifactId>
+            <artifactId>golang</artifactId>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>de.jplag</groupId>
             <groupId>de.jplag</groupId>
-            <artifactId>golang</artifactId>
+            <artifactId>kotlin</artifactId>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>de.jplag</groupId>
             <groupId>de.jplag</groupId>
-            <artifactId>kotlin</artifactId>
+            <artifactId>rlang</artifactId>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>de.jplag</groupId>
             <groupId>de.jplag</groupId>