Rename abstract parser to avoid shadowing by the concrete parsers.

jplag.frontend-utils/src/main/java/de/jplag/Parser.java → jplag.frontend-utils/src/main/java/de/jplag/AbstractParser.java

@@ -4,13 +4,13 @@ package de.jplag;
  * @author Emeric Kwemou
  * @date 22.01.2005
  */
-public abstract class Parser { // TODO TS: We should rename this class, as all concrete parsers shadow its name.
+public abstract class AbstractParser { // TODO TS: We should rename this class, as all concrete parsers shadow its name.
     protected ProgramI program;
     protected int errors = 0;
     private int errorsSum = 0;
 
     public boolean getErrors() {
-        return (errors != 0);
+        return errors != 0;
     }
 
     public int errorsCount() {

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

@@ -36,7 +36,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String name() {
-		return "Character Parser";
+		return "Character AbstractParser";
 	}
 
 	@Override

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

@@ -6,7 +6,7 @@ import java.nio.charset.StandardCharsets;
 
 import de.jplag.TokenList;
 
-public class Parser extends de.jplag.Parser implements de.jplag.TokenConstants {
+public class Parser extends de.jplag.AbstractParser implements de.jplag.TokenConstants {
 
 	private TokenList struct;
 

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

@@ -2,9 +2,9 @@ package de.jplag.cpp;
 
 import java.io.File;
 
-import de.jplag.Parser;
+import de.jplag.AbstractParser;
 
-public class Scanner extends Parser implements CPPTokenConstants {
+public class Scanner extends AbstractParser implements CPPTokenConstants {
 	private String actFile;
 
 	private de.jplag.TokenList struct;

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

@@ -26,7 +26,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String name() {
-		return "C# 1.2 Parser";
+		return "C# 1.2 AbstractParser";
 	}
 
 	@Override

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

@@ -9,7 +9,7 @@ import de.jplag.UnicodeReader;
 import de.jplag.csharp.grammar.CSharpLexer;
 import de.jplag.csharp.grammar.CSharpParser;
 
-public class Parser extends de.jplag.Parser implements CSharpTokenConstants {
+public class Parser extends de.jplag.AbstractParser implements CSharpTokenConstants {
 	private TokenList struct;
 	private String currentFile;
 

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

@@ -2,7 +2,7 @@ package de.jplag.javax;
 
 import java.io.File;
 
-public class Parser extends de.jplag.Parser implements JavaTokenConstants {
+public class Parser extends de.jplag.AbstractParser implements JavaTokenConstants {
 	private String actFile;
 
 	private de.jplag.TokenList struct;

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

@@ -25,7 +25,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String name() {
-		return "Java1.2 Parser";
+		return "Java1.2 AbstractParser";
 	}
 
 	@Override

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

@@ -9,7 +9,7 @@ import de.jplag.TokenList;
 import de.jplag.java.grammar.JLexer;
 import de.jplag.java.grammar.JRecognizer;
 
-public class Parser extends de.jplag.Parser implements JavaTokenConstants {
+public class Parser extends de.jplag.AbstractParser implements JavaTokenConstants {
 	private TokenList struct;
 	private String currentFile;
 

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

@@ -25,7 +25,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String name() {
-		return "Java1.5 Parser";
+		return "Java1.5 AbstractParser";
 	}
 
 	@Override

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

@@ -5,7 +5,7 @@ import java.io.File;
 import de.jplag.java15.grammar.JavaParser;
 import de.jplag.java15.grammar.Token;
 
-public class Parser extends de.jplag.Parser implements JavaTokenConstants {
+public class Parser extends de.jplag.AbstractParser implements JavaTokenConstants {
 	private String actFile;
 	private boolean useMethodSeparators;
 

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

@@ -25,7 +25,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String name() {
-		return "Java1.7 Parser";
+		return "Java1.7 AbstractParser";
 	}
 
 	@Override

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

@@ -16,7 +16,7 @@ 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.Parser implements JavaTokenConstants {
+public class Parser extends de.jplag.AbstractParser implements JavaTokenConstants {
 	private TokenList struct = new TokenList();
 	private String currentFile;
 

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

@@ -72,11 +72,11 @@ public interface JavaTokenConstants extends de.jplag.TokenConstants {
     final static int J_TRY_WITH_RESOURCE = 60; 	// check
 
     // new in 1.9
-    final static int J_REQUIRES = 61; 	       // check
-    final static int J_PROVIDES = 62; 	       // check
-    final static int J_EXPORTS = 63; 	       // check
-    final static int J_MODULE_BEGIN = 64;     // check
-    final static int J_MODULE_END = 65; 	       // check
+    final static int J_REQUIRES = 61; 	        // check
+    final static int J_PROVIDES = 62; 	        // check
+    final static int J_EXPORTS = 63; 	        // check
+    final static int J_MODULE_BEGIN = 64;       // check
+    final static int J_MODULE_END = 65; 	    // check
 
-    final static int NUM_DIFF_TOKENS = 66;		// @formatter:on
+    final static int NUM_DIFF_TOKENS = 66;	    // @formatter:on
 }

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

@@ -2,7 +2,7 @@ package de.jplag.java19;
 
 import java.io.File;
 
-public class Parser extends de.jplag.Parser {
+public class Parser extends de.jplag.AbstractParser {
     private de.jplag.TokenList tokenList;
 
     public de.jplag.TokenList parse(File dir, String files[]) {

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

@@ -26,7 +26,7 @@ public class Language implements de.jplag.Language {
 
     @Override
     public String name() {
-        return "Python3 Parser";
+        return "Python3 AbstractParser";
     }
 
     @Override

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

@@ -16,7 +16,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 de.jplag.Parser implements Python3TokenConstants {
+public class Parser extends de.jplag.AbstractParser implements Python3TokenConstants {
 
     private TokenList struct = new TokenList();
     private String currentFile;

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

@@ -27,7 +27,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String name() {
-		return "SchemeR4RS Parser [basic markup]";
+		return "SchemeR4RS AbstractParser [basic markup]";
 	}
 
 	@Override

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

@@ -2,7 +2,7 @@ package de.jplag.scheme;
 
 import java.io.File;
 
-public class Parser extends de.jplag.Parser implements SchemeTokenConstants {
+public class Parser extends de.jplag.AbstractParser implements SchemeTokenConstants {
 	private String actFile;
 
 	private de.jplag.TokenList struct;

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

@@ -33,7 +33,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public String name() {
-		return "Text Parser";
+		return "Text AbstractParser";
 	}
 
 	@Override

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

@@ -15,7 +15,7 @@ import de.jplag.TokenList;
  * @Changed by Emeric Kwemou 29.01.2005
  *  
  */
-public class Parser extends de.jplag.Parser implements de.jplag.TokenConstants {
+public class Parser extends de.jplag.AbstractParser implements de.jplag.TokenConstants {
 
 	protected TokenStructure tokenStructure = new TokenStructure();