updated to jalview 2.1 and begun ArchiveClient/VamsasClient/VamsasStore updates.

[jalview.git] / src / vamsas / objects / simple / Object.java

diff --git a/src/vamsas/objects/simple/Object.java b/src/vamsas/objects/simple/Object.java
index ea22e9e..5dbfc98 100755 (executable)
--- a/src/vamsas/objects/simple/Object.java
+++ b/src/vamsas/objects/simple/Object.java
@@ -7,7 +7,7 @@
 
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -23,39 +23,53 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
-
 package vamsas.objects.simple;
 
-public abstract class Object  implements java.io.Serializable {
+public abstract class Object implements java.io.Serializable {
+    private java.lang.Object __equalsCalc = null;
+    private boolean __hashCodeCalc = false;
 
     public Object() {
     }
 
-    private java.lang.Object __equalsCalc = null;
     public synchronized boolean equals(java.lang.Object obj) {
-        if (!(obj instanceof Object)) return false;
-        Object other = (Object) obj;
-        if (obj == null) return false;
-        if (this == obj) return true;
+        if (!(obj instanceof Object)) {
+            return false;
+        }
+
+        //Object other = (Object) obj;
+
+        if (obj == null) {
+            return false;
+        }
+
+        if (this == obj) {
+            return true;
+        }
+
         if (__equalsCalc != null) {
             return (__equalsCalc == obj);
         }
+
         __equalsCalc = obj;
+
         boolean _equals;
         _equals = true;
         __equalsCalc = null;
+
         return _equals;
     }
 
-    private boolean __hashCodeCalc = false;
     public synchronized int hashCode() {
         if (__hashCodeCalc) {
             return 0;
         }
+
         __hashCodeCalc = true;
+
         int _hashCode = 1;
         __hashCodeCalc = false;
+
         return _hashCode;
     }
-
 }