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
Merge branch 'develop' into bug/JAL-2461
[jalview.git]
/
src
/
vamsas
/
objects
/
simple
/
SequenceSet.java
diff --git
a/src/vamsas/objects/simple/SequenceSet.java
b/src/vamsas/objects/simple/SequenceSet.java
index
be8e36c
..
d5a269b
100755
(executable)
--- a/
src/vamsas/objects/simple/SequenceSet.java
+++ b/
src/vamsas/objects/simple/SequenceSet.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.
*
@@
-55,15
+55,22
@@
public class SequenceSet implements java.io.Serializable
private java.lang.Object __equalsCalc = null;
private java.lang.Object __equalsCalc = null;
+ @Override
public synchronized boolean equals(java.lang.Object obj)
{
public synchronized boolean equals(java.lang.Object obj)
{
+ if (obj == null)
+ {
+ return false;
+ }
if (!(obj instanceof SequenceSet))
if (!(obj instanceof SequenceSet))
+ {
return false;
return false;
+ }
SequenceSet other = (SequenceSet) obj;
SequenceSet other = (SequenceSet) obj;
- if (obj == null)
- return false;
if (this == obj)
if (this == obj)
+ {
return true;
return true;
+ }
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
@@
-78,6
+85,7
@@
public class SequenceSet implements java.io.Serializable
private boolean __hashCodeCalc = false;
private boolean __hashCodeCalc = false;
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)
public synchronized int hashCode()
{
if (__hashCodeCalc)