X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FSequence.java;h=0615c3944f1498e8bdc30ece8db6117dd1defb8d;hb=72a9ef4b4e3763c857ef095eadc8c656ccb441ff;hp=515b8ed641580533f0d886289bb36420867ef62a;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/vamsas/objects/simple/Sequence.java b/src/vamsas/objects/simple/Sequence.java
index 515b8ed..0615c39 100755
--- a/src/vamsas/objects/simple/Sequence.java
+++ b/src/vamsas/objects/simple/Sequence.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;
@@ -76,15 +78,22 @@ public class Sequence 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 Sequence))
+ {
return false;
+ }
Sequence other = (Sequence) obj;
- if (obj == null)
- return false;
if (this == obj)
+ {
return true;
+ }
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
@@ -92,16 +101,18 @@ public class Sequence implements java.io.Serializable
__equalsCalc = obj;
boolean _equals;
_equals = true
- && ((this.id == null && other.getId() == null) || (this.id != null && this.id
- .equals(other.getId())))
- && ((this.seq == null && other.getSeq() == null) || (this.seq != null && this.seq
- .equals(other.getSeq())));
+ && ((this.id == null && other.getId() == null)
+ || (this.id != null && this.id.equals(other.getId())))
+ && ((this.seq == null && other.getSeq() == null)
+ || (this.seq != null
+ && this.seq.equals(other.getSeq())));
__equalsCalc = null;
return _equals;
}
private boolean __hashCodeCalc = false;
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)