diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-09-11 22:19:47 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-09-11 22:19:47 +0200 |
commit | a2fa15b1ab6d6a9930381e981694ce5b39a1160c (patch) | |
tree | aa40dd981f7a396c7b60862843c5dfe78f90bfa6 /linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java | |
parent | dda637d7693328ad2f246e88d13d1d2293c59ae8 (diff) |
No functional changes
Diffstat (limited to 'linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java')
-rw-r--r-- | linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java b/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java index b6ca219afc8..7ed9e1a2f03 100644 --- a/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java +++ b/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java @@ -7,6 +7,7 @@ import com.yahoo.language.process.TokenType; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * @author Mathias Mølster Lidal @@ -115,14 +116,14 @@ public class SimpleToken implements Token { if (!(o instanceof Token other)) return false; if (getType() != other.getType()) return false; - if (!equalsOpt(getOrig(), other.getOrig())) return false; + if (!Objects.equals(getOrig(), other.getOrig())) return false; if (getOffset() != other.getOffset()) return false; - if (!equalsOpt(getScript(), other.getScript())) return false; - if (!equalsOpt(getTokenString(), other.getTokenString())) return false; + if (!Objects.equals(getScript(), other.getScript())) return false; + if (!Objects.equals(getTokenString(), other.getTokenString())) return false; if (isSpecialToken() != other.isSpecialToken()) return false; if (getNumComponents() != other.getNumComponents()) return false; for (int i = 0, len = getNumComponents(); i < len; ++i) { - if (!equalsOpt(getComponent(i), other.getComponent(i))) + if (!Objects.equals(getComponent(i), other.getComponent(i))) return false; } return true; @@ -133,15 +134,12 @@ public class SimpleToken implements Token { return orig.hashCode(); } - private static boolean equalsOpt(Object lhs, Object rhs) { - if (lhs == null || rhs == null) { - return lhs == rhs; - } - return lhs.equals(rhs); - } - @Override public String toString() { + return "token '" + orig + "'"; + } + + public String toDetailString() { return "token : " + getClass().getSimpleName() + " {\n" + toString(this, " ") + "}"; } |