Formatting

[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 69ca312..4a37bc9 100755 (executable)
--- a/src/vamsas/objects/simple/Object.java
+++ b/src/vamsas/objects/simple/Object.java
@@ -6,70 +6,80 @@
  */\r
 \r
 /*\r
-* Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
-*\r
-* This program is free software; you can redistribute it and/or\r
-* modify it under the terms of the GNU General Public License\r
-* as published by the Free Software Foundation; either version 2\r
-* of the License, or (at your option) any later version.\r
-*\r
-* This program is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with this program; if not, write to the Free Software\r
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
-*/\r
+ * Jalview - A Sequence Alignment Editor and Viewer\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ */\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
+public abstract class Object\r
+    implements java.io.Serializable\r
+{\r
+  private java.lang.Object __equalsCalc = null;\r
+  private boolean __hashCodeCalc = false;\r
+\r
+  public Object()\r
+  {\r
+  }\r
 \r
-    public Object() {\r
+  public synchronized boolean equals(java.lang.Object obj)\r
+  {\r
+    if (! (obj instanceof Object))\r
+    {\r
+      return false;\r
     }\r
 \r
-    public synchronized boolean equals(java.lang.Object obj) {\r
-        if (!(obj instanceof Object)) {\r
-            return false;\r
-        }\r
+    //Object other = (Object) obj;\r
 \r
-        //Object other = (Object) obj;\r
+    if (obj == null)\r
+    {\r
+      return false;\r
+    }\r
 \r
-        if (obj == null) {\r
-            return false;\r
-        }\r
+    if (this == obj)\r
+    {\r
+      return true;\r
+    }\r
 \r
-        if (this == obj) {\r
-            return true;\r
-        }\r
+    if (__equalsCalc != null)\r
+    {\r
+      return (__equalsCalc == obj);\r
+    }\r
 \r
-        if (__equalsCalc != null) {\r
-            return (__equalsCalc == obj);\r
-        }\r
+    __equalsCalc = obj;\r
 \r
-        __equalsCalc = obj;\r
+    boolean _equals;\r
+    _equals = true;\r
+    __equalsCalc = null;\r
 \r
-        boolean _equals;\r
-        _equals = true;\r
-        __equalsCalc = null;\r
+    return _equals;\r
+  }\r
 \r
-        return _equals;\r
+  public synchronized int hashCode()\r
+  {\r
+    if (__hashCodeCalc)\r
+    {\r
+      return 0;\r
     }\r
 \r
-    public synchronized int hashCode() {\r
-        if (__hashCodeCalc) {\r
-            return 0;\r
-        }\r
+    __hashCodeCalc = true;\r
 \r
-        __hashCodeCalc = true;\r
+    int _hashCode = 1;\r
+    __hashCodeCalc = false;\r
 \r
-        int _hashCode = 1;\r
-        __hashCodeCalc = false;\r
-\r
-        return _hashCode;\r
-    }\r
+    return _hashCode;\r
+  }\r
 }\r