Merge branch 'features/JAL-4071_visibleFeaturesCounter' into features/JAL-3417_sdppre...

[jalview.git] / src / vamsas / objects / simple / Secstructpred.java

diff --git a/src/vamsas/objects/simple/Secstructpred.java b/src/vamsas/objects/simple/Secstructpred.java
index a9bdeda..170de07 100755 (executable)
--- a/src/vamsas/objects/simple/Secstructpred.java
+++ b/src/vamsas/objects/simple/Secstructpred.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * 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.
  * 
@@ -57,15 +57,15 @@ public class Secstructpred implements java.io.Serializable
 
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (!(obj instanceof Secstructpred))
+    if (obj == null)
     {
       return false;
     }
-    Secstructpred other = (Secstructpred) obj;
-    if (obj == null)
+    if (!(obj instanceof Secstructpred))
     {
       return false;
     }
+    Secstructpred other = (Secstructpred) obj;
     if (this == obj)
     {
       return true;
@@ -76,8 +76,9 @@ public class Secstructpred implements java.io.Serializable
     }
     __equalsCalc = obj;
     boolean _equals;
-    _equals = true && ((this.output == null && other.getOutput() == null) || (this.output != null && this.output
-            .equals(other.getOutput())));
+    _equals = true && ((this.output == null && other.getOutput() == null)
+            || (this.output != null
+                    && this.output.equals(other.getOutput())));
     __equalsCalc = null;
     return _equals;
   }