*/
package jalview.gui;
+import static jalview.util.UrlConstants.DB_ACCESSION;
import static jalview.util.UrlConstants.EMBLEBI_STRING;
-import static jalview.util.UrlConstants.OLD_EMBLEBI_STRING;
import static jalview.util.UrlConstants.SEQUENCE_ID;
-import static jalview.util.UrlConstants.SEQUENCE_NAME;
import static jalview.util.UrlConstants.SRS_STRING;
import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
import jalview.bin.Cache;
import jalview.gui.Help.HelpId;
import jalview.gui.StructureViewer.ViewerType;
+import jalview.io.FileFormatI;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
import jalview.jbgui.GPreferences;
String name = st.nextToken();
String url = st.nextToken();
// check for '|' within a regex
- int rxstart = url.indexOf("$" + SEQUENCE_ID + "$");
+ int rxstart = url.indexOf("$" + DB_ACCESSION + "$");
if (rxstart == -1)
{
- rxstart = url.indexOf("$" + SEQUENCE_NAME + "$");
+ rxstart = url.indexOf("$" + SEQUENCE_ID + "$");
}
while (rxstart == -1 && url.indexOf("/=$") == -1)
{
{
sequenceURLLinks.setElementAt(EMBLEBI_STRING, srsPos);
}
- // upgrade old EMBL-EBI link
- int emblPos = sequenceURLLinks.indexOf(OLD_EMBLEBI_STRING);
- if (emblPos > -1)
- {
- sequenceURLLinks.setElementAt(EMBLEBI_STRING, emblPos);
- }
}
/**
else
{
Cache.applicationProperties.remove("SEQUENCE_LINKS");
+ sequenceURLLinks.clear();
}
Cache.applicationProperties.setProperty("USE_PROXY",
@Override
public void startupFileTextfield_mouseClicked()
{
- JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] {
- "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc",
- "jar" }, new String[] { "Fasta", "Clustal", "PFAM", "MSF",
- "PIR", "BLC", "Jalview" },
- jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
+ String fileFormat = Cache.getProperty("DEFAULT_FILE_FORMAT");
+ JalviewFileChooser chooser = JalviewFileChooser.forRead(
+ Cache.getProperty("LAST_DIRECTORY"), fileFormat, true);
+ // new String[] {
+ // "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc",
+ // "jar" }, new String[] { "Fasta", "Clustal", "PFAM", "MSF",
+ // "PIR", "BLC", "Jalview" },
+ // fileFormat);
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager
.getString("label.select_startup_file"));
if (value == JalviewFileChooser.APPROVE_OPTION)
{
- jalview.bin.Cache.applicationProperties.setProperty(
- "DEFAULT_FILE_FORMAT", chooser.getSelectedFormat());
+ FileFormatI format = chooser.getSelectedFormat();
+ if (format != null)
+ {
+ Cache.applicationProperties.setProperty("DEFAULT_FILE_FORMAT",
+ format.toString());
+ }
startupFileTextfield.setText(chooser.getSelectedFile()
.getAbsolutePath());
}