git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
javadoc
[jalview.git]
/
src
/
jalview
/
io
/
AppletFormatAdapter.java
diff --git
a/src/jalview/io/AppletFormatAdapter.java
b/src/jalview/io/AppletFormatAdapter.java
index
d7587c5
..
df432cc
100755
(executable)
--- a/
src/jalview/io/AppletFormatAdapter.java
+++ b/
src/jalview/io/AppletFormatAdapter.java
@@
-31,16
+31,16
@@
public class AppletFormatAdapter
/** DOCUMENT ME!! */
public static final String[] READABLE_FORMATS = new String[]
{
/** DOCUMENT ME!! */
public static final String[] READABLE_FORMATS = new String[]
{
- "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "STH", "PDB"
+ "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "STH", "PDB", "JnetFile"
};
public static final String[] WRITEABLE_FORMATS = new String[]
{
};
public static final String[] WRITEABLE_FORMATS = new String[]
{
- "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM" //, "AMSA"
+ "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM" , "AMSA"
};
public static String INVALID_CHARACTERS = "Contains invalid characters";
};
public static String INVALID_CHARACTERS = "Contains invalid characters";
-
+ // TODO: make these messages dynamic
public static String SUPPORTED_FORMATS = "Formats currently supported are\n" +
"Fasta, MSF, Clustal, BLC, PIR, MSP, and PFAM";
public static String SUPPORTED_FORMATS = "Formats currently supported are\n" +
"Fasta, MSF, Clustal, BLC, PIR, MSP, and PFAM";
@@
-218,9
+218,11
@@
public class AppletFormatAdapter
{
afile = new StockholmFile();
}
{
afile = new StockholmFile();
}
- else if (format.equals("AMSA"))
+ else if (format.equalsIgnoreCase("AMSA"))
{
afile = new AMSAFile(alignment);
{
afile = new AMSAFile(alignment);
+ } else {
+ throw new Exception("Implementation error: Unknown file format string");
}
afile.addJVSuffix(jvsuffix);
}
afile.addJVSuffix(jvsuffix);