From 251419e1f0ab8eb04d21287b708b06a552f4c58a Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Mon, 10 Apr 2017 16:49:31 -0400 Subject: Warning resolution --- .../main/java/bjc/pratt/tokens/StringToken.java | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'JPratt/src/main/java/bjc/pratt/tokens/StringToken.java') diff --git a/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java b/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java index 2e75702..9f97e33 100644 --- a/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java +++ b/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java @@ -49,26 +49,19 @@ public class StringToken implements Token { @Override public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof StringToken)) - return false; + if (this == obj) return true; + if (obj == null) return false; + if (!(obj instanceof StringToken)) return false; 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,7 +70,15 @@ public class StringToken implements Token { public String toString() { return String.format("StringToken [key='%s', val='%s']", key, 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(String val) { return new StringToken(val, val); } -- cgit v1.2.3 From 56f07e9a3aaa873fe385d224f088f048dbafa8f7 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Mon, 10 Apr 2017 16:49:54 -0400 Subject: Cleanup --- .../main/java/bjc/pratt/tokens/StringToken.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'JPratt/src/main/java/bjc/pratt/tokens/StringToken.java') 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 { - 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 { 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 { /** * 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); } } -- cgit v1.2.3 From f394306a4b65a3328551f9f6b8d4abff8bfd5b27 Mon Sep 17 00:00:00 2001 From: bjculkin Date: Wed, 12 Apr 2017 10:46:51 -0400 Subject: Package reorganization --- JPratt/src/main/java/bjc/pratt/tokens/StringToken.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'JPratt/src/main/java/bjc/pratt/tokens/StringToken.java') diff --git a/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java b/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java index 6d3c1a5..ff47667 100644 --- a/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java +++ b/JPratt/src/main/java/bjc/pratt/tokens/StringToken.java @@ -1,7 +1,5 @@ package bjc.pratt.tokens; -import bjc.pratt.Token; - /** * Simple token implementation for strings. * -- cgit v1.2.3