X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FJpredResult.java;h=a4f34ff41bccbd59eeef970228e6b14566a062e5;hb=72a9ef4b4e3763c857ef095eadc8c656ccb441ff;hp=7e453bab6493c48dd87c03dce3395f40a2854801;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/vamsas/objects/simple/JpredResult.java b/src/vamsas/objects/simple/JpredResult.java
index 7e453ba..a4f34ff 100755
--- a/src/vamsas/objects/simple/JpredResult.java
+++ b/src/vamsas/objects/simple/JpredResult.java
@@ -1,24 +1,27 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * 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;
-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;
@@ -76,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;
@@ -98,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)