Merge branch 'master' of https://github.com/bculkin2442/JPratt.git

1 files changed, 27 insertions, 28 deletions

diff --git a/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java b/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java
index 2e75702..ff47667 100644
--- a/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java
+++ b/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java
@@ -1,27 +1,25 @@
 package bjc.pratt.tokens;
 
-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,34 +39,27 @@ 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) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (!(obj instanceof StringToken))
-			return false;
+	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;
-		} else if (!key.equals(other.key))
-			return false;
+			if (other.key != null) return false;
+		} else if (!key.equals(other.key)) return false;
 
 		if (val == null) {
-			if (other.val != null)
-				return false;
-		} else if (!val.equals(other.val))
-			return false;
+			if (other.val != null) return false;
+		} else if (!val.equals(other.val)) return false;
 
 		return true;
 	}
@@ -77,8 +68,16 @@ public class StringToken implements Token<String, String> {
 	public String toString() {
 		return String.format("StringToken [key='%s', val='%s']", key, val);
 	}
-	
-	public static StringToken litToken(String val) {
+
+	/**
+	 * 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(final String val) {
 		return new StringToken(val, val);
 	}
 }