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
FileFormatI further tweaks, clean compile
[jalview.git]
/
src
/
jalview
/
ws
/
rest
/
params
/
Alignment.java
diff --git
a/src/jalview/ws/rest/params/Alignment.java
b/src/jalview/ws/rest/params/Alignment.java
index
c78bced
..
08a242d
100644
(file)
--- a/
src/jalview/ws/rest/params/Alignment.java
+++ b/
src/jalview/ws/rest/params/Alignment.java
@@
-38,7
+38,6
@@
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import org.apache.http.entity.mime.content.ContentBody;
import java.util.List;
import org.apache.http.entity.mime.content.ContentBody;
@@
-199,13
+198,27
@@
public class Alignment extends InputType
writeAsFile, null));
lst.add(new Option("format", "Alignment upload format", true,
writeAsFile, null));
lst.add(new Option("format", "Alignment upload format", true,
- FileFormat.Fasta.toString(),
- format.toString(), Arrays
- .asList(jalview.io.FormatAdapter.WRITEABLE_FORMATS),
+ FileFormat.Fasta.toString(), format.toString(), getWritableFormats(),
null));
lst.add(createMolTypeOption("type", "Sequence type", false, type, null));
return lst;
}
null));
lst.add(createMolTypeOption("type", "Sequence type", false, type, null));
return lst;
}
+ /**
+ * @return
+ */
+ protected List<String> getWritableFormats()
+ {
+ List<String> formats = new ArrayList<String>();
+ for (FileFormatI ff : FileFormat.values())
+ {
+ if (ff.isWritable())
+ {
+ formats.add(ff.toString());
+ }
+ }
+ return formats;
+ }
+
}
}