X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequence.java;h=76704523bdb63ab4eb50cb3e2bf8f9ac96a3ea9d;hb=1dabf099b7c77fb0a80039f72cef34669df9b2e1;hp=56a829cae1c684ec029d8f7eaa16dc3127c731e8;hpb=ed9c5fe20f052a1003d27a2c114b9bbcaca80190;p=jalview.git diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java index 56a829c..7670452 100755 --- a/src/jalview/datamodel/Sequence.java +++ b/src/jalview/datamodel/Sequence.java @@ -1,17 +1,17 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * + * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) + * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * * This program 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 2 * of the License, or (at your option) any later version. - * + * * This program 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 this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -186,7 +186,7 @@ public class Sequence implements SequenceI } } setDatasetSequence(seq.getDatasetSequence()); - if (datasetSequence==null && seq.getDBRef() != null) + if (datasetSequence == null && seq.getDBRef() != null) { // only copy DBRefs if we really are a dataset sequence DBRefEntry[] dbr = seq.getDBRef(); @@ -657,6 +657,7 @@ public class Sequence implements SequenceI return map; } + /* * (non-Javadoc) * @@ -680,6 +681,7 @@ public class Sequence implements SequenceI } return map; } + /* * (non-Javadoc) * @@ -738,7 +740,7 @@ public class Sequence implements SequenceI { createNewDs = true; newend--; // decrease end position by one for the deleted residue - // and search further + // and search further } } } @@ -820,7 +822,8 @@ public class Sequence implements SequenceI public DBRefEntry[] getDBRef() { - if (dbrefs==null && datasetSequence!=null && this!=datasetSequence) + if (dbrefs == null && datasetSequence != null + && this != datasetSequence) { return datasetSequence.getDBRef(); }