X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FSecstructpred.java;h=170de0797779a60a78f059b880aafde6334beecb;hb=72a9ef4b4e3763c857ef095eadc8c656ccb441ff;hp=77fdd343c7f2d54c6d0a69600dab83a027664d8e;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/vamsas/objects/simple/Secstructpred.java b/src/vamsas/objects/simple/Secstructpred.java index 77fdd34..170de07 100755 --- a/src/vamsas/objects/simple/Secstructpred.java +++ b/src/vamsas/objects/simple/Secstructpred.java @@ -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; }