X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvamsas%2Fobjects%2Fsimple%2FJpredResult.java;h=cc7cc67add6ad573e3f6d1f122d16a2e6b5e2f48;hb=97df7d7f0c7871ce943059b4f55832648dbff319;hp=9704d3b20f050e68ffc4bbd709dc75bc3e0fcb5e;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/vamsas/objects/simple/JpredResult.java b/src/vamsas/objects/simple/JpredResult.java
index 9704d3b..cc7cc67 100755
--- a/src/vamsas/objects/simple/JpredResult.java
+++ b/src/vamsas/objects/simple/JpredResult.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;
@@ -77,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;
@@ -109,6 +112,7 @@ public class JpredResult extends vamsas.objects.simple.Result implements
private boolean __hashCodeCalc = false;
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)