X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=9f148bec36d7f904c0213f77c1a4b392dc67387d;hb=8a33c09bdd60c4b0f1c85136d1f8596240151c67;hp=a91a1b085024e8a37b6c97bfb43c28592d5cd727;hpb=0ba2cdf46e967155efab9b457598f2112e2e2033;p=jalview.git
diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java
index a91a1b0..9f148be 100755
--- a/src/jalview/io/AppletFormatAdapter.java
+++ b/src/jalview/io/AppletFormatAdapter.java
@@ -1,20 +1,19 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ *
+ * 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.
+ *
+ * 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 .
*/
package jalview.io;
@@ -23,100 +22,128 @@ import java.io.File;
import jalview.datamodel.*;
/**
- * A low level class for alignment and feature IO
- * with alignment formatting methods used by both applet
- * and application for generating flat alignment files.
- * It also holds the lists of magic format names
- * that the applet and application will allow the user to read or write files with.
- *
+ * A low level class for alignment and feature IO with alignment formatting
+ * methods used by both applet and application for generating flat alignment
+ * files. It also holds the lists of magic format names that the applet and
+ * application will allow the user to read or write files with.
+ *
* @author $author$
* @version $Revision$
*/
public class AppletFormatAdapter
{
- /**
- * List of valid format strings used in the isValidFormat method
+ /**
+ * List of valid format strings used in the isValidFormat method
*/
public static final String[] READABLE_FORMATS = new String[]
- {
- "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "STH", "PDB", "JnetFile"
- };
+ { "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "STH",
+ "PDB", "JnetFile" }; // , "SimpleBLAST" };
+
/**
- * List of valid format strings for use by callers of the formatSequences method
+ * List of valid format strings for use by callers of the formatSequences
+ * method
*/
public static final String[] WRITEABLE_FORMATS = new String[]
- {
- "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM" , "AMSA"
- };
+ { "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "AMSA" };
+
/**
- * List of extensions corresponding to file format types
- * in WRITABLE_FNAMES that are writable by the
- * application.
+ * List of extensions corresponding to file format types in WRITABLE_FNAMES
+ * that are writable by the application.
*/
public static final String[] WRITABLE_EXTENSIONS = new String[]
- { "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc","amsa","jar" };
+ { "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar" };
+
/**
- * List of writable formats by the application. Order must
- * correspond with the WRITABLE_EXTENSIONS list of formats.
+ * List of writable formats by the application. Order must correspond with the
+ * WRITABLE_EXTENSIONS list of formats.
*/
public static final String[] WRITABLE_FNAMES = new String[]
- { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Jalview" };
+ { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Jalview" };
/**
* List of readable format file extensions by application in order
- * corresponding to READABLE_FNAMES
+ * corresponding to READABLE_FNAMES
*/
- public static final String[] READABLE_EXTENSIONS = new String[]
- {
- "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc",
- "amsa","jar"
- };
+ public static final String[] READABLE_EXTENSIONS = new String[]
+ { "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar" }; // ,
+ // ".blast"
+ // };
+
/**
- * List of readable formats by application in order
- * corresponding to READABLE_EXTENSIONS
+ * List of readable formats by application in order corresponding to
+ * READABLE_EXTENSIONS
*/
- public static final String[] READABLE_FNAMES = new String[]
- {
- "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA","Jalview"
- };
-
+ public static final String[] READABLE_FNAMES = new String[]
+ { "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Jalview" };// ,
+ // "SimpleBLAST"
+ // };
+
public static String INVALID_CHARACTERS = "Contains invalid characters";
+
// TODO: make these messages dynamic
- public static String SUPPORTED_FORMATS = "Formats currently supported are\n" +
- prettyPrint(READABLE_FORMATS);
+ public static String SUPPORTED_FORMATS = "Formats currently supported are\n"
+ + prettyPrint(READABLE_FORMATS);
+
/**
*
* @param els
* @return grammatically correct(ish) list consisting of els elements.
*/
- public static String prettyPrint(String[] els) {
+ public static String prettyPrint(String[] els)
+ {
StringBuffer list = new StringBuffer();
- for (int i=0,iSize=els.length-1; iUNKNOWN\n" + inFile, "Paste");
+ Alignment al = new Alignment(afile.getSeqsAsArray());
+ afile.addAnnotations(al);
+ return al;
+
+ } catch (Exception ex)
{
if (ex.toString().startsWith(INVALID_CHARACTERS))
{
@@ -229,17 +374,22 @@ public class AppletFormatAdapter
}
/**
- * Construct an output class for an alignment in a particular filetype
- *
- * @param format string name of alignment format
- * @param alignment the alignment to be written out
- * @param jvsuffix passed to AlnFile class controls whether /START-END is added to sequence names
- *
+ * Construct an output class for an alignment in a particular filetype TODO:
+ * allow caller to detect errors and warnings encountered when generating
+ * output
+ *
+ * @param format
+ * string name of alignment format
+ * @param alignment
+ * the alignment to be written out
+ * @param jvsuffix
+ * passed to AlnFile class controls whether /START-END is added to
+ * sequence names
+ *
* @return alignment flat file contents
*/
- public String formatSequences(String format,
- AlignmentI alignment,
- boolean jvsuffix)
+ public String formatSequences(String format, AlignmentI alignment,
+ boolean jvsuffix)
{
try
{
@@ -280,45 +430,92 @@ public class AppletFormatAdapter
else if (format.equalsIgnoreCase("AMSA"))
{
afile = new AMSAFile(alignment);
- } else {
- throw new Exception("Implementation error: Unknown file format string");
+ }
+ else
+ {
+ throw new Exception(
+ "Implementation error: Unknown file format string");
}
afile.addJVSuffix(jvsuffix);
afile.setSeqs(alignment.getSequencesArray());
- return afile.print();
- }
- catch (Exception e)
+ String afileresp = afile.print();
+ if (afile.hasWarningMessage())
+ {
+ System.err.println("Warning raised when writing as " + format
+ + " : " + afile.getWarningMessage());
+ }
+ return afileresp;
+ } catch (Exception e)
{
- System.err.println("Failed to write alignment as a '" + format +
- "' file\n");
+ System.err.println("Failed to write alignment as a '" + format
+ + "' file\n");
e.printStackTrace();
}
return null;
}
+
public static void main(String[] args)
{
- int i=0;
- while (i