From e27124af10029be72c4be35b847219f31ed5f10e Mon Sep 17 00:00:00 2001 From: Richard Schoeller Date: Tue, 2 May 2017 19:31:41 -0400 Subject: [PATCH] Fixes #311 - delete unnecessary methods in GedObject --- .../gedbrowser/datamodel/GedObject.java | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/GedObject.java b/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/GedObject.java index 065e18e8..0312a5cc 100644 --- a/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/GedObject.java +++ b/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/GedObject.java @@ -158,26 +158,13 @@ public final boolean hasAttribute(final GedObject attribute) { @Override public final int hashCode() { int result = 1; - result = PRIME * result + parentHashCode(); - result = PRIME * result + stringHashCode(); - return result; - } - - /** - * @return return the string's hashCode - */ - private int stringHashCode() { - return string.hashCode(); - } - - /** - * @return the parent's hashCode - */ - private int parentHashCode() { if (parent == null) { - return 0; + result = PRIME * result; + } else { + result = PRIME * result + parent.hashCode(); } - return parent.hashCode(); + result = PRIME * result + string.hashCode(); + return result; } /**