X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FMsfalignment.java;h=e4b760b1ace5ced147a336227c5e22d47990ed39;hb=3459a8a691cb22508d7067f240b7254e588e77d3;hp=ed62d9ff9b084e6308ff670c9c45fa44ad30ae05;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git

diff --git a/src/vamsas/objects/simple/Msfalignment.java b/src/vamsas/objects/simple/Msfalignment.java
index ed62d9f..e4b760b 100755
--- a/src/vamsas/objects/simple/Msfalignment.java
+++ b/src/vamsas/objects/simple/Msfalignment.java
@@ -1,19 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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;
 
@@ -75,17 +78,18 @@ public class Msfalignment implements java.io.Serializable
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof Msfalignment))
+    if (obj == null)
     {
       return false;
     }
-    Msfalignment other = (Msfalignment) obj;
-    if (obj == null)
+    if (!(obj instanceof Msfalignment))
     {
       return false;
     }
+    Msfalignment other = (Msfalignment) obj;
     if (this == obj)
     {
       return true;
@@ -96,17 +100,18 @@ public class Msfalignment implements java.io.Serializable
     }
     __equalsCalc = obj;
     boolean _equals;
-    _equals = true
-            && ((this.msf == null && other.getMsf() == null) || (this.msf != null && this.msf
-                    .equals(other.getMsf())))
-            && ((this.notes == null && other.getNotes() == null) || (this.notes != null && this.notes
-                    .equals(other.getNotes())));
+    _equals = true && ((this.msf == null && other.getMsf() == null)
+            || (this.msf != null && this.msf.equals(other.getMsf())))
+            && ((this.notes == null && other.getNotes() == null)
+                    || (this.notes != null
+                            && this.notes.equals(other.getNotes())));
     __equalsCalc = null;
     return _equals;
   }
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)