X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FJpredResult.java;h=a4f34ff41bccbd59eeef970228e6b14566a062e5;hb=a04a7992b1055fa52f5031ef9d10d2228ee78899;hp=4c3ad522940728f982b9c8bda9f48b97ee9690d6;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git

diff --git a/src/vamsas/objects/simple/JpredResult.java b/src/vamsas/objects/simple/JpredResult.java
index 4c3ad52..a4f34ff 100755
--- a/src/vamsas/objects/simple/JpredResult.java
+++ b/src/vamsas/objects/simple/JpredResult.java
@@ -1,25 +1,27 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program 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.
+ * 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.
+ *  
+ * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package vamsas.objects.simple;
 
-public class JpredResult extends vamsas.objects.simple.Result implements
-        java.io.Serializable
+public class JpredResult extends vamsas.objects.simple.Result
+        implements java.io.Serializable
 {
   private java.lang.String aligfile;
 
@@ -77,17 +79,18 @@ public class JpredResult extends vamsas.objects.simple.Result implements
 
   private java.lang.Object __equalsCalc = null;
 
+  @Override
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof JpredResult))
+    if (obj == null)
     {
       return false;
     }
-    JpredResult other = (JpredResult) obj;
-    if (obj == null)
+    if (!(obj instanceof JpredResult))
     {
       return false;
     }
+    JpredResult other = (JpredResult) obj;
     if (this == obj)
     {
       return true;
@@ -99,16 +102,19 @@ public class JpredResult extends vamsas.objects.simple.Result implements
     __equalsCalc = obj;
     boolean _equals;
     _equals = super.equals(obj)
-            && ((this.aligfile == null && other.getAligfile() == null) || (this.aligfile != null && this.aligfile
-                    .equals(other.getAligfile())))
-            && ((this.predfile == null && other.getPredfile() == null) || (this.predfile != null && this.predfile
-                    .equals(other.getPredfile())));
+            && ((this.aligfile == null && other.getAligfile() == null)
+                    || (this.aligfile != null
+                            && this.aligfile.equals(other.getAligfile())))
+            && ((this.predfile == null && other.getPredfile() == null)
+                    || (this.predfile != null
+                            && this.predfile.equals(other.getPredfile())));
     __equalsCalc = null;
     return _equals;
   }
 
   private boolean __hashCodeCalc = false;
 
+  @Override
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)