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
Remove latestVersion if null
[jalview.git]
/
src
/
jalview
/
io
/
FormatAdapter.java
diff --git
a/src/jalview/io/FormatAdapter.java
b/src/jalview/io/FormatAdapter.java
index
6ac110d
..
61c2331
100755
(executable)
--- a/
src/jalview/io/FormatAdapter.java
+++ b/
src/jalview/io/FormatAdapter.java
@@
-32,7
+32,7
@@
import java.util.Vector;
public class FormatAdapter
\r
{
\r
/** DOCUMENT ME!! */
\r
public class FormatAdapter
\r
{
\r
/** DOCUMENT ME!! */
\r
- public static Vector formats = new Vector();
\r
+ public static final Vector formats = new Vector();
\r
\r
static
\r
{
\r
\r
static
\r
{
\r
@@
-45,6
+45,8
@@
public class FormatAdapter
formats.addElement("PFAM");
\r
}
\r
\r
formats.addElement("PFAM");
\r
}
\r
\r
+ AlignFile afile = null;
\r
+
\r
/**
\r
* DOCUMENT ME!
\r
*
\r
/**
\r
* DOCUMENT ME!
\r
*
\r
@@
-54,12
+56,10
@@
public class FormatAdapter
*
\r
* @return DOCUMENT ME!
\r
*/
\r
*
\r
* @return DOCUMENT ME!
\r
*/
\r
- public static SequenceI[] readFile(String inFile, String type, String format)
\r
+ public SequenceI[] readFile(String inFile, String type, String format)
\r
{
\r
try
\r
{
\r
{
\r
try
\r
{
\r
- AlignFile afile = null;
\r
-
\r
if (format.equals("FASTA"))
\r
{
\r
afile = new FastaFile(inFile, type);
\r
if (format.equals("FASTA"))
\r
{
\r
afile = new FastaFile(inFile, type);
\r
@@
-101,6
+101,7
@@
public class FormatAdapter
return null;
\r
}
\r
\r
return null;
\r
}
\r
\r
+
\r
/**
\r
* DOCUMENT ME!
\r
*
\r
/**
\r
* DOCUMENT ME!
\r
*
\r
@@
-109,7
+110,7
@@
public class FormatAdapter
*
\r
* @return DOCUMENT ME!
\r
*/
\r
*
\r
* @return DOCUMENT ME!
\r
*/
\r
- public static String formatSequences(String format, Vector seqs)
\r
+ public String formatSequences(String format, Vector seqs)
\r
{
\r
SequenceI[] s = new SequenceI[seqs.size()];
\r
\r
{
\r
SequenceI[] s = new SequenceI[seqs.size()];
\r
\r