git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3692 fix up test for 2.11.1 series datamodel API
[jalview.git]
/
src
/
vamsas
/
objects
/
simple
/
MsaResult.java
diff --git
a/src/vamsas/objects/simple/MsaResult.java
b/src/vamsas/objects/simple/MsaResult.java
index
a142820
..
49fa4a7
100755
(executable)
--- a/
src/vamsas/objects/simple/MsaResult.java
+++ b/
src/vamsas/objects/simple/MsaResult.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * 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.
*
*
* This file is part of Jalview.
*
@@
-58,20
+58,20
@@
public class MsaResult extends vamsas.objects.simple.Result implements
this.msa = msa;
}
this.msa = msa;
}
+ @Override
public synchronized boolean equals(java.lang.Object obj)
{
public synchronized boolean equals(java.lang.Object obj)
{
- if (!(obj instanceof MsaResult))
+ if (obj == null)
{
return false;
}
{
return false;
}
-
- MsaResult other = (MsaResult) obj;
-
- if (obj == null)
+ if (!(obj instanceof MsaResult))
{
return false;
}
{
return false;
}
+ MsaResult other = (MsaResult) obj;
+
if (this == obj)
{
return true;
if (this == obj)
{
return true;
@@
-93,6
+93,7
@@
public class MsaResult extends vamsas.objects.simple.Result implements
return _equals;
}
return _equals;
}
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)
public synchronized int hashCode()
{
if (__hashCodeCalc)