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 ae1b515..5dbfc98 100755 (executable)
--- a/src/vamsas/objects/simple/Object.java
+++ b/src/vamsas/objects/simple/Object.java
@@ -3,11 +3,11 @@
  *
  * This file was auto-generated from WSDL
  * by the Apache Axis 1.2RC2 Nov 16, 2004 (12:19:44 EST) WSDL2Java emitter.
- */\r
-\r
+ */
+
 /*
 * 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
@@ -22,54 +22,54 @@
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/\r
-package vamsas.objects.simple;\r
-\r
-public abstract class Object implements java.io.Serializable {\r
-    private java.lang.Object __equalsCalc = null;\r
-    private boolean __hashCodeCalc = false;\r
-\r
-    public Object() {\r
-    }\r
-\r
-    public synchronized boolean equals(java.lang.Object obj) {\r
-        if (!(obj instanceof Object)) {\r
-            return false;\r
-        }\r
-\r
-        Object other = (Object) obj;\r
-\r
-        if (obj == null) {\r
-            return false;\r
-        }\r
-\r
-        if (this == obj) {\r
-            return true;\r
-        }\r
-\r
-        if (__equalsCalc != null) {\r
-            return (__equalsCalc == obj);\r
-        }\r
-\r
-        __equalsCalc = obj;\r
-\r
-        boolean _equals;\r
-        _equals = true;\r
-        __equalsCalc = null;\r
-\r
-        return _equals;\r
-    }\r
-\r
-    public synchronized int hashCode() {\r
-        if (__hashCodeCalc) {\r
-            return 0;\r
-        }\r
-\r
-        __hashCodeCalc = true;\r
-\r
-        int _hashCode = 1;\r
-        __hashCodeCalc = false;\r
-\r
-        return _hashCode;\r
-    }\r
-}\r
+*/
+package vamsas.objects.simple;
+
+public abstract class Object implements java.io.Serializable {
+    private java.lang.Object __equalsCalc = null;
+    private boolean __hashCodeCalc = false;
+
+    public Object() {
+    }
+
+    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 (__equalsCalc != null) {
+            return (__equalsCalc == obj);
+        }
+
+        __equalsCalc = obj;
+
+        boolean _equals;
+        _equals = true;
+        __equalsCalc = null;
+
+        return _equals;
+    }
+
+    public synchronized int hashCode() {
+        if (__hashCodeCalc) {
+            return 0;
+        }
+
+        __hashCodeCalc = true;
+
+        int _hashCode = 1;
+        __hashCodeCalc = false;
+
+        return _hashCode;
+    }
+}