X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FObject.java;h=7e79e6aa041c0d316fe8e39f424fe21fc560d996;hb=refs%2Fheads%2Freleases%2FRelease_2_10_0_Branch;hp=2a2539730043d569bb556ca3c421f446cf2b418e;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git

diff --git a/src/vamsas/objects/simple/Object.java b/src/vamsas/objects/simple/Object.java
index 2a25397..7e79e6a 100755
--- a/src/vamsas/objects/simple/Object.java
+++ b/src/vamsas/objects/simple/Object.java
@@ -1,19 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package vamsas.objects.simple;
 
@@ -26,15 +29,21 @@ public abstract class Object implements java.io.Serializable
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof Object))
-      return false;
-    Object other = (Object) obj;
     if (obj == null)
+    {
       return false;
+    }
+    if (!(obj instanceof Object))
+    {
+      return false;
+    }
     if (this == obj)
+    {
       return true;
+    }
     if (__equalsCalc != null)
     {
       return (__equalsCalc == obj);
@@ -48,6 +57,7 @@ public abstract class Object implements java.io.Serializable
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)