X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=966e9523fa32e899711423c761935fa3c15a8127;hb=7d6bf4ac01167499c0f4e07de63edcdd72a6d595;hp=462f5a70511c834a7e49d3fd7deccfab641ce4ab;hpb=cd2f8500d0130b3e695086259912bac873a3c9e8;p=jalview.git
diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 462f5a7..966e952 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -20,27 +20,41 @@
*/
package jalview.bin;
+import groovy.lang.Binding;
+import groovy.util.GroovyScriptEngine;
+
+import jalview.ext.so.SequenceOntology;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
+import jalview.gui.PromptUserConfig;
+import jalview.io.AppletFormatAdapter;
import jalview.io.BioJsHTMLOutput;
+import jalview.io.DataSourceType;
+import jalview.io.FileFormat;
+import jalview.io.FileFormatException;
+import jalview.io.FileFormatI;
+import jalview.io.FileLoader;
import jalview.io.HtmlSvgOutput;
+import jalview.io.IdentifyFile;
+import jalview.io.NewickFile;
+import jalview.io.gff.SequenceOntologyFactory;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ColourSchemeProperty;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.ws.jws2.Jws2Discoverer;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.lang.reflect.Constructor;
import java.net.MalformedURLException;
import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
-import java.net.URLDecoder;
import java.security.AllPermission;
import java.security.CodeSource;
import java.security.PermissionCollection;
@@ -51,7 +65,6 @@ import java.util.Map;
import java.util.Vector;
import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
/**
* Main class for Jalview Application
@@ -63,11 +76,21 @@ import javax.swing.UnsupportedLookAndFeelException;
*/
public class Jalview
{
+ /*
+ * singleton instance of this class
+ */
+ private static Jalview instance;
+
+ private Desktop desktop;
+
+ public static AlignFrame currentAlignFrame;
+
static
{
// grab all the rights we can the JVM
Policy.setPolicy(new Policy()
{
+ @Override
public PermissionCollection getPermissions(CodeSource codesource)
{
Permissions perms = new Permissions();
@@ -75,6 +98,7 @@ public class Jalview
return (perms);
}
+ @Override
public void refresh()
{
}
@@ -82,6 +106,71 @@ public class Jalview
}
/**
+ * keep track of feature fetching tasks.
+ *
+ * @author JimP
+ *
+ */
+ class FeatureFetcher
+ {
+ /*
+ * TODO: generalise to track all jalview events to orchestrate batch
+ * processing events.
+ */
+
+ private int queued = 0;
+
+ private int running = 0;
+
+ public FeatureFetcher()
+ {
+
+ }
+
+ public void addFetcher(final AlignFrame af,
+ final Vector dasSources)
+ {
+ final long id = System.currentTimeMillis();
+ queued++;
+ final FeatureFetcher us = this;
+ new Thread(new Runnable()
+ {
+
+ @Override
+ public void run()
+ {
+ synchronized (us)
+ {
+ queued--;
+ running++;
+ }
+
+ af.setProgressBar(MessageManager
+ .getString("status.das_features_being_retrived"), id);
+ af.featureSettings_actionPerformed(null);
+ af.featureSettings.fetchDasFeatures(dasSources, true);
+ af.setProgressBar(null, id);
+ synchronized (us)
+ {
+ running--;
+ }
+ }
+ }).start();
+ }
+
+ public synchronized boolean allFinished()
+ {
+ return queued == 0 && running == 0;
+ }
+
+ }
+
+ public static Jalview getInstance()
+ {
+ return instance;
+ }
+
+ /**
* main class for Jalview application
*
* @param args
@@ -89,6 +178,16 @@ public class Jalview
*/
public static void main(String[] args)
{
+ instance = new Jalview();
+ instance.doMain(args);
+ }
+
+ /**
+ * @param args
+ */
+ void doMain(String[] args)
+ {
+ System.setSecurityManager(null);
System.out.println("Java version: "
+ System.getProperty("java.version"));
System.out.println(System.getProperty("os.arch") + " "
@@ -161,7 +260,7 @@ public class Jalview
try
{
Cache.initLogger();
- } catch (java.lang.NoClassDefFoundError error)
+ } catch (NoClassDefFoundError error)
{
error.printStackTrace();
System.out
@@ -170,7 +269,7 @@ public class Jalview
System.exit(0);
}
- Desktop desktop = null;
+ desktop = null;
try
{
@@ -178,7 +277,7 @@ public class Jalview
} catch (Exception ex)
{
}
- if (new Platform().isAMac())
+ if (Platform.isAMac())
{
System.setProperty("com.apple.mrj.application.apple.menu.about.name",
"Jalview");
@@ -187,13 +286,22 @@ public class Jalview
{
UIManager.setLookAndFeel(ch.randelshofer.quaqua.QuaquaManager
.getLookAndFeel());
- } catch (UnsupportedLookAndFeelException e)
+ } catch (Throwable e)
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ System.err.println("Failed to set QuaQua look and feel: "
+ + e.toString());
}
}
+ /*
+ * configure 'full' SO model if preferences say to,
+ * else use the default (SO Lite)
+ */
+ if (Cache.getDefault("USE_FULL_SO", false))
+ {
+ SequenceOntologyFactory.setInstance(new SequenceOntology());
+ }
+
if (!headless)
{
desktop = new Desktop();
@@ -234,7 +342,6 @@ public class Jalview
Cache.log.debug("Starting questionnaire with default url: "
+ defurl);
desktop.checkForQuestionnaire(defurl);
-
}
}
}
@@ -242,17 +349,21 @@ public class Jalview
{
System.err.println("CMD [-noquestionnaire] executed successfully!");
}
- desktop.checkForNews();
- }
- if (!isHeadlessMode())
- {
+ if (!aparser.contains("nonews"))
+ {
+ desktop.checkForNews();
+ }
+
BioJsHTMLOutput.updateBioJS();
}
- String file = null, protocol = null, format = null, data = null;
- jalview.io.FileLoader fileLoader = new jalview.io.FileLoader(!headless);
- Vector getFeatures = null; // vector of das source nicknames to fetch
+ String file = null, data = null;
+ FileFormatI format = null;
+ DataSourceType protocol = null;
+ FileLoader fileLoader = new FileLoader(!headless);
+ Vector getFeatures = null; // vector of das source nicknames to
+ // fetch
// features from
// loading is done.
String groovyscript = null; // script to execute after all loading is
@@ -266,8 +377,8 @@ public class Jalview
System.out.println("No files to open!");
System.exit(1);
}
- String vamsasImport = aparser.getValue("vdoc"), vamsasSession = aparser
- .getValue("vsess");
+ String vamsasImport = aparser.getValue("vdoc");
+ String vamsasSession = aparser.getValue("vsess");
if (vamsasImport != null || vamsasSession != null)
{
if (desktop == null || headless)
@@ -282,13 +393,13 @@ public class Jalview
{
try
{
- String viprotocol = jalview.io.AppletFormatAdapter
+ DataSourceType viprotocol = AppletFormatAdapter
.checkProtocol(vamsasImport);
- if (viprotocol == jalview.io.FormatAdapter.FILE)
+ if (viprotocol == DataSourceType.FILE)
{
inSession = desktop.vamsasImport(new File(vamsasImport));
}
- else if (viprotocol == jalview.io.FormatAdapter.URL)
+ else if (viprotocol == DataSourceType.URL)
{
inSession = desktop.vamsasImport(new URL(vamsasImport));
}
@@ -365,7 +476,7 @@ public class Jalview
if (!file.startsWith("http://"))
{
- if (!(new java.io.File(file)).exists())
+ if (!(new File(file)).exists())
{
System.out.println("Can't find " + file);
if (headless)
@@ -375,9 +486,15 @@ public class Jalview
}
}
- protocol = jalview.io.AppletFormatAdapter.checkProtocol(file);
+ protocol = AppletFormatAdapter.checkProtocol(file);
- format = new jalview.io.IdentifyFile().Identify(file, protocol);
+ try
+ {
+ format = new IdentifyFile().identify(file, protocol);
+ } catch (FileFormatException e1)
+ {
+ // TODO ?
+ }
AlignFrame af = fileLoader.LoadFileWaitTillLoaded(file, protocol,
format);
@@ -387,23 +504,16 @@ public class Jalview
}
else
{
- Desktop.setCurrentAlignFrame(af);
+ setCurrentAlignFrame(af);
data = aparser.getValue("colour", true);
if (data != null)
{
data.replaceAll("%20", " ");
- jalview.schemes.ColourSchemeI cs = jalview.schemes.ColourSchemeProperty
- .getColour(af.getViewport().getAlignment(), data);
+ ColourSchemeI cs = ColourSchemeProperty.getColourScheme(af
+ .getViewport().getAlignment(), data);
- if (cs == null)
- {
- jalview.schemes.UserColourScheme ucs = new jalview.schemes.UserColourScheme(
- "white");
- ucs.parseAppletParameter(data);
- cs = ucs;
- }
- else
+ if (cs != null)
{
System.out.println("CMD [-color " + data
+ "] executed successfully!");
@@ -416,7 +526,7 @@ public class Jalview
if (data != null)
{
af.parseFeaturesFile(data,
- jalview.io.AppletFormatAdapter.checkProtocol(data));
+ AppletFormatAdapter.checkProtocol(data));
// System.out.println("Added " + data);
System.out.println("CMD groups[-" + data
+ "] executed successfully!");
@@ -425,7 +535,7 @@ public class Jalview
if (data != null)
{
af.parseFeaturesFile(data,
- jalview.io.AppletFormatAdapter.checkProtocol(data));
+ AppletFormatAdapter.checkProtocol(data));
// System.out.println("Added " + data);
System.out.println("CMD [-features " + data
+ "] executed successfully!");
@@ -473,8 +583,8 @@ public class Jalview
{
System.out.println("CMD [-tree " + data
+ "] executed successfully!");
- fin = new jalview.io.NewickFile(data,
- jalview.io.AppletFormatAdapter.checkProtocol(data));
+ fin = new NewickFile(data,
+ AppletFormatAdapter.checkProtocol(data));
if (fin != null)
{
af.getViewport().setCurrentTree(
@@ -514,60 +624,73 @@ public class Jalview
{
// Execute the groovy script after we've done all the rendering stuff
// and before any images or figures are generated.
- if (jalview.bin.Cache.groovyJarsPresent())
- {
- System.out.println("Executing script " + groovyscript);
- executeGroovyScript(groovyscript, new Object[] { desktop, af });
-
- System.out.println("CMD groovy[" + groovyscript
- + "] executed successfully!");
- }
- else
- {
- System.err
- .println("Sorry. Groovy Support is not available, so ignoring the provided groovy script "
- + groovyscript);
- }
+ System.out.println("Executing script " + groovyscript);
+ executeGroovyScript(groovyscript, af);
+ System.out.println("CMD groovy[" + groovyscript
+ + "] executed successfully!");
groovyscript = null;
}
String imageName = "unnamed.png";
while (aparser.getSize() > 1)
{
- format = aparser.nextValue();
+ String outputFormat = aparser.nextValue();
file = aparser.nextValue();
- if (format.equalsIgnoreCase("png"))
+ if (outputFormat.equalsIgnoreCase("png"))
{
- af.createPNG(new java.io.File(file));
- imageName = (new java.io.File(file)).getName();
+ af.createPNG(new File(file));
+ imageName = (new File(file)).getName();
System.out.println("Creating PNG image: " + file);
continue;
}
- else if (format.equalsIgnoreCase("svg"))
+ else if (outputFormat.equalsIgnoreCase("svg"))
{
- File imageFile = new java.io.File(file);
+ File imageFile = new File(file);
imageName = imageFile.getName();
af.createSVG(imageFile);
System.out.println("Creating SVG image: " + file);
continue;
}
- else if (format.equalsIgnoreCase("html"))
+ else if (outputFormat.equalsIgnoreCase("html"))
{
- File imageFile = new java.io.File(file);
+ File imageFile = new File(file);
imageName = imageFile.getName();
- new HtmlSvgOutput(new java.io.File(file), af.alignPanel);
+ HtmlSvgOutput htmlSVG = new HtmlSvgOutput(af.alignPanel);
+ htmlSVG.exportHTML(file);
+
System.out.println("Creating HTML image: " + file);
continue;
}
- else if (format.equalsIgnoreCase("imgMap"))
+ else if (outputFormat.equalsIgnoreCase("biojsmsa"))
{
- af.createImageMap(new java.io.File(file), imageName);
+ if (file == null)
+ {
+ System.err.println("The output html file must not be null");
+ return;
+ }
+ try
+ {
+ BioJsHTMLOutput
+ .refreshVersionInfo(BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY);
+ } catch (URISyntaxException e)
+ {
+ e.printStackTrace();
+ }
+ BioJsHTMLOutput bjs = new BioJsHTMLOutput(af.alignPanel);
+ bjs.exportHTML(file);
+ System.out.println("Creating BioJS MSA Viwer HTML file: "
+ + file);
+ continue;
+ }
+ else if (outputFormat.equalsIgnoreCase("imgMap"))
+ {
+ af.createImageMap(new File(file), imageName);
System.out.println("Creating image map: " + file);
continue;
}
- else if (format.equalsIgnoreCase("eps"))
+ else if (outputFormat.equalsIgnoreCase("eps"))
{
- File outputFile = new java.io.File(file);
+ File outputFile = new File(file);
System.out.println("Creating EPS file: "
+ outputFile.getAbsolutePath());
af.createEPS(outputFile);
@@ -614,20 +737,26 @@ public class Jalview
jalview.bin.Cache.removeProperty("STARTUP_FILE");
}
- protocol = "File";
+ protocol = DataSourceType.FILE;
if (file.indexOf("http:") > -1)
{
- protocol = "URL";
+ protocol = DataSourceType.URL;
}
if (file.endsWith(".jar"))
{
- format = "Jalview";
+ format = FileFormat.Jalview;
}
else
{
- format = new jalview.io.IdentifyFile().Identify(file, protocol);
+ try
+ {
+ format = new IdentifyFile().identify(file, protocol);
+ } catch (FileFormatException e)
+ {
+ // TODO what?
+ }
}
startUpAlframe = fileLoader.LoadFileWaitTillLoaded(file, protocol,
@@ -649,11 +778,10 @@ public class Jalview
// Once all other stuff is done, execute any groovy scripts (in order)
if (groovyscript != null)
{
- if (jalview.bin.Cache.groovyJarsPresent())
+ if (Cache.groovyJarsPresent())
{
System.out.println("Executing script " + groovyscript);
- executeGroovyScript(groovyscript, new Object[] { desktop,
- startUpAlframe });
+ executeGroovyScript(groovyscript, startUpAlframe);
}
else
{
@@ -695,10 +823,12 @@ public class Jalview
+ "-png FILE\tCreate PNG image FILE from alignment.\n"
+ "-svg FILE\tCreate SVG image FILE from alignment.\n"
+ "-html FILE\tCreate HTML file from alignment.\n"
+ + "-biojsMSA FILE\tCreate BioJS MSA Viewer HTML file from alignment.\n"
+ "-imgMap FILE\tCreate HTML file FILE with image map of PNG image.\n"
+ "-eps FILE\tCreate EPS file FILE from alignment.\n"
+ "-questionnaire URL\tQueries the given URL for information about any Jalview user questionnaires.\n"
+ "-noquestionnaire\tTurn off questionnaire check.\n"
+ + "-nonews\tTurn off check for Jalview news.\n"
+ "-nousagestats\tTurn off google analytics tracking for this session.\n"
+ "-sortbytree OR -nosortbytree\tEnable or disable sorting of the given alignment by the given tree\n"
// +
@@ -720,8 +850,8 @@ public class Jalview
/**
* start a User Config prompt asking if we can log usage statistics.
*/
- jalview.gui.PromptUserConfig prompter = new jalview.gui.PromptUserConfig(
- desktop.desktop,
+ PromptUserConfig prompter = new PromptUserConfig(
+ Desktop.desktop,
"USAGESTATS",
"Jalview Usage Statistics",
"Do you want to help make Jalview better by enabling "
@@ -729,6 +859,7 @@ public class Jalview
+ "\n\n(you can enable or disable usage tracking in the preferences)",
new Runnable()
{
+ @Override
public void run()
{
Cache.log
@@ -738,6 +869,7 @@ public class Jalview
}
}, new Runnable()
{
+ @Override
public void run()
{
Cache.log.debug("Not enabling Google Tracking.");
@@ -755,14 +887,8 @@ public class Jalview
* the Jalview Desktop object passed in to the groovy binding as the
* 'Jalview' object.
*/
- private static void executeGroovyScript(String groovyscript,
- Object[] jalviewContext)
+ private void executeGroovyScript(String groovyscript, AlignFrame af)
{
- if (jalviewContext == null)
- {
- System.err
- .println("Sorry. Groovy support is currently only available when running with the Jalview GUI enabled.");
- }
/**
* for scripts contained in files
*/
@@ -779,8 +905,8 @@ public class Jalview
tfile = File.createTempFile("jalview", "groovy");
PrintWriter outfile = new PrintWriter(new OutputStreamWriter(
new FileOutputStream(tfile)));
- BufferedReader br = new BufferedReader(
- new java.io.InputStreamReader(System.in));
+ BufferedReader br = new BufferedReader(new InputStreamReader(
+ System.in));
String line = null;
while ((line = br.readLine()) != null)
{
@@ -844,75 +970,23 @@ public class Jalview
}
}
}
- boolean success = false;
try
{
- /*
- * The following code performs the GroovyScriptEngine invocation using
- * reflection, and is equivalent to this fragment from the embedding
- * groovy documentation on the groovy site: import
- * groovy.lang.Binding; import groovy.util.GroovyScriptEngine;
- *
- * String[] roots = new String[] { "/my/groovy/script/path" };
- * GroovyScriptEngine gse = new GroovyScriptEngine(roots); Binding binding
- * = new Binding(); binding.setVariable("input", "world");
- * gse.run("hello.groovy", binding);
- */
- Class>[] bspec;
- Object[] binding;
- int blen = ((jalviewContext[0] == null) ? 0 : 1)
- + ((jalviewContext[1] == null) ? 0 : 1);
- String cnames[] = new String[] { "Jalview", "currentAlFrame" };
- bspec = new Class[blen * 2];
- binding = new Object[blen * 2];
- blen = 0;
- ClassLoader cl = null;
Map vbinding = new HashMap();
- for (int jc = 0; jc < jalviewContext.length; jc++)
+ vbinding.put("Jalview", this);
+ if (af != null)
{
- if (jalviewContext[jc] != null)
- {
- if (cl == null)
- {
- cl = jalviewContext[jc].getClass().getClassLoader();
- }
- bspec[blen * 2] = String.class;
- bspec[blen * 2 + 1] = Object.class;
- binding[blen * 2] = cnames[jc];
- binding[blen * 2 + 1] = jalviewContext[jc];
- vbinding.put(cnames[jc], jalviewContext[jc]);
- blen++;
- }
+ vbinding.put("currentAlFrame", af);
}
- Class> gbindingc = cl.loadClass("groovy.lang.Binding");
- Constructor> gbcons;
- Object gbinding;
- try
- {
- gbcons = gbindingc.getConstructor(Map.class);
- gbinding = gbcons.newInstance(vbinding);
- } catch (NoSuchMethodException x)
+ Binding gbinding = new Binding(vbinding);
+ GroovyScriptEngine gse = new GroovyScriptEngine(new URL[] { sfile });
+ gse.run(sfile.toString(), gbinding);
+ if ("STDIN".equals(groovyscript))
{
- // old style binding config - using series of string/object values to
- // setVariable.
- gbcons = gbindingc.getConstructor();
- gbinding = gbcons.newInstance();
- java.lang.reflect.Method setvar = gbindingc.getMethod(
- "setVariable", bspec);
- setvar.invoke(gbinding, binding);
+ // delete temp file that we made -
+ // only if it was successfully executed
+ tfile.delete();
}
-
- Class> gsec = cl.loadClass("groovy.util.GroovyScriptEngine");
- Constructor> gseccons = gsec
- .getConstructor(new Class[] { URL[].class }); // String[].class
- // });
- Object gse = gseccons
- .newInstance(new Object[] { new URL[] { sfile } }); // .toString()
- // } });
- java.lang.reflect.Method run = gsec.getMethod("run", new Class[] {
- String.class, gbindingc });
- run.invoke(gse, new Object[] { sfile.toString(), gbinding });
- success = true;
} catch (Exception e)
{
System.err.println("Exception Whilst trying to execute file " + sfile
@@ -920,12 +994,6 @@ public class Jalview
e.printStackTrace(System.err);
}
- if (success && groovyscript.equals("STDIN"))
- {
- // delete temp file that we made - but only if it was successfully
- // executed
- tfile.delete();
- }
}
/**
@@ -933,16 +1001,15 @@ public class Jalview
*
* @return vector of DAS source nicknames to retrieve from
*/
- private static Vector checkDasArguments(ArgsParser aparser)
+ private static Vector checkDasArguments(ArgsParser aparser)
{
- Vector source = null;
+ Vector source = null;
String data;
String locsources = Cache.getProperty(Cache.DAS_LOCAL_SOURCE);
while ((data = aparser.getValue("dasserver", true)) != null)
{
String nickname = null;
String url = null;
- boolean seq = false, feat = true;
int pos = data.indexOf('=');
// determine capabilities
if (pos > 0)
@@ -972,7 +1039,7 @@ public class Jalview
+ nickname + "|" + url);
if (source == null)
{
- source = new Vector();
+ source = new Vector();
}
source.addElement(nickname);
}
@@ -990,7 +1057,7 @@ public class Jalview
System.out.println("adding source '" + data + "'");
if (source == null)
{
- source = new Vector();
+ source = new Vector();
}
source.addElement(data);
}
@@ -1002,7 +1069,8 @@ public class Jalview
*
* @param dasSources
*/
- private static FeatureFetcher startFeatureFetching(final Vector dasSources)
+ private FeatureFetcher startFeatureFetching(
+ final Vector dasSources)
{
FeatureFetcher ff = new FeatureFetcher();
AlignFrame afs[] = Desktop.getAlignFrames();
@@ -1026,173 +1094,37 @@ public class Jalview
}
return false;
}
-}
-
-/**
- * Notes: this argParser does not distinguish between parameter switches,
- * parameter values and argument text. If an argument happens to be identical to
- * a parameter, it will be taken as such (even though it didn't have a '-'
- * prefixing it).
- *
- * @author Andrew Waterhouse and JBP documented.
- *
- */
-
-class rnabuttonlistener implements ActionListener
-{
- public void actionPerformed(ActionEvent arg0)
- {
- System.out.println("Good idea ! ");
-
- }
-}
-class pbuttonlistener implements ActionListener
-{
- public void actionPerformed(ActionEvent arg0)
+ public AlignFrame[] getAlignFrames()
{
+ return desktop == null ? new AlignFrame[] { getCurrentAlignFrame() }
+ : Desktop.getAlignFrames();
}
-}
-
-class ArgsParser
-{
- Vector vargs = null;
-
- public ArgsParser(String[] args)
- {
- vargs = new Vector();
- for (int i = 0; i < args.length; i++)
- {
- String arg = args[i].trim();
- if (arg.charAt(0) == '-')
- {
- arg = arg.substring(1);
- }
- vargs.addElement(arg);
- }
- }
/**
- * check for and remove first occurence of arg+parameter in arglist.
- *
- * @param arg
- * @return return the argument following the given arg if arg was in list.
+ * Quit method delegates to Desktop.quit - unless running in headless mode
+ * when it just ends the JVM
*/
- public String getValue(String arg)
+ public void quit()
{
- return getValue(arg, false);
- }
-
- public String getValue(String arg, boolean utf8decode)
- {
- int index = vargs.indexOf(arg);
- String dc = null, ret = null;
- if (index != -1)
- {
- ret = vargs.elementAt(index + 1).toString();
- vargs.removeElementAt(index);
- vargs.removeElementAt(index);
- if (utf8decode && ret != null)
- {
- try
- {
- dc = URLDecoder.decode(ret, "UTF-8");
- ret = dc;
- } catch (Exception e)
- {
- // TODO: log failure to decode
- }
- }
- }
- return ret;
- }
-
- /**
- * check for and remove first occurence of arg in arglist.
- *
- * @param arg
- * @return true if arg was present in argslist.
- */
- public boolean contains(String arg)
- {
- if (vargs.contains(arg))
+ if (desktop != null)
{
- vargs.removeElement(arg);
- return true;
+ desktop.quit();
}
else
{
- return false;
+ System.exit(0);
}
}
- public String nextValue()
- {
- return vargs.remove(0).toString();
- }
-
- public int getSize()
- {
- return vargs.size();
- }
-
-}
-
-/**
- * keep track of feature fetching tasks.
- *
- * @author JimP
- *
- */
-class FeatureFetcher
-{
- /*
- * TODO: generalise to track all jalview events to orchestrate batch
- * processing events.
- */
-
- private int queued = 0;
-
- private int running = 0;
-
- public FeatureFetcher()
- {
-
- }
-
- public void addFetcher(final AlignFrame af, final Vector dasSources)
+ public static AlignFrame getCurrentAlignFrame()
{
- final long id = System.currentTimeMillis();
- queued++;
- final FeatureFetcher us = this;
- new Thread(new Runnable()
- {
-
- public void run()
- {
- synchronized (us)
- {
- queued--;
- running++;
- }
-
- af.setProgressBar(MessageManager
- .getString("status.das_features_being_retrived"), id);
- af.featureSettings_actionPerformed(null);
- af.featureSettings.fetchDasFeatures(dasSources, true);
- af.setProgressBar(null, id);
- synchronized (us)
- {
- running--;
- }
- }
- }).start();
+ return Jalview.currentAlignFrame;
}
- public synchronized boolean allFinished()
+ public static void setCurrentAlignFrame(AlignFrame currentAlignFrame)
{
- return queued == 0 && running == 0;
+ Jalview.currentAlignFrame = currentAlignFrame;
}
-
}