Add missing annotations, remove unnecessary casts, and resolve fully qualified types.

jplag.frontend-utils/src/main/java/jplag/InputState.java

@@ -31,7 +31,8 @@ public class InputState extends LexerSharedInputState {
     line = 1;
   }
   
-  public int getLine() { return line; }
+  @Override
+public int getLine() { return line; }
 }
 
 

jplag.frontend-utils/src/main/java/jplag/NewlineStream.java

@@ -16,7 +16,8 @@ public class NewlineStream extends InputStream {
     this.stream = stream;
   }
 
-  public int read() throws IOException {
+  @Override
+public int read() throws IOException {
     int result;
     switch (endOfFile) {
     case 0:

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

@@ -29,21 +29,28 @@ public class ParserToken extends antlr.Token {
     super(type, text); setText(text);
   }
 
-  public void setLine(int line) { _line = line;}
-  public void setColumn(int column) { _column = column; }
+  @Override
+public void setLine(int line) { _line = line;}
+  @Override
+public void setColumn(int column) { _column = column; }
   public void setID(int id) { _id = id; }
-  public void setText(String text) {
+  @Override
+public void setText(String text) {
     _text = (text!=null ? text.intern() : null);
   }
 
-  public int getColumn() { return _column; }
-  public int getLine() { return _line; }
-  public String getText() { return _text; }
+  @Override
+public int getColumn() { return _column; }
+  @Override
+public int getLine() { return _line; }
+  @Override
+public String getText() { return _text; }
   public int getID() { return _id; }
 
   public int getLength() { return _text.length(); }
 
-  public String toString()
+  @Override
+public String toString()
   {
     return "{\"" + getText() + "\", <" + getType() + ">, " +
       getLine() + " " + getColumn() + "}";

jplag.frontend-utils/src/main/java/jplag/StrippedProgram.java

@@ -5,11 +5,13 @@ package jplag;
  * front end development only.
  */
 public class StrippedProgram implements ProgramI {
-	public void addError(String errorMsg) {
+	@Override
+    public void addError(String errorMsg) {
 		System.err.println(errorMsg);
 	}
 
-	public void print(String normalMsg, String longMsg) {
+	@Override
+    public void print(String normalMsg, String longMsg) {
 		if (longMsg != null) {
 			System.out.println(longMsg);
 		} else if (normalMsg != null) {

jplag.frontend-utils/src/main/java/jplag/Structure.java

@@ -56,7 +56,8 @@ public class Structure implements TokenConstants {
 			files++;
 	}
 
-	public final String toString() {
+	@Override
+    public final String toString() {
 		StringBuffer buf = new StringBuffer();
 
 		try {

jplag.frontend-utils/src/main/java/jplag/Token.java

@@ -40,7 +40,8 @@ abstract public class Token implements TokenConstants, Serializable {
 		return "<abstract>";
 	}
 	
-	public String toString() {
+	@Override
+    public String toString() {
 		return type2string(type);
 	}
 	

jplag.frontend-utils/src/main/java/jplag/UnicodeReader.java

@@ -104,11 +104,13 @@ public class UnicodeReader extends Reader {
         }
     }
 
+    @Override
     public void close() throws IOException {
         init();
         internalIn2.close();
     }
 
+    @Override
     public int read(char[] cbuf, int off, int len) throws IOException {
         init();
         return internalIn2.read(cbuf, off, len);

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

@@ -14,15 +14,19 @@ public class CharToken extends jplag.Token {
 		this(type, file, -1, parser);
 	}
 
-	public int getLine() {
+	@Override
+    public int getLine() {
 		return index; // so that the result-index is sorted correctly
 	}
 
-	public int getColumn() { return 0; }
+	@Override
+    public int getColumn() { return 0; }
 
-	public int getLength() { return 0; }
+	@Override
+    public int getLength() { return 0; }
 
-	public int getIndex() { return index; }
+	@Override
+    public int getIndex() { return index; }
 
 	public static String type2string(int type, Parser parser) {
 		return "" + parser.reverseMapping(type);

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

@@ -3,6 +3,7 @@ package jplag.chars;
 import java.io.File;
 
 import jplag.ProgramI;
+import jplag.Token;
 
 /*
  * read in text files as characters
@@ -17,7 +18,8 @@ public class Language implements jplag.Language {
 		this.parser.setProgram(this.program);
 	}
 
-	public String[] suffixes() {
+	@Override
+    public String[] suffixes() {
 		String[] res = { ".TXT", ".txt", ".ASC", ".asc", ".TEX", ".tex" };
 		return res;
 	}
@@ -27,47 +29,58 @@ public class Language implements jplag.Language {
 	 * 
 	 * @see jplag.Language#errorsCount()
 	 */
-	public int errorsCount() {
+	@Override
+    public int errorsCount() {
 		return this.parser.errorsCount();
 	}
 
-	public String name() {
+	@Override
+    public String name() {
 		return "Character Parser";
 	}
 
-	public String getShortName() {
+	@Override
+    public String getShortName() {
 		return "char";
 	}
 
-	public int min_token_match() {
+	@Override
+    public int min_token_match() {
 		return 10;
 	}
 
-	public jplag.Structure parse(File dir, String[] files) {
+	@Override
+    public jplag.Structure parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
-	public boolean errors() {
+	@Override
+    public boolean errors() {
 		return this.parser.getErrors();
 	}
 
-	public boolean supportsColumns() {
+	@Override
+    public boolean supportsColumns() {
 		return false;
 	}
 
-	public boolean isPreformatted() {
+	@Override
+    public boolean isPreformatted() {
 		return false;
 	}
 
-	public boolean usesIndex() {
+	@Override
+    public boolean usesIndex() {
 		return true;
 	}
 
-	public int noOfTokens() {
+	@Override
+    public int noOfTokens() {
 		return jplag.chars.CharToken.numberOfTokens();
 	}
 
-	public String type2string(int type) {
-		return jplag.chars.CharToken.type2string(type);
+	@Override
+    public String type2string(int type) {
+		return Token.type2string(type);
 	}
 }

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

@@ -8,11 +8,15 @@ public class CPPToken extends jplag.Token implements CPPTokenConstants {
 		super(type,file,zeile);
 	}
 
-	public int getLine() { return line; }
-	public void setLine(int line) { this.line = line; }
+	@Override
+    public int getLine() { return line; }
+	@Override
+    public void setLine(int line) { this.line = line; }
 
-	public int getColumn() {return 0;}
-	public int getLength() {return 0;}
+	@Override
+    public int getColumn() {return 0;}
+	@Override
+    public int getLength() {return 0;}
 
 	public static String type2string(int type) {
 		switch (type) {

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

@@ -16,53 +16,65 @@ public class Language implements jplag.Language {
 
 	}
 
-	public int errorsCount() {
+	@Override
+    public int errorsCount() {
 		return this.scanner.errorsCount();
 	}
 
-	public String[] suffixes() {
+	@Override
+    public String[] suffixes() {
 		String[] res = { ".cpp", ".CPP", ".cxx", ".CXX", ".c++", ".C++", ".c", ".C", ".cc", ".CC", ".h", ".H",
 				".hpp", ".HPP", ".hh", ".HH" };
 		return res;
 	}
 
-	public String name() {
+	@Override
+    public String name() {
 		return "C/C++ Scanner [basic markup]";
 	}
 
-	public String getShortName() {
+	@Override
+    public String getShortName() {
 		return "cpp";
 	}
 
-	public int min_token_match() {
+	@Override
+    public int min_token_match() {
 		return 12;
 	}
 
-	public boolean supportsColumns() {
+	@Override
+    public boolean supportsColumns() {
 		return false;
 	}
 
-	public boolean isPreformatted() {
+	@Override
+    public boolean isPreformatted() {
 		return true;
 	}
 
-	public boolean usesIndex() {
+	@Override
+    public boolean usesIndex() {
 		return false;
 	}
 
-	public jplag.Structure parse(File dir, String[] files) {
+	@Override
+    public jplag.Structure parse(File dir, String[] files) {
 		return this.scanner.scan(dir, files);
 	}
 
-	public boolean errors() {
+	@Override
+    public boolean errors() {
 		return this.scanner.getErrors();
 	}
 
-	public int noOfTokens() {
+	@Override
+    public int noOfTokens() {
 		return jplag.cpp.CPPToken.numberOfTokens();
 	}
 
-	public String type2string(int type) {
+	@Override
+    public String type2string(int type) {
 		return jplag.cpp.CPPToken.type2string(type);
 	}
 }

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

@@ -9,12 +9,18 @@ public class CSharpToken extends jplag.Token implements CSharpTokenConstants {
     super(type, file, line, column, length);
  }
 
-  public int getLine() { return line; }
-  public int getColumn() { return column; }
-  public int getLength() { return length; }
-  public void setLine(int line) { this.line = line; }
-  public void setColumn(int column) { this.column = column; }
-  public void setLength(int length) { this.length = length; }
+  @Override
+public int getLine() { return line; }
+  @Override
+public int getColumn() { return column; }
+  @Override
+public int getLength() { return length; }
+  @Override
+public void setLine(int line) { this.line = line; }
+  @Override
+public void setColumn(int column) { this.column = column; }
+  @Override
+public void setLength(int length) { this.length = length; }
 
   public static String type2string(int type) {
     switch (type) {

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

@@ -13,52 +13,64 @@ public class Language implements jplag.Language {
 
 	}
 
-	public String[] suffixes() {
+	@Override
+    public String[] suffixes() {
 		String[] res = { ".cs", ".CS" };
 		return res;
 	}
 
-	public int errorsCount() {
+	@Override
+    public int errorsCount() {
 		return this.parser.errorsCount();
 	}
 
-	public String name() {
+	@Override
+    public String name() {
 		return "C# 1.2 Parser";
 	}
 
-	public String getShortName() {
+	@Override
+    public String getShortName() {
 		return "c#-1.2";
 	}
 
-	public int min_token_match() {
+	@Override
+    public int min_token_match() {
 		return 8;
 	}
 
-	public jplag.Structure parse(File dir, String[] files) {
+	@Override
+    public jplag.Structure parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
-	public boolean errors() {
+	@Override
+    public boolean errors() {
 		return parser.getErrors();
 	}
 
-	public boolean supportsColumns() {
+	@Override
+    public boolean supportsColumns() {
 		return true;
 	}
 
-	public boolean isPreformatted() {
+	@Override
+    public boolean isPreformatted() {
 		return true;
 	}
 
-	public boolean usesIndex() {
+	@Override
+    public boolean usesIndex() {
 		return false;
 	}
 
-	public int noOfTokens() {
+	@Override
+    public int noOfTokens() {
 		return jplag.csharp.CSharpToken.numberOfTokens();
 	}
 
-	public String type2string(int type) {
+	@Override
+    public String type2string(int type) {
 		return jplag.csharp.CSharpToken.type2string(type);
 	}
 }

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

@@ -8,19 +8,23 @@ public class JavaToken extends jplag.Token implements JavaTokenConstants {
 		super(type, file, zeile);
 	}
 
-	public int getLine() {
+	@Override
+    public int getLine() {
 		return line;
 	}
 
-	public void setLine(int line) {
+	@Override
+    public void setLine(int line) {
 		this.line = line;
 	}
 
-	public int getColumn() {
+	@Override
+    public int getColumn() {
 		return 0;
 	}
 
-	public int getLength() {
+	@Override
+    public int getLength() {
 		return 0;
 	}
 

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

@@ -13,52 +13,64 @@ public class Language implements jplag.Language {
 
 	}
 
-	public int errorsCount() {
+	@Override
+    public int errorsCount() {
 		return this.parser.errorsCount();
 	}
 
-	public String[] suffixes() {
+	@Override
+    public String[] suffixes() {
 		String[] res = { ".java", ".jav", ".JAVA", ".JAV" };
 		return res;
 	}
 
-	public String name() {
+	@Override
+    public String name() {
 		return "experimental Java1.1";
 	}
 
-	public String getShortName() {
+	@Override
+    public String getShortName() {
 		return "Java1.1(exp)";
 	}
 
-	public int min_token_match() {
+	@Override
+    public int min_token_match() {
 		return 15;
 	}
 
-	public boolean supportsColumns() {
+	@Override
+    public boolean supportsColumns() {
 		return false;
 	}
 
-	public boolean isPreformatted() {
+	@Override
+    public boolean isPreformatted() {
 		return true;
 	}
 
-	public boolean usesIndex() {
+	@Override
+    public boolean usesIndex() {
 		return false;
 	}
 
-	public jplag.Structure parse(File dir, String[] files) {
+	@Override
+    public jplag.Structure parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
-	public boolean errors() {
+	@Override
+    public boolean errors() {
 		return this.parser.getErrors();
 	}
 
-	public int noOfTokens() {
+	@Override
+    public int noOfTokens() {
 		return jplag.javax.JavaToken.numberOfTokens();
 	}
 
-	public String type2string(int type) {
+	@Override
+    public String type2string(int type) {
 		return jplag.javax.JavaToken.type2string(type);
 	}
 }

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

@@ -8,27 +8,33 @@ public class JavaToken extends jplag.Token implements JavaTokenConstants {
 		super(type, file, line, column, length);
 	}
 
-	public int getLine() {
+	@Override
+    public int getLine() {
 		return line;
 	}
 
-	public int getColumn() {
+	@Override
+    public int getColumn() {
 		return column;
 	}
 
-	public int getLength() {
+	@Override
+    public int getLength() {
 		return length;
 	}
 
-	public void setLine(int line) {
+	@Override
+    public void setLine(int line) {
 		this.line = line;
 	}
 
-	public void setColumn(int column) {
+	@Override
+    public void setColumn(int column) {
 		this.column = column;
 	}
 
-	public void setLength(int length) {
+	@Override
+    public void setLength(int length) {
 		this.length = length;
 	}
 

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

@@ -12,52 +12,64 @@ public class Language implements jplag.Language {
 		this.parser.setProgram(program);
 	}
 
-	public String[] suffixes() {
+	@Override
+    public String[] suffixes() {
 		String[] res = { ".java", ".jav", ".JAVA", ".JAV" };
 		return res;
 	}
 
-	public int errorsCount() {
+	@Override
+    public int errorsCount() {
 		return this.parser.errorsCount();
 	}
 
-	public String name() {
+	@Override
+    public String name() {
 		return "Java1.2 Parser";
 	}
 
-	public String getShortName() {
+	@Override
+    public String getShortName() {
 		return "java12";
 	}
 
-	public int min_token_match() {
+	@Override
+    public int min_token_match() {
 		return 9;
 	}
 
-	public jplag.Structure parse(File dir, String[] files) {
+	@Override
+    public jplag.Structure parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
-	public boolean errors() {
+	@Override
+    public boolean errors() {
 		return this.parser.getErrors();
 	}
 
-	public boolean supportsColumns() {
+	@Override
+    public boolean supportsColumns() {
 		return true;
 	}
 
-	public boolean isPreformatted() {
+	@Override
+    public boolean isPreformatted() {
 		return true;
 	}
 
-	public boolean usesIndex() {
+	@Override
+    public boolean usesIndex() {
 		return false;
 	}
 
-	public int noOfTokens() {
+	@Override
+    public int noOfTokens() {
 		return jplag.java.JavaToken.numberOfTokens();
 	}
 
-	public String type2string(int type) {
+	@Override
+    public String type2string(int type) {
 		return jplag.java.JavaToken.type2string(type);
 	}
 }

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

@@ -9,12 +9,18 @@ public class JavaToken extends jplag.Token implements JavaTokenConstants {
 		super(type, file, line, column, length);
 	}
 
-	public int getLine() { return line; }
-	public int getColumn() { return column; }
-	public int getLength() { return length; }
-	public void setLine(int line) { this.line = line; }
-	public void setColumn(int column) { this.column = column; }
-	public void setLength(int length) { this.length = length; }
+	@Override
+    public int getLine() { return line; }
+	@Override
+    public int getColumn() { return column; }
+	@Override
+    public int getLength() { return length; }
+	@Override
+    public void setLine(int line) { this.line = line; }
+	@Override
+    public void setColumn(int column) { this.column = column; }
+	@Override
+    public void setLength(int length) { this.length = length; }
 
   public static String type2string(int type) {
     switch (type) {

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

@@ -12,52 +12,64 @@ public class Language implements jplag.Language {
 		this.parser.setProgram(program);
 	}
 
-	public int errorsCount() {
+	@Override
+    public int errorsCount() {
 		return this.parser.errorsCount();
 	}
 
-	public String[] suffixes() {
+	@Override
+    public String[] suffixes() {
 		String[] res = { ".java", ".jav", ".JAVA", ".JAV" };
 		return res;
 	}
 
-	public String name() {
+	@Override
+    public String name() {
 		return "Java1.5 Parser";
 	}
 
-	public String getShortName() {
+	@Override
+    public String getShortName() {
 		return "java15";
 	}
 
-	public int min_token_match() {
+	@Override
+    public int min_token_match() {
 		return 8;
 	}
 
-	public jplag.Structure parse(File dir, String[] files) {
+	@Override
+    public jplag.Structure parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
-	public boolean errors() {
+	@Override
+    public boolean errors() {
 		return this.parser.getErrors();
 	}
 
-	public boolean supportsColumns() {
+	@Override
+    public boolean supportsColumns() {
 		return true;
 	}
 
-	public boolean isPreformatted() {
+	@Override
+    public boolean isPreformatted() {
 		return true;
 	}
 
-	public boolean usesIndex() {
+	@Override
+    public boolean usesIndex() {
 		return false;
 	}
 
-	public int noOfTokens() {
+	@Override
+    public int noOfTokens() {
 		return jplag.java15.JavaToken.numberOfTokens();
 	}
 
-	public String type2string(int type) {
+	@Override
+    public String type2string(int type) {
 		return jplag.java15.JavaToken.type2string(type);
 	}
 }

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

@@ -17,52 +17,64 @@ public class LanguageWithDelimitedMethods implements jplag.Language {
 		this.parser.setProgram(program);
 	}
 
-	public int errorsCount() {
+	@Override
+    public int errorsCount() {
 		return this.parser.errorsCount();
 	}
 
-	public String[] suffixes() {
+	@Override
+    public String[] suffixes() {
 		String[] res = { ".java", ".jav", ".JAVA", ".JAV" };
 		return res;
 	}
 
-	public String name() {
+	@Override
+    public String name() {
 		return "Java1.5 Parser with delimited methods";
 	}
 
-	public String getShortName() {
+	@Override
+    public String getShortName() {
 		return "java15dm";
 	}
 
-	public int min_token_match() {
+	@Override
+    public int min_token_match() {
 		return 8;
 	}
 
-	public jplag.Structure parse(File dir, String[] files) {
+	@Override
+    public jplag.Structure parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
-	public boolean errors() {
+	@Override
+    public boolean errors() {
 		return this.parser.getErrors();
 	}
 
-	public boolean supportsColumns() {
+	@Override
+    public boolean supportsColumns() {
 		return true;
 	}
 
-	public boolean isPreformatted() {
+	@Override
+    public boolean isPreformatted() {
 		return true;
 	}
 
-	public boolean usesIndex() {
+	@Override
+    public boolean usesIndex() {
 		return false;
 	}
 
-	public int noOfTokens() {
+	@Override
+    public int noOfTokens() {
 		return jplag.java15.JavaToken.numberOfTokens();
 	}
 
-	public String type2string(int type) {
+	@Override
+    public String type2string(int type) {
 		return jplag.java15.JavaToken.type2string(type);
 	}
 }

jplag.frontend.java-1.5/src/main/java/jplag/java15/grammar/JavaTabModCharStream.java

@@ -167,7 +167,8 @@ public class JavaTabModCharStream implements CharStream
      return nextCharBuf[nextCharInd];
   }
 
-  public char BeginToken() throws java.io.IOException
+  @Override
+public char BeginToken() throws java.io.IOException
   {     
      if (inBuf > 0)
      {
@@ -242,7 +243,8 @@ public class JavaTabModCharStream implements CharStream
      bufcolumn[bufpos] = column;
   }
 
-  public char readChar() throws java.io.IOException
+  @Override
+public char readChar() throws java.io.IOException
   {
      if (inBuf > 0)
      {
@@ -339,7 +341,9 @@ public class JavaTabModCharStream implements CharStream
    * @see #getEndColumn
    */
 
-  public int getColumn() {
+  @Deprecated
+@Override
+public int getColumn() {
      return bufcolumn[bufpos];
   }
 
@@ -348,27 +352,34 @@ public class JavaTabModCharStream implements CharStream
    * @see #getEndLine
    */
 
-  public int getLine() {
+  @Deprecated
+@Override
+public int getLine() {
      return bufline[bufpos];
   }
 
-  public int getEndColumn() {
+  @Override
+public int getEndColumn() {
      return bufcolumn[bufpos];
   }
 
-  public int getEndLine() {
+  @Override
+public int getEndLine() {
      return bufline[bufpos];
   }
 
-  public int getBeginColumn() {
+  @Override
+public int getBeginColumn() {
      return bufcolumn[tokenBegin];
   }
 
-  public int getBeginLine() {
+  @Override
+public int getBeginLine() {
      return bufline[tokenBegin];
   }
 
-  public void backup(int amount) {
+  @Override
+public void backup(int amount) {
 
     inBuf += amount;
     if ((bufpos -= amount) < 0)
@@ -461,7 +472,8 @@ public class JavaTabModCharStream implements CharStream
      ReInit(dstream, 1, 1, 4096);
   }
 
-  public String GetImage()
+  @Override
+public String GetImage()
   {
      if (bufpos >= tokenBegin)
         return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
@@ -470,7 +482,8 @@ public class JavaTabModCharStream implements CharStream
                               new String(buffer, 0, bufpos + 1);
   }
 
-  public char[] GetSuffix(int len)
+  @Override
+public char[] GetSuffix(int len)
   {
      char[] ret = new char[len];
 
@@ -486,7 +499,8 @@ public class JavaTabModCharStream implements CharStream
      return ret;
   }
 
-  public void Done()
+  @Override
+public void Done()
   {
      nextCharBuf = null;
      buffer = null;

jplag.frontend.java-1.5/src/main/java/jplag/java15/grammar/Token.java

@@ -53,7 +53,8 @@ public class Token {
   /**
    * Returns the image.
    */
-  public String toString()
+  @Override
+public String toString()
   {
      return image;
   }

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

@@ -8,27 +8,33 @@ public class JavaToken extends jplag.Token implements JavaTokenConstants {
 		super(type, file, line, column, length);
 	}
 
-	public int getLine() {
+	@Override
+    public int getLine() {
 		return line;
 	}
 
-	public int getColumn() {
+	@Override
+    public int getColumn() {
 		return column;
 	}
 
-	public int getLength() {
+	@Override
+    public int getLength() {
 		return length;
 	}
 
-	public void setLine(int line) {
+	@Override
+    public void setLine(int line) {
 		this.line = line;
 	}
 
-	public void setColumn(int column) {
+	@Override
+    public void setColumn(int column) {
 		this.column = column;
 	}
 
-	public void setLength(int length) {
+	@Override
+    public void setLength(int length) {
 		this.length = length;
 	}
 

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

@@ -12,52 +12,64 @@ public class Language implements jplag.Language {
 		this.parser.setProgram(program);
 	}
 
-	public String[] suffixes() {
+	@Override
+    public String[] suffixes() {
 		String[] res = { ".java", ".jav", ".JAVA", ".JAV" };
 		return res;
 	}
 
-	public int errorsCount() {
+	@Override
+    public int errorsCount() {
 		return this.parser.errorsCount();
 	}
 
-	public String name() {
+	@Override
+    public String name() {
 		return "Java1.7 Parser";
 	}
 
-	public String getShortName() {
+	@Override
+    public String getShortName() {
 		return "java17";
 	}
 
-	public int min_token_match() {
+	@Override
+    public int min_token_match() {
 		return 9;
 	}
 
-	public jplag.Structure parse(File dir, String[] files) {
+	@Override
+    public jplag.Structure parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
-	public boolean errors() {
+	@Override
+    public boolean errors() {
 		return this.parser.getErrors();
 	}
 
-	public boolean supportsColumns() {
+	@Override
+    public boolean supportsColumns() {
 		return true;
 	}
 
-	public boolean isPreformatted() {
+	@Override
+    public boolean isPreformatted() {
 		return true;
 	}
 
-	public boolean usesIndex() {
+	@Override
+    public boolean usesIndex() {
 		return false;
 	}
 
-	public int noOfTokens() {
+	@Override
+    public int noOfTokens() {
 		return jplag.java17.JavaToken.numberOfTokens();
 	}
 
-	public String type2string(int type) {
+	@Override
+    public String type2string(int type) {
 		return jplag.java17.JavaToken.type2string(type);
 	}
 }

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

@@ -13,51 +13,63 @@ public class Language implements jplag.Language {
         this.parser.setProgram(program);
     }
 
+    @Override
     public String[] suffixes() {
         String[] res = {".py"};
         return res;
     }
 
+    @Override
     public int errorsCount() {
         return this.parser.errorsCount();
     }
 
+    @Override
     public String name() {
         return "Python3 Parser";
     }
 
+    @Override
     public String getShortName() {
         return "python3";
     }
 
+    @Override
     public int min_token_match() {
         return 12;
     }
 
+    @Override
     public jplag.Structure parse(File dir, String[] files) {
         return this.parser.parse(dir, files);
     }
 
+    @Override
     public boolean errors() {
         return this.parser.getErrors();
     }
 
+    @Override
     public boolean supportsColumns() {
         return true;
     }
 
+    @Override
     public boolean isPreformatted() {
         return true;
     }
 
+    @Override
     public boolean usesIndex() {
         return false;
     }
 
+    @Override
     public int noOfTokens() {
         return jplag.python3.Python3Token.numberOfTokens();
     }
 
+    @Override
     public String type2string(int type) {
         return jplag.python3.Python3Token.type2string(type);
     }

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

@@ -10,26 +10,32 @@ public class Python3Token extends jplag.Token implements Python3TokenConstants {
         super(type, file, line, column, length);
     }
 
+    @Override
     public int getLine() {
         return line;
     }
 
+    @Override
     public int getColumn() {
         return column;
     }
 
+    @Override
     public int getLength() {
         return length;
     }
 
+    @Override
     public void setLine(int line) {
         this.line = line;
     }
 
+    @Override
     public void setColumn(int column) {
         this.column = column;
     }
 
+    @Override
     public void setLength(int length) {
         this.length = length;
     }

jplag.frontend.scheme/src/main/java/jplag/scheme/InsertStream.java

@@ -19,14 +19,16 @@ public class InsertStream extends FileInputStream {
 
   boolean end_of_file = false;
 
-  public int read() throws IOException {
+  @Override
+public int read() throws IOException {
     int result = super.read();
     if (result != -1 || end_of_file) return result;
     end_of_file = true;
     return Character.LINE_SEPARATOR;
   }
 
-  public int read(byte[] b) throws IOException {
+  @Override
+public int read(byte[] b) throws IOException {
     int result = super.read(b);
     if (result != -1 || end_of_file) return result;
     end_of_file = true;
@@ -37,7 +39,8 @@ public class InsertStream extends FileInputStream {
     return -1;
   }
 
-  public int read(byte[] b, int off, int len) throws IOException {
+  @Override
+public int read(byte[] b, int off, int len) throws IOException {
     int result = super.read(b,off,len);
     if (result != -1 || end_of_file) return result;
     end_of_file = true;

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

@@ -12,55 +12,67 @@ public class Language implements jplag.Language {
 
 	}
 
-	public int errorsCount() {
+	@Override
+    public int errorsCount() {
 		return this.parser.errorsCount();
 	}
 
 	private jplag.scheme.Parser parser;//noch nicht instanziert? siehe
 									   // Konstruktor
 
-	public String[] suffixes() {
+	@Override
+    public String[] suffixes() {
 		String[] res = { ".scm", ".SCM", ".ss", ".SS" };
 		return res;
 	}
 
-	public String name() {
+	@Override
+    public String name() {
 		return "SchemeR4RS Parser [basic markup]";
 	}
 
-	public String getShortName() {
+	@Override
+    public String getShortName() {
 		return "scheme";
 	}
 
-	public int min_token_match() {
+	@Override
+    public int min_token_match() {
 		return 13;
 	}
 
-	public boolean supportsColumns() {
+	@Override
+    public boolean supportsColumns() {
 		return false;
 	}
 
-	public boolean isPreformatted() {
+	@Override
+    public boolean isPreformatted() {
 		return true;
 	}
 
-	public boolean usesIndex() {
+	@Override
+    public boolean usesIndex() {
 		return false;
 	}
 
-	public jplag.Structure parse(File dir, String[] files) {
+	@Override
+    public jplag.Structure parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
-	public boolean errors() {
+	@Override
+    public boolean errors() {
 		return this.parser.getErrors();
 	}
 
-	public int noOfTokens() {
+	@Override
+    public int noOfTokens() {
 		return jplag.scheme.SchemeToken.numberOfTokens();
 	}
 
-	public String type2string(int type) {
+	@Override
+    public String type2string(int type) {
 		return jplag.scheme.SchemeToken.type2string(type);
 	}
 }

jplag.frontend.scheme/src/main/java/jplag/scheme/SchemeToken.java

@@ -10,11 +10,15 @@ public class SchemeToken extends jplag.Token implements SchemeTokenConstants {
     super(type,file,zeile);
   }
 
-  public int getLine() { return line; }
-  public void setLine(int line) { this.line = line; }
+  @Override
+public int getLine() { return line; }
+  @Override
+public void setLine(int line) { this.line = line; }
 
-  public int getColumn() {return 0;}
-  public int getLength() {return 0;}
+  @Override
+public int getColumn() {return 0;}
+  @Override
+public int getLength() {return 0;}
 
   public static String type2string(int type) {
     switch (type) {

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

@@ -20,53 +20,65 @@ public class Language implements jplag.Language {
 		this.parser.setProgram(this.program);
 	}
 
-	public int errorsCount() {
+	@Override
+    public int errorsCount() {
 		return this.parser.errorsCount();
 	}
 
-	public String[] suffixes() {
+	@Override
+    public String[] suffixes() {
 		String[] res = { ".TXT", ".txt", ".ASC", ".asc", ".TEX", ".tex" };
 		return res;
 	}
 
-	public String name() {
+	@Override
+    public String name() {
 		return "Text Parser";
 	}
 
-	public String getShortName() {
+	@Override
+    public String getShortName() {
 		return "text";
 	}
 
-	public int min_token_match() {
+	@Override
+    public int min_token_match() {
 		return 5;
 	}
 
-	public jplag.Structure parse(File dir, String[] files) {
+	@Override
+    public jplag.Structure parse(File dir, String[] files) {
 		return this.parser.parse(dir, files);
 	}
 
-	public boolean errors() {
+	@Override
+    public boolean errors() {
 		return this.parser.getErrors();
 	}
 
-	public boolean supportsColumns() {
+	@Override
+    public boolean supportsColumns() {
 		return true;
 	}
 
-	public boolean isPreformatted() {
+	@Override
+    public boolean isPreformatted() {
 		return false;
 	}
 
-	public boolean usesIndex() {
+	@Override
+    public boolean usesIndex() {
 		return false;
 	}
 
-	public int noOfTokens() {
+	@Override
+    public int noOfTokens() {
         return parser.tokenStructure.serial;
 //		return jplag.text.TextToken.numberOfTokens();   // always returns 1 ....
 	}
 
-	public String type2string(int type) {
-		return jplag.text.TextToken.type2string(type);
+	@Override
+    public String type2string(int type) {
+		return TextToken.type2string(type);
 	}
 }

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

@@ -5,7 +5,7 @@ public class TextToken extends jplag.Token {
 
 	public static int getSerial(String text, Parser parser) {
         text = text.toLowerCase();
-        Integer obj = (Integer) parser.tokenStructure.table.get(text);
+        Integer obj = parser.tokenStructure.table.get(text);
         if(obj == null) {
             obj = Integer.valueOf(parser.tokenStructure.serial);
             if(parser.tokenStructure.serial == Integer.MAX_VALUE)
@@ -43,26 +43,32 @@ public class TextToken extends jplag.Token {
         this.text = text.toLowerCase();
     }
 
+    @Override
     public int getLine() {
         return line;
     }
 
+    @Override
     public int getColumn() {
         return column;
     }
 
+    @Override
     public int getLength() {
         return length;
     }
 
+    @Override
     public void setLine(int line) {
         this.line = line;
     }
 
+    @Override
     public void setColumn(int column) {
         this.column = column;
     }
 
+    @Override
     public void setLength(int length) {
         this.length = length;
     }