X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFormatAdapter.java;h=182f2f43989eb37923bf822840633710da9621fe;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=63a14d71502b5099a23eec46b25648108c119237;hpb=80300778ebd2107d12371d5073ccb8870f875eda;p=jalview.git diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java index 63a14d7..182f2f4 100755 --- a/src/jalview/io/FormatAdapter.java +++ b/src/jalview/io/FormatAdapter.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ 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. * @@ -63,9 +63,9 @@ public class FormatAdapter extends AppletFormatAdapter annotFromStructure = jalview.bin.Cache.getDefault("ADD_TEMPFACT_ANN", true); localSecondaryStruct = jalview.bin.Cache.getDefault("ADD_SS_ANN", - true); - serviceSecondaryStruct = jalview.bin.Cache.getDefault("USE_RNAVIEW", - true); + true); + serviceSecondaryStruct = jalview.bin.Cache.getDefault("USE_RNAVIEW", + true); } else { @@ -107,8 +107,6 @@ public class FormatAdapter extends AppletFormatAdapter { startRes = seqs[i].getStart(); endRes = seqs[i].getEnd(); - - if (startEnd != null) { startIndex = startEnd[0]; @@ -128,9 +126,7 @@ public class FormatAdapter extends AppletFormatAdapter } startRes = seqs[i].findPosition(startIndex); - startRes = seqs[i].getStart() > 1 ? startRes - seqs[i].getStart() - : startRes; - endRes = seqs[i].findPosition(endIndex) - seqs[i].getStart(); + endRes = seqs[i].findPosition(endIndex); } tmp[i] = new Sequence(seqs[i].getName(), omitHiddenColumns[i], @@ -271,14 +267,12 @@ public class FormatAdapter extends AppletFormatAdapter ColumnSelection colSel) { return formatSequences(format, alignment, omitHidden, exportRange, - suffix, colSel, - null); + suffix, colSel, null); } public String formatSequences(String format, AlignmentI alignment, String[] omitHidden, int[] exportRange, boolean suffix, - ColumnSelection colSel, - jalview.datamodel.SequenceGroup selgp) + ColumnSelection colSel, jalview.datamodel.SequenceGroup selgp) { if (omitHidden != null) { @@ -363,5 +357,4 @@ public class FormatAdapter extends AppletFormatAdapter selectedOnly); } - }