Remove unused and superfluous code.

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

@@ -26,15 +26,6 @@ public class ParserToken extends antlr.Token {
         super();
     }
 
-    public ParserToken(int type) {
-        super(type);
-    }
-
-    public ParserToken(int type, String text) {
-        super(type, text);
-        setText(text);
-    }
-
     @Override
     public void setLine(int line) {
         _line = line;

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

@@ -52,8 +52,4 @@ abstract public class Token implements TokenConstants, Serializable {
     public String toString() {
         return type2string(type);
     }
-
-    public static int numberOfTokens() {
-        return 1;
-    }
 }

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

@@ -27,6 +27,4 @@ public class CharToken extends de.jplag.Token {
 
 	@Override
     public int getIndex() { return index; }
-
-	public static int numberOfTokens() { return 36;	}
 }

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

@@ -76,7 +76,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return de.jplag.chars.CharToken.numberOfTokens();
+		return 36;
 	}
 
 	@Override

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

@@ -59,27 +59,6 @@ public class Parser extends de.jplag.Parser implements de.jplag.TokenConstants {
 		return true;
 	}
 
-	private char[] reversedMapping = null;
-
-	public char reverseMapping(int i) {
-		if (reversedMapping == null) {
-			int size = 0;
-			for (int j = 0; j < mapping.length; j++)
-				if (mapping[j] > size)
-					size = mapping[j];
-			reversedMapping = new char[size + 1];
-			for (int j = 0; j <= size; j++) {
-				reversedMapping[j] = 0;
-				for (int k = 0; k < mapping.length; k++)
-					if (mapping[k] == j) {
-						reversedMapping[j] = (char) k;
-						break;
-					}
-			}
-		}
-		return reversedMapping[i];
-	}
-
 	private int[] mapping = { -1, //   0 (nul)
 			-1, //   1 (soh)
 			-1, //   2 (stx)

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

@@ -88,8 +88,4 @@ public class CPPToken extends de.jplag.Token implements CPPTokenConstants {
 			default:                return "<UNBEKANNT>";
 		}
 	}
-
-	public static int numberOfTokens() { 
-		return NUM_DIFF_TOKENS;
-	}
 }

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

@@ -70,7 +70,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return de.jplag.cpp.CPPToken.numberOfTokens();
+		return CPPTokenConstants.NUM_DIFF_TOKENS;
 	}
 
 	@Override

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

@@ -81,9 +81,5 @@ public void setLength(int length) { this.length = length; }
     default:                      return "<UNKNOWN> ";
     }
   }
-  
-  public static int numberOfTokens() { 
-    return NUM_DIFF_TOKENS;
-  }
 }
 

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

@@ -66,7 +66,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return de.jplag.csharp.CSharpToken.numberOfTokens();
+		return CSharpTokenConstants.NUM_DIFF_TOKENS;
 	}
 
 	@Override

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

@@ -125,8 +125,4 @@ public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
 	    default:           return "<UNBEKANNT>";
 		}
 	}
-
-	public static int numberOfTokens() {
-		return NUM_DIFF_TOKENS;
-	}
 }

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

@@ -66,7 +66,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return de.jplag.javax.JavaToken.numberOfTokens();
+		return JavaTokenConstants.NUM_DIFF_TOKENS;
 	}
 
 	@Override

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

@@ -91,8 +91,4 @@ public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
     default:           return "<UNBEKANNT>";
     }
   }
-  
-  public static int numberOfTokens() { 
-    return NUM_DIFF_TOKENS;
-  } 
 }

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

@@ -65,7 +65,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return de.jplag.java.JavaToken.numberOfTokens();
+		return JavaTokenConstants.NUM_DIFF_TOKENS;
 	}
 
 	@Override

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

@@ -89,9 +89,5 @@ public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
     default:                return "*UNKNOWN"; // @formatter:on
     }
   }
-  
-  public static int numberOfTokens() { 
-    return NUM_DIFF_TOKENS;
-  }
 }
 

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

@@ -65,7 +65,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return de.jplag.java15.JavaToken.numberOfTokens();
+		return JavaTokenConstants.NUM_DIFF_TOKENS;
 	}
 
 	@Override

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

@@ -70,7 +70,7 @@ public class LanguageWithDelimitedMethods implements de.jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return de.jplag.java15.JavaToken.numberOfTokens();
+		return JavaTokenConstants.NUM_DIFF_TOKENS;
 	}
 
 	@Override

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

@@ -430,12 +430,6 @@ public void backup(int amount) {
     nextCharInd = bufpos = -1;
   }
 
-  public void ReInit(java.io.Reader dstream,
-                                        int startline, int startcolumn)
-  {
-     ReInit(dstream, startline, startcolumn, 4096);
-  }
-
   public void ReInit(java.io.Reader dstream)
   {
      ReInit(dstream, 1, 1, 4096);
@@ -462,15 +456,6 @@ public void backup(int amount) {
   {
      ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
   }
-  public void ReInit(java.io.InputStream dstream, int startline,
-                                                           int startcolumn)
-  {
-     ReInit(dstream, startline, startcolumn, 4096);
-  }
-  public void ReInit(java.io.InputStream dstream)
-  {
-     ReInit(dstream, 1, 1, 4096);
-  }
 
   @Override
 public String GetImage()
@@ -508,52 +493,4 @@ public void Done()
      bufcolumn = null;
   }
 
-  /**
-   * Method to adjust line and column numbers for the start of a token.
-   */
-  public void adjustBeginLineColumn(int newLine, int newCol)
-  {
-     int start = tokenBegin;
-     int len;
-
-     if (bufpos >= tokenBegin)
-     {
-        len = bufpos - tokenBegin + inBuf + 1;
-     }
-     else
-     {
-        len = bufsize - tokenBegin + bufpos + 1 + inBuf;
-     }
-
-     int i = 0, j = 0, k = 0;
-     int nextColDiff = 0, columnDiff = 0;
-
-     while (i < len &&
-            bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
-     {
-        bufline[j] = newLine;
-        nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
-        bufcolumn[j] = newCol + columnDiff;
-        columnDiff = nextColDiff;
-        i++;
-     } 
-
-     if (i < len)
-     {
-        bufline[j] = newLine++;
-        bufcolumn[j] = newCol + columnDiff;
-
-        while (i++ < len)
-        {
-           if (bufline[j = start % bufsize] != bufline[++start % bufsize])
-              bufline[j] = newLine++;
-           else
-              bufline[j] = newLine;
-        }
-     }
-
-     line = bufline[j];
-     column = bufcolumn[j];
-  }
-
 }

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

@@ -169,8 +169,4 @@ public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
 			return "*UNKNOWN" + type;
 		}
 	}
-
-	public static int numberOfTokens() {
-		return NUM_DIFF_TOKENS;
-	}
 }

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

@@ -65,7 +65,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return de.jplag.java17.JavaToken.numberOfTokens();
+		return JavaTokenConstants.NUM_DIFF_TOKENS;
 	}
 
 	@Override

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

@@ -179,8 +179,4 @@ public class JavaToken extends de.jplag.Token implements JavaTokenConstants {
             return "*UNKNOWN" + type;
         }
     }
-
-    public static int numberOfTokens() {
-        return NUM_DIFF_TOKENS;
-    }
 }

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

@@ -54,7 +54,7 @@ public class Language implements de.jplag.Language {
 
     @Override
     public int noOfTokens() {
-        return JavaToken.numberOfTokens();
+        return JavaTokenConstants.NUM_DIFF_TOKENS;
     }
 
     @Override

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

@@ -66,7 +66,7 @@ public class Language implements de.jplag.Language {
 
     @Override
     public int noOfTokens() {
-        return de.jplag.python3.Python3Token.numberOfTokens();
+        return Python3TokenConstants.NUM_DIFF_TOKENS;
     }
 
     @Override

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

@@ -112,8 +112,4 @@ public class Python3Token extends de.jplag.Token implements Python3TokenConstant
                 return "*UNKNOWN" + type;
         }
     }
-
-    public static int numberOfTokens() {
-        return NUM_DIFF_TOKENS;
-    }
 }

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

@@ -1,52 +0,0 @@
-package de.jplag.scheme;
-
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-public class InsertStream extends FileInputStream {
-  public InsertStream(File file) throws FileNotFoundException {
-    super(file);
-  }
-  public InsertStream(FileDescriptor fdObj) {
-    super(fdObj);
-  }
-  public InsertStream(String name) throws FileNotFoundException {
-    super(name);
-  }
-
-  boolean end_of_file = false;
-
-  @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;
-  }
-
-  @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;
-    if (b.length > 1) {
-      b[0] = Character.LINE_SEPARATOR;
-      return 1;
-    }
-    return -1;
-  }
-
-  @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;
-    if (len > 0) {
-      b[off] = Character.LINE_SEPARATOR;
-      return 1;
-    } else return 0;
-  }
-}

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

@@ -67,7 +67,7 @@ public class Language implements de.jplag.Language {
 
 	@Override
     public int noOfTokens() {
-		return de.jplag.scheme.SchemeToken.numberOfTokens();
+		return SchemeTokenConstants.NUM_DIFF_TOKENS;
 	}
 
 	@Override

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

@@ -69,8 +69,4 @@ public int getLength() {return 0;}
     default:                 return "<?????> ";
     }
   }
-  
-  public static int numberOfTokens() { 
-    return NUM_DIFF_TOKENS;
-  }
 }

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

@@ -3,7 +3,7 @@ package de.jplag.text;
 public class TextToken extends de.jplag.Token {
 	private static final long serialVersionUID = 4301179216570538972L;
 
-	public static int getSerial(String text, Parser parser) {
+	private static int getSerial(String text, Parser parser) {
         text = text.toLowerCase();
         Integer obj = parser.tokenStructure.table.get(text);
         if(obj == null) {
@@ -18,15 +18,7 @@ public class TextToken extends de.jplag.Token {
         }
         return obj.intValue();
     }
-
-    // throw away this method soon:
-
-    public static String type2string(int i, TokenStructure tokenStructure) {
-        if(tokenStructure.reverseMapping == null)
-            tokenStructure.createReverseMapping();
-        return tokenStructure.reverseMapping[i];
-    }
-
+	
     // ///////////////////// END OF STATIC MEMBERS
 
     private int line, column, length;
@@ -76,8 +68,4 @@ public class TextToken extends de.jplag.Token {
     public String getText() {
         return this.text;
     }
-
-    public static int numberOfTokens(TokenStructure tokenStructure) {
-        return tokenStructure.table.size();
-    }
 }