X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FSequenceSet.java;h=03b4f7e82435453be9d5a27d6ee2f7077da37ba5;hb=e9a1c2c372f4bbf6cf658de3dba73ef326b20c20;hp=826cd6a58bc543a2c34a9a2f35523adce79a4086;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git
diff --git a/src/vamsas/objects/simple/SequenceSet.java b/src/vamsas/objects/simple/SequenceSet.java
index 826cd6a..03b4f7e 100755
--- a/src/vamsas/objects/simple/SequenceSet.java
+++ b/src/vamsas/objects/simple/SequenceSet.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * 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;
@@ -52,29 +55,38 @@ public class SequenceSet 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 SequenceSet))
+ {
return false;
+ }
SequenceSet other = (SequenceSet) obj;
- if (obj == null)
- return false;
if (this == obj)
+ {
return true;
+ }
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
}
__equalsCalc = obj;
boolean _equals;
- _equals = true && ((this.seqs == null && other.getSeqs() == null) || (this.seqs != null && java.util.Arrays
- .equals(this.seqs, other.getSeqs())));
+ _equals = true && ((this.seqs == null && other.getSeqs() == null)
+ || (this.seqs != null && java.util.Arrays.equals(this.seqs,
+ other.getSeqs())));
__equalsCalc = null;
return _equals;
}
private boolean __hashCodeCalc = false;
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)