X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=ead63c8a82b1b48f5753ed0240304b39af6618a6;hb=2d63cfb4d8f84de5f40670bb301ee8a22db321ff;hp=6ae3a37b81e6f4ca5317e5ac8c6b270839508738;hpb=7bc714706c918e13320b1c661e7e44ef3c7fffb7;p=jalview.git
diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java
old mode 100755
new mode 100644
index 6ae3a37..ead63c8
--- a/src/jalview/io/AppletFormatAdapter.java
+++ b/src/jalview/io/AppletFormatAdapter.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * 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;
@@ -39,23 +41,22 @@ public class AppletFormatAdapter
*/
public static final String[] READABLE_FORMATS = new String[]
{ "BLC", "CLUSTAL", "FASTA", "MSF", "PileUp", "PIR", "PFAM", "STH",
- "PDB", "JnetFile" }; // , "SimpleBLAST" };
+ "PDB", "JnetFile", "RNAML", "GENBANK" };
/**
* 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", "STH",
- "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.
*/
public static final String[] WRITABLE_EXTENSIONS = new String[]
- { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jvp",
- "sto,stk", "jar" };
+ { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa",
+ "jvp", "sto,stk", "jar" };
/**
* List of writable formats by the application. Order must correspond with the
@@ -70,11 +71,8 @@ public class AppletFormatAdapter
* corresponding to READABLE_FNAMES
*/
public static final String[] READABLE_EXTENSIONS = new String[]
- { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar,jvp",
- "sto,stk" }; // ,
-
- // ".blast"
- // };
+ { "fa,faa,fasta,mfa,fastq", "aln", "pfam", "msf", "pir", "blc", "amsa",
+ "jar,jvp", "sto,stk", "xml,rnaml", "gb" }; // ".blast"
/**
* List of readable formats by application in order corresponding to
@@ -82,7 +80,7 @@ public class AppletFormatAdapter
*/
public static final String[] READABLE_FNAMES = new String[]
{ "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "AMSA", "Jalview",
- "Stockholm" };// ,
+ "Stockholm", "RNAML", "GenBank" };
// "SimpleBLAST"
// };
@@ -232,6 +230,8 @@ public class AppletFormatAdapter
else if (format.equals("PDB"))
{
afile = new MCview.PDBfile(inFile, type);
+ // Uncomment to test Jmol data based PDB processing: JAL-1213
+ // afile = new jalview.ext.jmol.PDBFileWithJmol(inFile, type);
}
else if (format.equals("STH"))
{
@@ -241,7 +241,14 @@ public class AppletFormatAdapter
{
afile = new SimpleBlastFile(inFile, type);
}
-
+ else if (format.equals("RNAML"))
+ {
+ afile = new RnamlFile(inFile, type);
+ }
+ else if (format.equals("GENBANK"))
+ {
+ afile = new GenBankFile(inFile, type);
+ }
Alignment al = new Alignment(afile.getSeqsAsArray());
afile.addAnnotations(al);
@@ -296,7 +303,7 @@ public class AppletFormatAdapter
*
* @return DOCUMENT ME!
*/
- public Alignment readFromFile(FileParse source, String format)
+ public AlignmentI readFromFile(FileParse source, String format)
throws java.io.IOException
{
// TODO: generalise mapping between format string and io. class instances
@@ -348,10 +355,18 @@ public class AppletFormatAdapter
{
afile = new StockholmFile(source);
}
+ else if (format.equals("RNAML"))
+ {
+ afile = new RnamlFile(source);
+ }
else if (format.equals("SimpleBLAST"))
{
afile = new SimpleBlastFile(source);
}
+ else if (format.equals("GENBANK"))
+ {
+ afile = new GenBankFile(source);
+ }
Alignment al = new Alignment(afile.getSeqsAsArray());
@@ -455,6 +470,14 @@ public class AppletFormatAdapter
{
afile = new AMSAFile(alignment);
}
+ else if (format.equalsIgnoreCase("RNAML"))
+ {
+ afile = new RnamlFile();
+ }
+ else if (format.equalsIgnoreCase("GENBANK"))
+ {
+ afile = new GenBankFile();
+ }
else
{
throw new Exception(
@@ -506,47 +529,43 @@ public class AppletFormatAdapter
{
System.out.println("Reading file: " + f);
AppletFormatAdapter afa = new AppletFormatAdapter();
- String fName = f.getName();
+ Runtime r = Runtime.getRuntime();
+ System.gc();
+ long memf = -r.totalMemory() + r.freeMemory();
+ long t1 = -System.currentTimeMillis();
+ Alignment al = afa.readFile(args[i], FILE,
+ new IdentifyFile().Identify(args[i], FILE));
+ t1 += System.currentTimeMillis();
+ System.gc();
+ memf += r.totalMemory() - r.freeMemory();
+ if (al != null)
{
- Runtime r = Runtime.getRuntime();
- System.gc();
- long memf = -r.totalMemory() + r.freeMemory();
- long t1 = -System.currentTimeMillis();
- Alignment al = afa.readFile(args[i], FILE,
- new IdentifyFile().Identify(args[i], FILE));
- t1 += System.currentTimeMillis();
- System.gc();
- memf += r.totalMemory() - r.freeMemory();
- if (al != null)
+ System.out.println("Alignment contains " + al.getHeight()
+ + " sequences and " + al.getWidth() + " columns.");
+ try
{
- System.out.println("Alignment contains " + al.getHeight()
- + " sequences and " + al.getWidth() + " columns.");
- try
- {
- System.out.println(new AppletFormatAdapter()
- .formatSequences("FASTA", al, true));
- } catch (Exception e)
- {
- System.err
- .println("Couln't format the alignment for output as a FASTA file.");
- e.printStackTrace(System.err);
- }
- }
- else
+ System.out.println(new AppletFormatAdapter().formatSequences(
+ "FASTA", al, true));
+ } catch (Exception e)
{
- System.out.println("Couldn't read alignment");
+ System.err
+ .println("Couln't format the alignment for output as a FASTA file.");
+ e.printStackTrace(System.err);
}
- System.out.println("Read took " + (t1 / 1000.0) + " seconds.");
- System.out
- .println("Difference between free memory now and before is "
- + (memf / (1024.0 * 1024.0) * 1.0) + " MB");
}
+ else
+ {
+ System.out.println("Couldn't read alignment");
+ }
+ System.out.println("Read took " + (t1 / 1000.0) + " seconds.");
+ System.out
+ .println("Difference between free memory now and before is "
+ + (memf / (1024.0 * 1024.0) * 1.0) + " MB");
} catch (Exception e)
{
System.err.println("Exception when dealing with " + i
+ "'th argument: " + args[i] + "\n" + e);
}
-
}
else
{
@@ -727,5 +746,4 @@ public class AppletFormatAdapter
}
return null;
}
-
}