summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/gui/node
diff options
context:
space:
mode:
authorGravatar Thog2017-03-07 21:24:39 +0100
committerGravatar Thog2017-03-07 21:30:02 +0100
commitb4aaff683d78ab92b83f3a7257c33b8e27d1affa (patch)
treef23c9bb0927d83cc7302881266b7df8fd37959c7 /src/main/java/cuchaz/enigma/gui/node
parentAvoid crash of the matcher when the obf name is invalid (set a deob it using ... (diff)
downloadenigma-fork-b4aaff683d78ab92b83f3a7257c33b8e27d1affa.tar.gz
enigma-fork-b4aaff683d78ab92b83f3a7257c33b8e27d1affa.tar.xz
enigma-fork-b4aaff683d78ab92b83f3a7257c33b8e27d1affa.zip
Drop unix case style and implement hashCode when equals is overrided
Also update Guava to version 21
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/node')
-rw-r--r--src/main/java/cuchaz/enigma/gui/node/ClassSelectorClassNode.java5
-rw-r--r--src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java5
2 files changed, 10 insertions, 0 deletions
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 {
37 return other instanceof ClassSelectorClassNode && equals((ClassSelectorClassNode) other); 37 return other instanceof ClassSelectorClassNode && equals((ClassSelectorClassNode) other);
38 } 38 }
39 39
40 @Override public int hashCode()
41 {
42 return 17 + (classEntry != null ? classEntry.hashCode() : 0);
43 }
44
40 @Override public void setUserObject(Object userObject) 45 @Override public void setUserObject(Object userObject)
41 { 46 {
42 String packageName = ""; 47 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 {
48 return other instanceof ClassSelectorPackageNode && equals((ClassSelectorPackageNode) other); 48 return other instanceof ClassSelectorPackageNode && equals((ClassSelectorPackageNode) other);
49 } 49 }
50 50
51 @Override public int hashCode()
52 {
53 return packageName.hashCode();
54 }
55
51 public boolean equals(ClassSelectorPackageNode other) { 56 public boolean equals(ClassSelectorPackageNode other) {
52 return other != null && this.packageName.equals(other.packageName); 57 return other != null && this.packageName.equals(other.packageName);
53 } 58 }