X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvamsas%2Fobjects%2Fsimple%2FJpredResult.java;h=a4f34ff41bccbd59eeef970228e6b14566a062e5;hb=42e022a59de649375c8878c1d26361cb6bc89cb8;hp=e0d702154d96c7bd0c5ce2146e6694e1ea23628c;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/vamsas/objects/simple/JpredResult.java b/src/vamsas/objects/simple/JpredResult.java
index e0d7021..a4f34ff 100755
--- a/src/vamsas/objects/simple/JpredResult.java
+++ b/src/vamsas/objects/simple/JpredResult.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,8 +20,8 @@
  */
 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;
 
@@ -79,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;
@@ -101,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)