X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FAlignment.java;h=9d47b6ae179720a5f9a8128b62f807bf29230c09;hb=099b1327538a96d825c891d8206b27da977ad347;hp=ad004b0b860c1b7eb76704f87db63dad9ee947fb;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/vamsas/objects/simple/Alignment.java b/src/vamsas/objects/simple/Alignment.java index ad004b0..9d47b6a 100755 --- a/src/vamsas/objects/simple/Alignment.java +++ b/src/vamsas/objects/simple/Alignment.java @@ -1,6 +1,6 @@ /* - * 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. * @@ -103,15 +103,22 @@ public class Alignment extends vamsas.objects.simple.Object implements private java.lang.Object __equalsCalc = null; + @Override public synchronized boolean equals(java.lang.Object obj) { + if (obj == null) + { + return false; + } if (!(obj instanceof Alignment)) + { return false; + } Alignment other = (Alignment) obj; - if (obj == null) - return false; if (this == obj) + { return true; + } if (__equalsCalc != null) { return (__equalsCalc == obj); @@ -131,6 +138,7 @@ public class Alignment extends vamsas.objects.simple.Object implements private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc)