Browse Source

Remove copy functionality from tokens, as it is no longer required.

Timur Sağlam 5 years ago
parent
commit
446c22db8d

+ 0 - 2
jplag.frontend-utils/src/main/java/jplag/Token.java

@@ -56,6 +56,4 @@ abstract public class Token implements TokenConstants, Serializable {
     public static int numberOfTokens() {
         return 1;
     }
-    
-    public abstract Token copy();
 }

+ 0 - 10
jplag.frontend-utils/src/main/java/jplag/TokenList.java

@@ -71,14 +71,4 @@ public class TokenList implements TokenConstants {
         }
         return buffer.toString();
     }
-    
-    /**
-     * Creates a deep copy of the token list. Thus all tokens are copied as well, and changing these token does not affecte the original ones.
-     * @return the deep copy of this token list.
-     */
-    public TokenList copy() {
-        TokenList copy = new TokenList();
-        tokens.forEach(it -> copy.tokens.add(it.copy()));
-        return copy;
-    }
 }

+ 0 - 7
jplag.frontend.chars/src/main/java/jplag/chars/CharToken.java

@@ -1,7 +1,5 @@
 package jplag.chars;
 
-import jplag.Token;
-
 public class CharToken extends jplag.Token {
 	private static final long serialVersionUID = 1L;
 
@@ -31,9 +29,4 @@ public class CharToken extends jplag.Token {
     public int getIndex() { return index; }
 
 	public static int numberOfTokens() { return 36;	}
-
-    @Override
-    public Token copy() {
-        return new CharToken(type, file, index, null);
-    }
 }

+ 0 - 7
jplag.frontend.cpp/src/main/java/jplag/cpp/CPPToken.java

@@ -1,7 +1,5 @@
 package jplag.cpp;
 
-import jplag.Token;
-
 public class CPPToken extends jplag.Token implements CPPTokenConstants {
 	private static final long serialVersionUID = 1L;
 	private int line;
@@ -94,9 +92,4 @@ public class CPPToken extends jplag.Token implements CPPTokenConstants {
 	public static int numberOfTokens() { 
 		return NUM_DIFF_TOKENS;
 	}
-	
-    @Override
-    public Token copy() {
-        return new CPPToken(type, file, line);
-    }
 }

+ 0 - 7
jplag.frontend.csharp-1.2/src/main/java/jplag/csharp/CSharpToken.java

@@ -1,7 +1,5 @@
 package jplag.csharp;
 
-import jplag.Token;
-
 public class CSharpToken extends jplag.Token implements CSharpTokenConstants {
   private static final long serialVersionUID = 1L;
   private int line, column, length;
@@ -87,10 +85,5 @@ public void setLength(int length) { this.length = length; }
   public static int numberOfTokens() { 
     return NUM_DIFF_TOKENS;
   }
-
-  @Override
-  public Token copy() {
-    return new CSharpToken(type, file, line, column, length);
-  }
 }
 

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

@@ -1,7 +1,5 @@
 package jplag.javax;
 
-import jplag.Token;
-
 public class JavaToken extends jplag.Token implements JavaTokenConstants {
 	private static final long serialVersionUID = 8090049637477580276L;
 	private int line;
@@ -131,9 +129,4 @@ public class JavaToken extends jplag.Token implements JavaTokenConstants {
 	public static int numberOfTokens() {
 		return NUM_DIFF_TOKENS;
 	}
-	
-    @Override
-    public Token copy() {
-        return new JavaToken(type, file, line);
-    }
 }

+ 0 - 7
jplag.frontend.java-1.2/src/main/java/jplag/java/JavaToken.java

@@ -1,7 +1,5 @@
 package jplag.java;
 
-import jplag.Token;
-
 public class JavaToken extends jplag.Token implements JavaTokenConstants {
 	private static final long serialVersionUID = 1581274829013336295L;
 	private int line, column, length;
@@ -96,10 +94,5 @@ public class JavaToken extends jplag.Token implements JavaTokenConstants {
   
   public static int numberOfTokens() { 
     return NUM_DIFF_TOKENS;
-  }
-
-  @Override
-  public Token copy() {
-    return new JavaToken(type, file, line, column, length);
   } 
 }

+ 0 - 5
jplag.frontend.java-1.5/src/main/java/jplag/java15/JavaToken.java

@@ -95,10 +95,5 @@ public class JavaToken extends jplag.Token implements JavaTokenConstants {
   public static int numberOfTokens() { 
     return NUM_DIFF_TOKENS;
   }
-  
-  @Override
-  public Token copy() {
-      return new JavaToken(type, file, line, column, length);
-  }
 }
 

+ 0 - 7
jplag.frontend.java-1.7/src/main/java/jplag/java17/JavaToken.java

@@ -1,7 +1,5 @@
 package jplag.java17;
 
-import jplag.Token;
-
 public class JavaToken extends jplag.Token implements JavaTokenConstants {
 	private static final long serialVersionUID = -383581430479870696L;
 	private int line, column, length;
@@ -175,9 +173,4 @@ public class JavaToken extends jplag.Token implements JavaTokenConstants {
 	public static int numberOfTokens() {
 		return NUM_DIFF_TOKENS;
 	}
-	
-	@Override
-	public Token copy() {
-	  return new JavaToken(type, file, line, column, length);
-	}
 }

+ 2 - 9
jplag.frontend.java-1.9/src/main/java/jplag/java19/JavaToken.java

@@ -1,13 +1,11 @@
 package jplag.java19;
 
-import jplag.Token;
-
 public class JavaToken extends jplag.Token implements JavaTokenConstants {
     private static final long serialVersionUID = -383581430479870696L;
     private int line, column, length;
 
-    public JavaToken(int type, String file, int col, int line, int length) {
-        super(type, file, col, line, length); // TS: Why are the parameters line and column swapped here?
+    public JavaToken(int type, String file, int line, int col, int length) {
+        super(type, file, line, col, length);
     }
 
     @Override
@@ -185,9 +183,4 @@ public class JavaToken extends jplag.Token implements JavaTokenConstants {
     public static int numberOfTokens() {
         return NUM_DIFF_TOKENS;
     }
-    
-    @Override
-    public Token copy() {
-        return new JavaToken(type, file, line, column, length);
-    }
 }

+ 0 - 9
jplag.frontend.scheme/src/main/java/jplag/scheme/SchemeToken.java

@@ -1,9 +1,5 @@
 package jplag.scheme;
 
-import jplag.Token;
-
-//import java.io.*;
-
 public class SchemeToken extends jplag.Token implements SchemeTokenConstants {
 	private static final long serialVersionUID = -143418583849687339L;
 	private int line;
@@ -75,9 +71,4 @@ public int getLength() {return 0;}
   public static int numberOfTokens() { 
     return NUM_DIFF_TOKENS;
   }
-  
-  @Override
-  public Token copy() {
-    return new SchemeToken(type, file, line);
-  }
 }

+ 0 - 7
jplag.frontend.text/src/main/java/jplag/text/TextToken.java

@@ -1,7 +1,5 @@
 package jplag.text;
 
-import jplag.Token;
-
 public class TextToken extends jplag.Token {
 	private static final long serialVersionUID = 4301179216570538972L;
 
@@ -82,9 +80,4 @@ public class TextToken extends jplag.Token {
     public static int numberOfTokens(TokenStructure tokenStructure) {
         return tokenStructure.table.size();
     }
-
-    @Override
-    public Token copy() {
-        return new TextToken(type, file, null);
-    }
 }