From b4aaff683d78ab92b83f3a7257c33b8e27d1affa Mon Sep 17 00:00:00 2001 From: Thog Date: Tue, 7 Mar 2017 21:24:39 +0100 Subject: Drop unix case style and implement hashCode when equals is overrided Also update Guava to version 21 --- src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java | 5 +++++ src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'src/main/java/cuchaz/enigma/gui/node') diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java index 8341826..9f391f2 100644 --- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java +++ b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java @@ -37,6 +37,11 @@ public class ClassSelectorClassNode extends DefaultMutableTreeNode { return other instanceof ClassSelectorClassNode && equals((ClassSelectorClassNode) other); } + @Override public int hashCode() + { + return 17 + (classEntry != null ? classEntry.hashCode() : 0); + } + @Override public void setUserObject(Object userObject) { String packageName = ""; diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java index 31b4ebf..b3eb90e 100644 --- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java +++ b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java @@ -48,6 +48,11 @@ public class ClassSelectorPackageNode extends DefaultMutableTreeNode { return other instanceof ClassSelectorPackageNode && equals((ClassSelectorPackageNode) other); } + @Override public int hashCode() + { + return packageName.hashCode(); + } + public boolean equals(ClassSelectorPackageNode other) { return other != null && this.packageName.equals(other.packageName); } -- cgit v1.2.3