X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FMsfalignment.java;h=9502a0965e0eab0e777957d0ac434a768596c653;hb=b06dd5c7f0f1a8d7b75fdf165b7d990681f2e2e5;hp=03cb186c5f7483bd76b763852650b5873ae82f31;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/vamsas/objects/simple/Msfalignment.java b/src/vamsas/objects/simple/Msfalignment.java index 03cb186..9502a09 100755 --- a/src/vamsas/objects/simple/Msfalignment.java +++ b/src/vamsas/objects/simple/Msfalignment.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 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -78,17 +78,18 @@ public class Msfalignment implements java.io.Serializable private java.lang.Object __equalsCalc = null; + @Override public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof Msfalignment)) + if (obj == null) { return false; } - Msfalignment other = (Msfalignment) obj; - if (obj == null) + if (!(obj instanceof Msfalignment)) { return false; } + Msfalignment other = (Msfalignment) obj; if (this == obj) { return true; @@ -110,6 +111,7 @@ public class Msfalignment implements java.io.Serializable private boolean __hashCodeCalc = false; + @Override public synchronized int hashCode() { if (__hashCodeCalc)