Cleanup

2 files changed, 22 insertions, 22 deletions

diff --git a/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java b/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java
index 9f97e33..6d3c1a5 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java
+++ b/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java
@@ -4,24 +4,24 @@ import bjc.pratt.Token;
 
 /**
  * Simple token implementation for strings.
- * 
+ *
  * @author EVE
  *
  */
 public class StringToken implements Token<String, String> {
-	private String	key;
-	private String	val;
+	private final String	key;
+	private final String	val;
 
 	/**
 	 * Create a new string token.
-	 * 
+	 *
 	 * @param ky
 	 *                The key for the token.
-	 * 
+	 *
 	 * @param vl
 	 *                The value for the token.
 	 */
-	public StringToken(String ky, String vl) {
+	public StringToken(final String ky, final String vl) {
 		key = ky;
 		val = vl;
 	}
@@ -41,19 +41,19 @@ public class StringToken implements Token<String, String> {
 		final int prime = 31;
 
 		int result = 1;
-		result = prime * result + ((key == null) ? 0 : key.hashCode());
-		result = prime * result + ((val == null) ? 0 : val.hashCode());
+		result = prime * result + (key == null ? 0 : key.hashCode());
+		result = prime * result + (val == null ? 0 : val.hashCode());
 
 		return result;
 	}
 
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(final Object obj) {
 		if (this == obj) return true;
 		if (obj == null) return false;
 		if (!(obj instanceof StringToken)) return false;
 
-		StringToken other = (StringToken) obj;
+		final StringToken other = (StringToken) obj;
 
 		if (key == null) {
 			if (other.key != null) return false;
@@ -73,13 +73,13 @@ public class StringToken implements Token<String, String> {
 
 	/**
 	 * Create a new literal token (has same key/value).
-	 * 
+	 *
 	 * @param val
 	 *                The value for the literal token.
-	 * 
+	 *
 	 * @return A literal token with that key.
 	 */
-	public static StringToken litToken(String val) {
+	public static StringToken litToken(final String val) {
 		return new StringToken(val, val);
 	}
 }
diff --git a/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java b/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java
index 7f8215a..b33dae8 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java
+++ b/JPratt/src/main/java/bjc/pratt/tokens/StringTokenStream.java
@@ -1,34 +1,34 @@
 package bjc.pratt.tokens;
 
-import bjc.pratt.Token;
-import bjc.pratt.TokenStream;
+import static bjc.pratt.tokens.StringToken.litToken;
 
 import java.util.Iterator;
 
-import static bjc.pratt.tokens.StringToken.litToken;
+import bjc.pratt.Token;
+import bjc.pratt.TokenStream;
 
 /**
  * Simple implementation of token stream for strings.
- * 
+ *
  * The terminal token here is represented by a token with type and value
  * '(end)'.
- * 
+ *
  * @author EVE
  *
  */
 public class StringTokenStream extends TokenStream<String, String> {
-	private Iterator<Token<String, String>> iter;
+	private final Iterator<Token<String, String>> iter;
 
 	private Token<String, String> curr;
 
 	/**
 	 * Create a new token stream from a iterator.
-	 * 
+	 *
 	 * @param itr
 	 *                The iterator to use.
-	 * 
+	 *
 	 */
-	public StringTokenStream(Iterator<Token<String, String>> itr) {
+	public StringTokenStream(final Iterator<Token<String, String>> itr) {
 		iter = itr;
 
 	}