Explorar o código

Remove unnecessary interface realization of the token constants interface.

Timur Sağlam %!s(int64=4) %!d(string=hai) anos
pai
achega
99409f3368

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

@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * List of tokens. Allows random access to individual tokens. Contains a hash map for token hashes.
  */
-public class TokenList implements TokenConstants {
+public class TokenList {
     private final List<Token> tokens;
     TokenHashMap tokenHashes = null;
     int hash_length = -1;

+ 2 - 2
jplag.frontend.chars/src/main/java/de/jplag/chars/Parser.java

@@ -8,7 +8,7 @@ import de.jplag.AbstractParser;
 import de.jplag.TokenConstants;
 import de.jplag.TokenList;
 
-public class Parser extends AbstractParser implements TokenConstants {
+public class Parser extends AbstractParser {
 
     private TokenList tokens;
 
@@ -19,7 +19,7 @@ public class Parser extends AbstractParser implements TokenConstants {
             getErrorConsumer().print(null, "Parsing file " + file);
             if (!parseFile(directory, file))
                 errors++;
-            tokens.addToken(new CharToken(FILE_END, file, this));
+            tokens.addToken(new CharToken(TokenConstants.FILE_END, file, this));
         }
         if (errors == 0)
             errorConsumer.print(null, "OK");

+ 2 - 2
jplag.frontend.cpp/src/main/java/de/jplag/cpp/Scanner.java

@@ -5,7 +5,7 @@ import java.io.File;
 import de.jplag.AbstractParser;
 import de.jplag.TokenList;
 
-public class Scanner extends AbstractParser implements CPPTokenConstants {
+public class Scanner extends AbstractParser {
     private String currentFile;
 
     private TokenList tokens;
@@ -20,7 +20,7 @@ public class Scanner extends AbstractParser implements CPPTokenConstants {
             if (!CPPScanner.scanFile(directory, files[i], scanner, this)) {
                 errors++;
             }
-            tokens.addToken(new CPPToken(FILE_END, currentFile));
+            tokens.addToken(new CPPToken(CPPTokenConstants.FILE_END, currentFile));
         }
         this.parseEnd();
         return tokens;

+ 2 - 2
jplag.frontend.csharp-1.2/src/main/java/de/jplag/csharp/Parser.java

@@ -11,7 +11,7 @@ import de.jplag.TokenList;
 import de.jplag.csharp.grammar.CSharpLexer;
 import de.jplag.csharp.grammar.CSharpParser;
 
-public class Parser extends AbstractParser implements CSharpTokenConstants {
+public class Parser extends AbstractParser {
     private TokenList tokens;
     private String currentFile;
 
@@ -21,7 +21,7 @@ public class Parser extends AbstractParser implements CSharpTokenConstants {
         for (int i = 0; i < files.length; i++) {
             if (!parseFile(directory, files[i]))
                 errors++;
-            tokens.addToken(new CSharpToken(FILE_END, files[i], -1, -1, -1));
+            tokens.addToken(new CSharpToken(CSharpTokenConstants.FILE_END, files[i], -1, -1, -1));
         }
         this.parseEnd();
         return tokens;

+ 2 - 2
jplag.frontend.python-3/src/main/java/de/jplag/python3/Parser.java

@@ -18,7 +18,7 @@ import de.jplag.python3.grammar.Python3Lexer;
 import de.jplag.python3.grammar.Python3Parser;
 import de.jplag.python3.grammar.Python3Parser.File_inputContext;
 
-public class Parser extends AbstractParser implements Python3TokenConstants {
+public class Parser extends AbstractParser {
 
     private TokenList tokens = new TokenList();
     private String currentFile;
@@ -32,7 +32,7 @@ public class Parser extends AbstractParser implements Python3TokenConstants {
                 errors++;
             }
             System.gc();// Emeric
-            tokens.addToken(new Python3Token(FILE_END, files[i], -1, -1, -1));
+            tokens.addToken(new Python3Token(Python3TokenConstants.FILE_END, files[i], -1, -1, -1));
         }
         this.parseEnd();
         return tokens;

+ 2 - 2
jplag.frontend.scheme/src/main/java/de/jplag/scheme/Parser.java

@@ -5,7 +5,7 @@ import java.io.File;
 import de.jplag.AbstractParser;
 import de.jplag.TokenList;
 
-public class Parser extends AbstractParser implements SchemeTokenConstants {
+public class Parser extends AbstractParser{
     private String currentFile;
 
     private TokenList tokens;
@@ -18,7 +18,7 @@ public class Parser extends AbstractParser implements SchemeTokenConstants {
             getErrorConsumer().print(null, "Parsing file " + files[i]);
             if (!SchemeParser.parseFile(directory, files[i], null, this))
                 errors++;
-            tokens.addToken(new SchemeToken(FILE_END, currentFile));
+            tokens.addToken(new SchemeToken(SchemeTokenConstants.FILE_END, currentFile));
         }
         this.parseEnd();
         return tokens;

+ 2 - 2
jplag.frontend.text/src/main/java/de/jplag/text/Parser.java

@@ -10,7 +10,7 @@ import de.jplag.AbstractParser;
 import de.jplag.TokenConstants;
 import de.jplag.TokenList;
 
-public class Parser extends AbstractParser implements TokenConstants {
+public class Parser extends AbstractParser {
 
     protected Hashtable<String, Integer> table = new Hashtable<>();
     protected int serial = 1; // 0 is FILE_END token
@@ -28,7 +28,7 @@ public class Parser extends AbstractParser implements TokenConstants {
             getErrorConsumer().print("", "Parsing file " + file);
             if (!parseFile(directory, file))
                 errors++;
-            tokens.addToken(new TextToken(FILE_END, file, this));
+            tokens.addToken(new TextToken(TokenConstants.FILE_END, file, this));
         }
 
         TokenList tmp = tokens;

+ 4 - 1
jplag/src/main/java/de/jplag/GreedyStringTiling.java

@@ -1,5 +1,8 @@
 package de.jplag;
 
+import static de.jplag.TokenConstants.FILE_END;
+import static de.jplag.TokenConstants.SEPARATOR_TOKEN;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -13,7 +16,7 @@ import de.jplag.options.JPlagOptions;
  * "https://www.researchgate.net/publication/262763983_String_Similarity_via_Greedy_String_Tiling_and_Running_Karp-Rabin_Matching">
  * String Similarity via Greedy String Tiling and Running Karp−Rabin Matching </a>
  */
-public class GreedyStringTiling implements TokenConstants {
+public class GreedyStringTiling {
 
     private final JPlagOptions options;