X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FResult.java;h=170a1b52c0a935e81997d78d4d4fda8cc766a3c2;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=f77c15ec7f1bad6f740dbff94d61f143b3c953c2;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/vamsas/objects/simple/Result.java b/src/vamsas/objects/simple/Result.java
index f77c15e..170a1b5 100755
--- a/src/vamsas/objects/simple/Result.java
+++ b/src/vamsas/objects/simple/Result.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, 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;
@@ -285,23 +288,29 @@ public class Result implements java.io.Serializable
private java.lang.Object __equalsCalc = null;
+ @Override
public synchronized boolean equals(java.lang.Object obj)
{
+ if (obj == null)
+ {
+ return false;
+ }
if (!(obj instanceof Result))
+ {
return false;
+ }
Result other = (Result) obj;
- if (obj == null)
- return false;
if (this == obj)
+ {
return true;
+ }
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
}
__equalsCalc = obj;
boolean _equals;
- _equals = true
- && this.broken == other.isBroken()
+ _equals = true && this.broken == other.isBroken()
&& this.failed == other.isFailed()
&& this.finished == other.isFinished()
&& this.invalid == other.isInvalid()
@@ -310,8 +319,9 @@ public class Result implements java.io.Serializable
&& this.running == other.isRunning()
&& this.serverError == other.isServerError()
&& this.state == other.getState()
- && ((this.status == null && other.getStatus() == null) || (this.status != null && this.status
- .equals(other.getStatus())))
+ && ((this.status == null && other.getStatus() == null)
+ || (this.status != null
+ && this.status.equals(other.getStatus())))
&& this.suspended == other.isSuspended();
__equalsCalc = null;
return _equals;
@@ -319,6 +329,7 @@ public class Result implements java.io.Serializable
private boolean __hashCodeCalc = false;
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)