X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FFormatAdapter.java;h=9913428b0937f183f74d79eda02b6fcdcc06f4d5;hb=1f491c8c9e66b3accb8bb9eae78c7d9caa63c1ac;hp=dc0526d8ae2169f74135528450fff135e99c78e7;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java
index dc0526d..9913428 100755
--- a/src/jalview/io/FormatAdapter.java
+++ b/src/jalview/io/FormatAdapter.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 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 jalview.io;
@@ -36,7 +39,7 @@ public class FormatAdapter extends AppletFormatAdapter
}
/**
- * create sequences with each seuqence string replaced with the one given in
+ * create sequences with each sequence string replaced with the one given in
* omitHiddenCOlumns
*
* @param seqs
@@ -194,23 +197,29 @@ public class FormatAdapter extends AppletFormatAdapter
{
if (omitHidden != null)
{
- //
- Alignment alv = new Alignment(replaceStrings(alignment
- .getSequencesArray(), omitHidden));
+ // TODO consider using AlignmentView to prune to visible region
+ // TODO prune sequence annotation and groups to visible region
+ // TODO: JAL-1486 - set start and end for output correctly. basically,
+ // AlignmentView.getVisibleContigs does this.
+ Alignment alv = new Alignment(replaceStrings(
+ alignment.getSequencesArray(), omitHidden));
AlignmentAnnotation[] ala = alignment.getAlignmentAnnotation();
- for (int i = 0; i < ala.length; i++)
+ if (ala != null)
{
- AlignmentAnnotation na = new AlignmentAnnotation(ala[i]);
- if (selgp != null)
- {
- colSel.makeVisibleAnnotation(selgp.getStartRes(), selgp
- .getEndRes(), na);
- }
- else
+ for (int i = 0; i < ala.length; i++)
{
- colSel.makeVisibleAnnotation(na);
+ AlignmentAnnotation na = new AlignmentAnnotation(ala[i]);
+ if (selgp != null)
+ {
+ colSel.makeVisibleAnnotation(selgp.getStartRes(),
+ selgp.getEndRes(), na);
+ }
+ else
+ {
+ colSel.makeVisibleAnnotation(na);
+ }
+ alv.addAnnotation(na);
}
- alv.addAnnotation(na);
}
return this.formatSequences(format, alv, suffix);
}