Replace fully qualified names with imports when possible.

jplag.frontend-utils/src/main/java/de/jplag/ParserToken.java

@@ -1,6 +1,8 @@
 package de.jplag;
 
-public class ParserToken extends antlr.Token {
+import antlr.Token;
+
+public class ParserToken extends Token {
     /**
      * This variable holds the line number of the current token.
      */

jplag.frontend.chars/src/main/java/de/jplag/chars/CharToken.java

@@ -1,6 +1,8 @@
 package de.jplag.chars;
 
-public class CharToken extends de.jplag.Token {
+import de.jplag.Token;
+
+public class CharToken extends Token {
 	private static final long serialVersionUID = 1L;
 
 	private int index;

jplag.frontend.chars/src/main/java/de/jplag/chars/Language.java

@@ -4,6 +4,7 @@ import java.io.File;
 
 import de.jplag.ProgramI;
 import de.jplag.Token;
+import de.jplag.TokenList;
 
 /*
  * read in text files as characters
@@ -50,7 +51,7 @@ public class Language implements de.jplag.Language {
 	}
 
 	@Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 

jplag.frontend.chars/src/main/java/de/jplag/chars/Parser.java

@@ -4,13 +4,15 @@ import java.io.File;
 import java.io.FileReader;
 import java.nio.charset.StandardCharsets;
 
+import de.jplag.AbstractParser;
+import de.jplag.TokenConstants;
 import de.jplag.TokenList;
 
-public class Parser extends de.jplag.AbstractParser implements de.jplag.TokenConstants {
+public class Parser extends AbstractParser implements TokenConstants {
 
 	private TokenList struct;
 
-	public de.jplag.TokenList parse(File dir, String files[]) {
+	public TokenList parse(File dir, String files[]) {
 		struct = new TokenList();
 		errors = 0;
 		for (int i = 0; i < files.length; i++) {

jplag.frontend.cpp/src/main/java/de/jplag/cpp/CPPToken.java

@@ -1,6 +1,8 @@
 package de.jplag.cpp;
 
-public class CPPToken extends de.jplag.Token implements CPPTokenConstants {
+import de.jplag.Token;
+
+public class CPPToken extends Token implements CPPTokenConstants {
 	private static final long serialVersionUID = 1L;
 	private int line;
 

jplag.frontend.cpp/src/main/java/de/jplag/cpp/CPPTokenConstants.java

@@ -1,6 +1,8 @@
 package de.jplag.cpp;
 
-public interface CPPTokenConstants extends de.jplag.TokenConstants {
+import de.jplag.TokenConstants;
+
+public interface CPPTokenConstants extends TokenConstants {
   final static int FILE_END = 0;
   // Used to optionally separate methods from each other
   // with an always marked token

jplag.frontend.cpp/src/main/java/de/jplag/cpp/Language.java

@@ -3,6 +3,7 @@ package de.jplag.cpp;
 import java.io.File;
 
 import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 /*
  * Leider werden C/C++ nicht geparst, sondern nur gescannt...
@@ -59,7 +60,7 @@ public class Language implements de.jplag.Language {
 	}
 
 	@Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
 		return this.scanner.scan(dir, files);
 	}
 
@@ -75,6 +76,6 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String type2string(int type) {
-		return de.jplag.cpp.CPPToken.type2string(type);
+		return CPPToken.type2string(type);
 	}
 }

jplag.frontend.cpp/src/main/java/de/jplag/cpp/Scanner.java

@@ -3,14 +3,15 @@ package de.jplag.cpp;
 import java.io.File;
 
 import de.jplag.AbstractParser;
+import de.jplag.TokenList;
 
 public class Scanner extends AbstractParser implements CPPTokenConstants {
 	private String actFile;
 
-	private de.jplag.TokenList struct;
+	private TokenList struct;
 
-	public de.jplag.TokenList scan(File dir, String files[]) {
-		struct = new de.jplag.TokenList();
+	public TokenList scan(File dir, String files[]) {
+		struct = new TokenList();
 		errors = 0;
 		CPPScanner scanner = null;// will be initialized in Method scanFile
 		for (int i = 0; i < files.length; i++) {

jplag.frontend.csharp-1.2/src/main/java/de/jplag/csharp/CSharpToken.java

@@ -1,6 +1,8 @@
 package de.jplag.csharp;
 
-public class CSharpToken extends de.jplag.Token implements CSharpTokenConstants {
+import de.jplag.Token;
+
+public class CSharpToken extends Token implements CSharpTokenConstants {
   private static final long serialVersionUID = 1L;
   private int line, column, length;
 

jplag.frontend.csharp-1.2/src/main/java/de/jplag/csharp/CSharpTokenConstants.java

@@ -1,6 +1,8 @@
 package de.jplag.csharp;
 
-public interface CSharpTokenConstants extends de.jplag.TokenConstants {
+import de.jplag.TokenConstants;
+
+public interface CSharpTokenConstants extends TokenConstants {
   final static int FILE_END = 0;
 
   // Used to optionally separate methods from each other

jplag.frontend.csharp-1.2/src/main/java/de/jplag/csharp/Language.java

@@ -3,6 +3,7 @@ package de.jplag.csharp;
 import java.io.File;
 
 import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 public class Language implements de.jplag.Language {
 	private Parser parser;
@@ -40,7 +41,7 @@ public class Language implements de.jplag.Language {
 	}
 
 	@Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -71,6 +72,6 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String type2string(int type) {
-		return de.jplag.csharp.CSharpToken.type2string(type);
+		return CSharpToken.type2string(type);
 	}
 }

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

@@ -4,16 +4,18 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.nio.charset.StandardCharsets;
 
+import antlr.Token;
+import de.jplag.AbstractParser;
 import de.jplag.TokenList;
 import de.jplag.UnicodeReader;
 import de.jplag.csharp.grammar.CSharpLexer;
 import de.jplag.csharp.grammar.CSharpParser;
 
-public class Parser extends de.jplag.AbstractParser implements CSharpTokenConstants {
+public class Parser extends AbstractParser implements CSharpTokenConstants {
 	private TokenList struct;
 	private String currentFile;
 
-	public de.jplag.TokenList parse(File dir, String files[]) {
+	public TokenList parse(File dir, String files[]) {
 		struct = new TokenList();
 		errors = 0;
 		for (int i = 0; i < files.length; i++) {
@@ -51,7 +53,7 @@ public class Parser extends de.jplag.AbstractParser implements CSharpTokenConsta
 		return true;
 	}
 
-	private void add(int type, antlr.Token tok) {
+	private void add(int type, Token tok) {
 		if (tok == null) {
 			System.out.println("tok == null  ERROR!");
 			return;

jplag.frontend.java-1.1exp/src/main/java/de/jplag/javax/JavaToken.java

@@ -1,6 +1,8 @@
 package de.jplag.javax;
 
-public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
+import de.jplag.Token;
+
+public class JavaToken extends Token implements JavaTokenConstants {
 	private static final long serialVersionUID = 8090049637477580276L;
 	private int line;
 

jplag.frontend.java-1.1exp/src/main/java/de/jplag/javax/JavaTokenConstants.java

@@ -1,8 +1,10 @@
 package de.jplag.javax;
 
+import de.jplag.TokenConstants;
+
 //import java.io.*;
 
-public interface JavaTokenConstants extends de.jplag.TokenConstants {
+public interface JavaTokenConstants extends TokenConstants {
   final static int FILE_END = 0;
 
   final static int J_PACKAGE =          1;  

jplag.frontend.java-1.1exp/src/main/java/de/jplag/javax/Language.java

@@ -3,6 +3,7 @@ package de.jplag.javax;
 import java.io.File;
 
 import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 public class Language implements de.jplag.Language {
 	private Parser parser;
@@ -55,7 +56,7 @@ public class Language implements de.jplag.Language {
 	}
 
 	@Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -71,6 +72,6 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String type2string(int type) {
-		return de.jplag.javax.JavaToken.type2string(type);
+		return JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.1exp/src/main/java/de/jplag/javax/Parser.java

@@ -2,13 +2,16 @@ package de.jplag.javax;
 
 import java.io.File;
 
-public class Parser extends de.jplag.AbstractParser implements JavaTokenConstants {
+import de.jplag.AbstractParser;
+import de.jplag.TokenList;
+
+public class Parser extends AbstractParser implements JavaTokenConstants {
 	private String actFile;
 
-	private de.jplag.TokenList struct;
+	private TokenList struct;
 
-	public de.jplag.TokenList parse(File dir, String files[]) {
-		struct = new de.jplag.TokenList();
+	public TokenList parse(File dir, String files[]) {
+		struct = new TokenList();
 		errors = 0;
 		JavaParser parser = null;// no worry it will be reinitialized
 		// in method parseFile(...)

jplag.frontend.java-1.2/src/main/java/de/jplag/java/JavaToken.java

@@ -1,6 +1,8 @@
 package de.jplag.java;
 
-public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
+import de.jplag.Token;
+
+public class JavaToken extends Token implements JavaTokenConstants {
 	private static final long serialVersionUID = 1581274829013336295L;
 	private int line, column, length;
 

jplag.frontend.java-1.2/src/main/java/de/jplag/java/JavaTokenConstants.java

@@ -1,6 +1,8 @@
 package de.jplag.java;
 
-public interface JavaTokenConstants extends de.jplag.TokenConstants {
+import de.jplag.TokenConstants;
+
+public interface JavaTokenConstants extends TokenConstants {
   final static int FILE_END = 0;
 
   final static int J_PACKAGE = 1;               //

jplag.frontend.java-1.2/src/main/java/de/jplag/java/Language.java

@@ -3,6 +3,7 @@ package de.jplag.java;
 import java.io.File;
 
 import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 public class Language implements de.jplag.Language {
 	private Parser parser;
@@ -39,7 +40,7 @@ public class Language implements de.jplag.Language {
 	}
 
 	@Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -70,6 +71,6 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String type2string(int type) {
-		return de.jplag.java.JavaToken.type2string(type);
+		return JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.2/src/main/java/de/jplag/java/Parser.java

@@ -3,17 +3,19 @@ package de.jplag.java;
 import java.io.File;
 import java.io.FileInputStream;
 
+import antlr.Token;
+import de.jplag.AbstractParser;
 import de.jplag.InputState;
 import de.jplag.ParserToken;
 import de.jplag.TokenList;
 import de.jplag.java.grammar.JLexer;
 import de.jplag.java.grammar.JRecognizer;
 
-public class Parser extends de.jplag.AbstractParser implements JavaTokenConstants {
+public class Parser extends AbstractParser implements JavaTokenConstants {
 	private TokenList struct;
 	private String currentFile;
 
-	public de.jplag.TokenList parse(File dir, String files[]) {
+	public TokenList parse(File dir, String files[]) {
 		struct = new TokenList();
 		errors = 0;
 		for (int i = 0; i < files.length; i++) {
@@ -59,7 +61,7 @@ public class Parser extends de.jplag.AbstractParser implements JavaTokenConstant
 		return true;
 	}
 
-	public void add(int type, antlr.Token tok) {
+	public void add(int type, Token tok) {
 		ParserToken ptok = (ParserToken) tok;
 		struct.addToken(new JavaToken(type, currentFile, ptok.getLine(), ptok.getColumn(), ptok.getLength()));
 	}

jplag.frontend.java-1.5/src/main/java/de/jplag/java15/JavaToken.java

@@ -1,6 +1,8 @@
 package de.jplag.java15;
 
-public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
+import de.jplag.Token;
+
+public class JavaToken extends Token implements JavaTokenConstants {
 	private static final long serialVersionUID = 3743208940428676175L;
 	private int line, column, length;
 

jplag.frontend.java-1.5/src/main/java/de/jplag/java15/JavaTokenConstants.java

@@ -1,6 +1,8 @@
 package de.jplag.java15;
 
-public interface JavaTokenConstants extends de.jplag.TokenConstants {
+import de.jplag.TokenConstants;
+
+public interface JavaTokenConstants extends TokenConstants {
   final static int FILE_END = 0;
   
   // Used to optionally separate methods from each other

jplag.frontend.java-1.5/src/main/java/de/jplag/java15/Language.java

@@ -3,6 +3,7 @@ package de.jplag.java15;
 import java.io.File;
 
 import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 public class Language implements de.jplag.Language {
 	private Parser parser;
@@ -39,7 +40,7 @@ public class Language implements de.jplag.Language {
 	}
 
 	@Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -70,6 +71,6 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String type2string(int type) {
-		return de.jplag.java15.JavaToken.type2string(type);
+		return JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.5/src/main/java/de/jplag/java15/LanguageWithDelimitedMethods.java

@@ -2,14 +2,16 @@ package de.jplag.java15;
 
 import java.io.File;
 
+import de.jplag.Language;
 import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 /**
  * Java 1.5 parser with method separators; if you know why these separators
  * exist, PLEASE tell us or document at
  * https://svn.ipd.kit.edu/trac/de/jplag/wiki/Server/Frontends/Java-1.5)
  */
-public class LanguageWithDelimitedMethods implements de.jplag.Language {
+public class LanguageWithDelimitedMethods implements Language {
 	private Parser parser;
 
 	public LanguageWithDelimitedMethods(ProgramI program) {
@@ -44,7 +46,7 @@ public class LanguageWithDelimitedMethods implements de.jplag.Language {
 	}
 
 	@Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -75,6 +77,6 @@ public class LanguageWithDelimitedMethods implements de.jplag.Language {
 
 	@Override
     public String type2string(int type) {
-		return de.jplag.java15.JavaToken.type2string(type);
+		return JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.5/src/main/java/de/jplag/java15/Parser.java

@@ -2,21 +2,23 @@ package de.jplag.java15;
 
 import java.io.File;
 
+import de.jplag.AbstractParser;
+import de.jplag.TokenList;
 import de.jplag.java15.grammar.JavaParser;
 import de.jplag.java15.grammar.Token;
 
-public class Parser extends de.jplag.AbstractParser implements JavaTokenConstants {
+public class Parser extends AbstractParser implements JavaTokenConstants {
 	private String actFile;
 	private boolean useMethodSeparators;
 
-	private de.jplag.TokenList struct;
+	private TokenList struct;
 
 	public Parser(boolean useMethodSeparators) {
 		this.useMethodSeparators = useMethodSeparators;
 	}
 
-	public de.jplag.TokenList parse(File dir, String files[]) {
-		struct = new de.jplag.TokenList();
+	public TokenList parse(File dir, String files[]) {
+		struct = new TokenList();
 		errors = 0;
 
 		JavaParser parser = null; // This will be (re)initialised in parseFile()

jplag.frontend.java-1.7/src/main/java/de/jplag/java17/JavaToken.java

@@ -1,6 +1,8 @@
 package de.jplag.java17;
 
-public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
+import de.jplag.Token;
+
+public class JavaToken extends Token implements JavaTokenConstants {
 	private static final long serialVersionUID = -383581430479870696L;
 	private int line, column, length;
 

jplag.frontend.java-1.7/src/main/java/de/jplag/java17/JavaTokenConstants.java

@@ -1,6 +1,8 @@
 package de.jplag.java17;
 
-public interface JavaTokenConstants extends de.jplag.TokenConstants {
+import de.jplag.TokenConstants;
+
+public interface JavaTokenConstants extends TokenConstants {
 	final static int FILE_END = 0;
 
 	// Used to optionally separate methods from each other

jplag.frontend.java-1.7/src/main/java/de/jplag/java17/JplagJava7Listener.java

@@ -10,9 +10,9 @@ import de.jplag.java17.grammar.Java7Parser.*;
 
 public class JplagJava7Listener implements Java7Listener, JavaTokenConstants {
 
-	private de.jplag.java17.Parser jplagParser;
+	private Parser jplagParser;
 
-	public JplagJava7Listener(de.jplag.java17.Parser jplag) {
+	public JplagJava7Listener(Parser jplag) {
 		jplagParser = jplag;
 	}
 

jplag.frontend.java-1.7/src/main/java/de/jplag/java17/Language.java

@@ -3,12 +3,13 @@ package de.jplag.java17;
 import java.io.File;
 
 import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 public class Language implements de.jplag.Language {
-	private de.jplag.java17.Parser parser;
+	private Parser parser;
 
 	public Language(ProgramI program) {
-		this.parser = new de.jplag.java17.Parser();
+		this.parser = new Parser();
 		this.parser.setProgram(program);
 	}
 
@@ -39,7 +40,7 @@ public class Language implements de.jplag.Language {
 	}
 
 	@Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -70,6 +71,6 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String type2string(int type) {
-		return de.jplag.java17.JavaToken.type2string(type);
+		return JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.7/src/main/java/de/jplag/java17/Parser.java

@@ -8,19 +8,21 @@ import java.io.IOException;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
+import de.jplag.AbstractParser;
 import de.jplag.TokenList;
 import de.jplag.java17.grammar.Java7Lexer;
 import de.jplag.java17.grammar.Java7Parser;
 import de.jplag.java17.grammar.Java7Parser.CompilationUnitContext;
 
-public class Parser extends de.jplag.AbstractParser implements JavaTokenConstants {
+public class Parser extends AbstractParser implements JavaTokenConstants {
 	private TokenList struct = new TokenList();
 	private String currentFile;
 
-	public de.jplag.TokenList parse(File dir, String files[]) {
+	public TokenList parse(File dir, String files[]) {
 		struct = new TokenList();
 		errors = 0;
 		for (int i = 0; i < files.length; i++) {
@@ -71,7 +73,7 @@ public class Parser extends de.jplag.AbstractParser implements JavaTokenConstant
 	//		struct.addToken(new JavaToken(type, (currentFile == null ? "null" : currentFile), line, start, text.length()));
 	//	}
 	
-	public void add(int type, org.antlr.v4.runtime.Token tok) {
+	public void add(int type, Token tok) {
 		struct.addToken(new JavaToken(type, (currentFile == null ? "null" : currentFile), tok.getLine(), tok.getCharPositionInLine() + 1, 
 				tok.getText().length()));
 	}

jplag.frontend.java-1.9/src/main/java/de/jplag/java19/JavaToken.java

@@ -1,6 +1,8 @@
 package de.jplag.java19;
 
-public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
+import de.jplag.Token;
+
+public class JavaToken extends Token implements JavaTokenConstants {
     private static final long serialVersionUID = -383581430479870696L;
     private int line, column, length;
 

jplag.frontend.java-1.9/src/main/java/de/jplag/java19/JavaTokenConstants.java

@@ -1,6 +1,8 @@
 package de.jplag.java19;
 
-public interface JavaTokenConstants extends de.jplag.TokenConstants {
+import de.jplag.TokenConstants;
+
+public interface JavaTokenConstants extends TokenConstants {
     final static int FILE_END = 0;
 
     // check used to mark tokens that are actually generated by the adapter

jplag.frontend.java-1.9/src/main/java/de/jplag/java19/Parser.java

@@ -2,11 +2,14 @@ package de.jplag.java19;
 
 import java.io.File;
 
-public class Parser extends de.jplag.AbstractParser {
-    private de.jplag.TokenList tokenList;
+import de.jplag.AbstractParser;
+import de.jplag.TokenList;
 
-    public de.jplag.TokenList parse(File dir, String files[]) {
-        tokenList = new de.jplag.TokenList();
+public class Parser extends AbstractParser {
+    private TokenList tokenList;
+
+    public TokenList parse(File dir, String files[]) {
+        tokenList = new TokenList();
         errors = 0;
         File pathedFiles[] = new File[files.length];
         for (int i = 0; i < files.length; i++) {

jplag.frontend.python-3/src/main/java/de/jplag/python3/JplagPython3Listener.java

@@ -9,7 +9,7 @@ import de.jplag.python3.grammar.Python3Parser;
 
 public class JplagPython3Listener implements Python3Listener, Python3TokenConstants {
 
-    private de.jplag.python3.Parser jplagParser;
+    private Parser jplagParser;
 
     public JplagPython3Listener(de.jplag.python3.Parser jplag) {
         jplagParser = jplag;

jplag.frontend.python-3/src/main/java/de/jplag/python3/Language.java

@@ -3,13 +3,14 @@ package de.jplag.python3;
 import java.io.File;
 
 import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 public class Language implements de.jplag.Language {
 
-    private de.jplag.python3.Parser parser;
+    private Parser parser;
 
     public Language(ProgramI program) {
-        this.parser = new de.jplag.python3.Parser();
+        this.parser = new Parser();
         this.parser.setProgram(program);
     }
 
@@ -40,7 +41,7 @@ public class Language implements de.jplag.Language {
     }
 
     @Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
         return this.parser.parse(dir, files);
     }
 
@@ -71,6 +72,6 @@ public class Language implements de.jplag.Language {
 
     @Override
     public String type2string(int type) {
-        return de.jplag.python3.Python3Token.type2string(type);
+        return Python3Token.type2string(type);
     }
 }

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

@@ -8,20 +8,22 @@ import java.io.IOException;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
+import de.jplag.AbstractParser;
 import de.jplag.TokenList;
 import de.jplag.python3.grammar.Python3Lexer;
 import de.jplag.python3.grammar.Python3Parser;
 import de.jplag.python3.grammar.Python3Parser.File_inputContext;
 
-public class Parser extends de.jplag.AbstractParser implements Python3TokenConstants {
+public class Parser extends AbstractParser implements Python3TokenConstants {
 
     private TokenList struct = new TokenList();
     private String currentFile;
 
-    public de.jplag.TokenList parse(File dir, String files[]) {
+    public TokenList parse(File dir, String files[]) {
         struct = new TokenList();
         errors = 0;
         for (int i = 0; i < files.length; i++) {
@@ -69,12 +71,12 @@ public class Parser extends de.jplag.AbstractParser implements Python3TokenConst
         return true;
     }
 
-    public void add(int type, org.antlr.v4.runtime.Token tok) {
+    public void add(int type, Token tok) {
         struct.addToken(new Python3Token(type, (currentFile == null ? "null" : currentFile), tok.getLine(), tok.getCharPositionInLine() + 1,
                 tok.getText().length()));
     }
 
-    public void addEnd(int type, org.antlr.v4.runtime.Token tok) {
+    public void addEnd(int type, Token tok) {
         struct.addToken(new Python3Token(type, (currentFile == null ? "null" : currentFile), tok.getLine(), struct.getToken(struct.size()-1).getColumn() + 1,0));
     }
 }

jplag.frontend.python-3/src/main/java/de/jplag/python3/Python3Token.java

@@ -1,6 +1,8 @@
 package de.jplag.python3;
 
-public class Python3Token extends de.jplag.Token implements Python3TokenConstants {
+import de.jplag.Token;
+
+public class Python3Token extends Token implements Python3TokenConstants {
 
     private static final long serialVersionUID = 1485877548175917943L;
     

jplag.frontend.python-3/src/main/java/de/jplag/python3/Python3TokenConstants.java

@@ -1,6 +1,8 @@
 package de.jplag.python3;
 
-public interface Python3TokenConstants extends de.jplag.TokenConstants {
+import de.jplag.TokenConstants;
+
+public interface Python3TokenConstants extends TokenConstants {
 
     final static int FILE_END = 0;
     final static int SEPARATOR_TOKEN = 1;

jplag.frontend.scheme/src/main/java/de/jplag/scheme/Language.java

@@ -3,6 +3,7 @@ package de.jplag.scheme;
 import java.io.File;
 
 import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 public class Language implements de.jplag.Language {
 
@@ -56,7 +57,7 @@ public class Language implements de.jplag.Language {
 	}
 
 	@Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
@@ -72,6 +73,6 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String type2string(int type) {
-		return de.jplag.scheme.SchemeToken.type2string(type);
+		return SchemeToken.type2string(type);
 	}
 }

jplag.frontend.scheme/src/main/java/de/jplag/scheme/Parser.java

@@ -2,13 +2,16 @@ package de.jplag.scheme;
 
 import java.io.File;
 
-public class Parser extends de.jplag.AbstractParser implements SchemeTokenConstants {
+import de.jplag.AbstractParser;
+import de.jplag.TokenList;
+
+public class Parser extends AbstractParser implements SchemeTokenConstants {
 	private String actFile;
 
-	private de.jplag.TokenList struct;
+	private TokenList struct;
 
-	public de.jplag.TokenList parse(File dir, String files[]) {
-		struct = new de.jplag.TokenList();
+	public TokenList parse(File dir, String files[]) {
+		struct = new TokenList();
 		errors = 0;
 		SchemeParser parser = null;// no worry it will be reinitialized
 		// in method parseFile(...)

jplag.frontend.scheme/src/main/java/de/jplag/scheme/SchemeTokenConstants.java

@@ -1,6 +1,8 @@
 package de.jplag.scheme;
 
-public interface SchemeTokenConstants extends de.jplag.TokenConstants {
+import de.jplag.TokenConstants;
+
+public interface SchemeTokenConstants extends TokenConstants {
   final static int FILE_END = 0;
 
   // Used to optionally separate methods from each other

jplag.frontend.text/src/main/java/de/jplag/text/Language.java

@@ -4,6 +4,7 @@ package de.jplag.text;
 import java.io.File;
 
 import de.jplag.ProgramI;
+import de.jplag.TokenList;
 
 /**
  * @Changed by Emeric Kwemou 29.01.2005
@@ -13,7 +14,7 @@ public class Language implements de.jplag.Language {
 
 	private ProgramI program;
 
-	private de.jplag.text.Parser parser = new de.jplag.text.Parser();
+	private Parser parser = new Parser();
 
 	public Language(ProgramI program) {
 		this.program = program;
@@ -47,7 +48,7 @@ public class Language implements de.jplag.Language {
 	}
 
 	@Override
-    public de.jplag.TokenList parse(File dir, String[] files) {
+    public TokenList parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 

jplag.frontend.text/src/main/java/de/jplag/text/Parser.java

@@ -7,15 +7,18 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.util.HashSet;
 
+import antlr.Token;
+import de.jplag.AbstractParser;
 import de.jplag.InputState;
 import de.jplag.ParserToken;
+import de.jplag.TokenConstants;
 import de.jplag.TokenList;
 
 /**
  * @Changed by Emeric Kwemou 29.01.2005
  *  
  */
-public class Parser extends de.jplag.AbstractParser implements de.jplag.TokenConstants {
+public class Parser extends AbstractParser implements TokenConstants {
 
 	protected TokenStructure tokenStructure = new TokenStructure();
 
@@ -47,7 +50,7 @@ public class Parser extends de.jplag.AbstractParser implements de.jplag.TokenCon
 		}
 	}
 
-	public de.jplag.TokenList parse(File dir, String files[]) {
+	public TokenList parse(File dir, String files[]) {
 		struct = new TokenList();
 		errors = 0;
 		for (int i = 0; i < files.length; i++) {
@@ -93,7 +96,7 @@ public class Parser extends de.jplag.AbstractParser implements de.jplag.TokenCon
 		return true;
 	}
 
-	public void add(antlr.Token tok) {
+	public void add(Token tok) {
 		ParserToken ptok = (ParserToken) tok;
 		if (filter != null && filter.contains(tok.getText().toLowerCase()))
 			return;

jplag.frontend.text/src/main/java/de/jplag/text/TextToken.java

@@ -1,6 +1,8 @@
 package de.jplag.text;
 
-public class TextToken extends de.jplag.Token {
+import de.jplag.Token;
+
+public class TextToken extends Token {
 	private static final long serialVersionUID = 4301179216570538972L;
 
 	private static int getSerial(String text, Parser parser) {