X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FSecstructpred.java;h=349c21e32dbb73fe3aaf40fc2b3dfcfd793624ce;hb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;hp=ea335df9716d1957a4e625d274e94631454285f5;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git diff --git a/src/vamsas/objects/simple/Secstructpred.java b/src/vamsas/objects/simple/Secstructpred.java index ea335df..349c21e 100755 --- a/src/vamsas/objects/simple/Secstructpred.java +++ b/src/vamsas/objects/simple/Secstructpred.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) - * 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; @@ -55,15 +57,15 @@ public class Secstructpred implements java.io.Serializable public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof Secstructpred)) + if (obj == null) { return false; } - Secstructpred other = (Secstructpred) obj; - if (obj == null) + if (!(obj instanceof Secstructpred)) { return false; } + Secstructpred other = (Secstructpred) obj; if (this == obj) { return true;