X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FSecstructpred.java;h=170de0797779a60a78f059b880aafde6334beecb;hb=72a9ef4b4e3763c857ef095eadc8c656ccb441ff;hp=d75d0e186c80b25784ca2672e67a4f8d0cf1ce9c;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/vamsas/objects/simple/Secstructpred.java b/src/vamsas/objects/simple/Secstructpred.java
index d75d0e1..170de07 100755
--- a/src/vamsas/objects/simple/Secstructpred.java
+++ b/src/vamsas/objects/simple/Secstructpred.java
@@ -1,19 +1,21 @@
/*
- * 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.
*
* 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package vamsas.objects.simple;
@@ -55,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;
@@ -74,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;
}