X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=177d56f782e65c9a75af73d6e25e0d976e6980fb;hb=7fef0501bb64f11080bdb93ee0824416d84784cc;hp=f80f3418d3c3ad94e819a7fb495aedb5f7363473;hpb=9d139ca8d1af8f0f2d78193d418ae9e9168a3e8a;p=jalview.git
diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index f80f341..177d56f 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -1,6 +1,6 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
@@ -22,6 +22,8 @@ package jalview.bin;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
+import jalview.io.BioJsHTMLOutput;
+import jalview.io.HtmlSvgOutput;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.ws.jws2.Jws2Discoverer;
@@ -44,11 +46,12 @@ import java.security.CodeSource;
import java.security.PermissionCollection;
import java.security.Permissions;
import java.security.Policy;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
/**
* Main class for Jalview Application
@@ -79,11 +82,6 @@ public class Jalview
}
/**
- * Put protein=true for get a protein example
- */
- private static boolean protein = false;
-
- /**
* main class for Jalview application
*
* @param args
@@ -96,12 +94,6 @@ public class Jalview
System.out.println(System.getProperty("os.arch") + " "
+ System.getProperty("os.name") + " "
+ System.getProperty("os.version"));
- if (new Platform().isAMac())
- {
- System.setProperty("com.apple.mrj.application.apple.menu.about.name",
- "Jalview");
- System.setProperty("apple.laf.useScreenMenuBar", "true");
- }
ArgsParser aparser = new ArgsParser(args);
boolean headless = false;
@@ -117,7 +109,14 @@ public class Jalview
System.setProperty("java.awt.headless", "true");
headless = true;
}
- Cache.loadProperties(aparser.getValue("props")); // must do this before
+ String usrPropsFile = aparser.getValue("props");
+ Cache.loadProperties(usrPropsFile); // must do this before
+ if (usrPropsFile != null)
+ {
+ System.out.println("CMD [-props " + usrPropsFile
+ + "] executed successfully!");
+ }
+
// anything else!
final String jabawsUrl = aparser.getValue("jabaws");
@@ -126,6 +125,8 @@ public class Jalview
try
{
Jws2Discoverer.getDiscoverer().setPreferredUrl(jabawsUrl);
+ System.out.println("CMD [-jabaws " + jabawsUrl
+ + "] executed successfully!");
} catch (MalformedURLException e)
{
System.err.println("Invalid jabaws parameter: " + jabawsUrl
@@ -177,6 +178,21 @@ public class Jalview
} catch (Exception ex)
{
}
+ if (new Platform().isAMac())
+ {
+ System.setProperty("com.apple.mrj.application.apple.menu.about.name",
+ "Jalview");
+ System.setProperty("apple.laf.useScreenMenuBar", "true");
+ try
+ {
+ UIManager.setLookAndFeel(ch.randelshofer.quaqua.QuaquaManager
+ .getLookAndFeel());
+ } catch (UnsupportedLookAndFeelException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
if (!headless)
{
@@ -188,6 +204,11 @@ public class Jalview
{
startUsageStats(desktop);
}
+ else
+ {
+ System.err.println("CMD [-nousagestats] executed successfully!");
+ }
+
if (!aparser.contains("noquestionnaire"))
{
String url = aparser.getValue("questionnaire");
@@ -197,6 +218,8 @@ public class Jalview
// questionnaire
Cache.log.debug("Starting questionnaire url at " + url);
desktop.checkForQuestionnaire(url);
+ System.out.println("CMD questionnaire[-" + url
+ + "] executed successfully!");
}
else
{
@@ -215,11 +238,21 @@ public class Jalview
}
}
}
+ else
+ {
+ System.err
+.println("CMD [-noquestionnaire] executed successfully!");
+ }
desktop.checkForNews();
}
+ if (!isHeadlessMode())
+ {
+ BioJsHTMLOutput.updateBioJS();
+ }
+
String file = null, protocol = null, format = null, data = null;
- jalview.io.FileLoader fileLoader = new jalview.io.FileLoader();
+ jalview.io.FileLoader fileLoader = new jalview.io.FileLoader(!headless);
Vector getFeatures = null; // vector of das source nicknames to fetch
// features from
// loading is done.
@@ -328,7 +361,7 @@ public class Jalview
desktop.setProgressBar(MessageManager.getString("status.processing_commandline_args"),
progress = System.currentTimeMillis());
}
- System.out.println("Opening file: " + file);
+ System.out.println("CMD [-open " + file + "] executed successfully!");
if (!file.startsWith("http://"))
{
@@ -370,8 +403,11 @@ public class Jalview
ucs.parseAppletParameter(data);
cs = ucs;
}
-
- System.out.println("colour is " + data);
+ else
+ {
+ System.out.println("CMD [-color " + data
+ + "] executed successfully!");
+ }
af.changeColour(cs);
}
@@ -381,30 +417,55 @@ public class Jalview
{
af.parseFeaturesFile(data,
jalview.io.AppletFormatAdapter.checkProtocol(data));
- System.out.println("Added " + data);
+ // System.out.println("Added " + data);
+ System.out.println("CMD groups[-" + data
+ + "] executed successfully!");
}
data = aparser.getValue("features", true);
if (data != null)
{
af.parseFeaturesFile(data,
jalview.io.AppletFormatAdapter.checkProtocol(data));
- System.out.println("Added " + data);
+ // System.out.println("Added " + data);
+ System.out.println("CMD [-features " + data
+ + "] executed successfully!");
}
data = aparser.getValue("annotations", true);
if (data != null)
{
af.loadJalviewDataFile(data, null, null, null);
- System.out.println("Added " + data);
+ // System.out.println("Added " + data);
+ System.out.println("CMD [-annotations " + data
+ + "] executed successfully!");
}
// set or clear the sortbytree flag.
if (aparser.contains("sortbytree"))
{
af.getViewport().setSortByTree(true);
+ if (af.getViewport().getSortByTree())
+ {
+ System.out
+.println("CMD [-sortbytree] executed successfully!");
+ }
+ }
+ if (aparser.contains("no-annotation"))
+ {
+ af.getViewport().setShowAnnotation(false);
+ if (!af.getViewport().isShowAnnotation())
+ {
+ System.out
+.println("CMD no-annotation executed successfully!");
+ }
}
if (aparser.contains("nosortbytree"))
{
af.getViewport().setSortByTree(false);
+ if (!af.getViewport().getSortByTree())
+ {
+ System.out
+ .println("CMD [-nosortbytree] executed successfully!");
+ }
}
data = aparser.getValue("tree", true);
if (data != null)
@@ -412,13 +473,14 @@ public class Jalview
jalview.io.NewickFile fin = null;
try
{
+ System.out.println("CMD [-tree " + data
+ + "] executed successfully!");
fin = new jalview.io.NewickFile(data,
jalview.io.AppletFormatAdapter.checkProtocol(data));
if (fin != null)
{
af.getViewport().setCurrentTree(
af.ShowNewickTree(fin, data).getTree());
- System.out.println("Added tree " + data);
}
} catch (IOException ex)
{
@@ -459,6 +521,9 @@ public class Jalview
System.out.println("Executing script " + groovyscript);
executeGroovyScript(groovyscript, new Object[]
{ desktop, af });
+
+ System.out.println("CMD groovy[" + groovyscript
+ + "] executed successfully!");
}
else
{
@@ -489,6 +554,14 @@ public class Jalview
System.out.println("Creating SVG image: " + file);
continue;
}
+ else if (format.equalsIgnoreCase("html"))
+ {
+ File imageFile = new java.io.File(file);
+ imageName = imageFile.getName();
+ new HtmlSvgOutput(new java.io.File(file), af.alignPanel);
+ System.out.println("Creating HTML image: " + file);
+ continue;
+ }
else if (format.equalsIgnoreCase("imgMap"))
{
af.createImageMap(new java.io.File(file), imageName);
@@ -497,8 +570,10 @@ public class Jalview
}
else if (format.equalsIgnoreCase("eps"))
{
- System.out.println("Creating EPS file: " + file);
- af.createEPS(new java.io.File(file));
+ File outputFile = new java.io.File(file);
+ System.out.println("Creating EPS file: "
+ + outputFile.getAbsolutePath());
+ af.createEPS(outputFile);
continue;
}
@@ -527,8 +602,7 @@ public class Jalview
// ////////////////////
if (!headless && file == null && vamsasImport == null
- && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true)
- && protein == true)
+ && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true))
{
file = jalview.bin.Cache.getDefault(
"STARTUP_FILE",
@@ -619,8 +693,11 @@ public class Jalview
+ "-pileup FILE\tCreate alignment file FILE in Pileup format\n"
+ "-pir FILE\tCreate alignment file FILE in PIR format.\n"
+ "-blc FILE\tCreate alignment file FILE in BLC format.\n"
+ + "-json FILE\tCreate alignment file FILE in JSON format.\n"
+ "-jalview FILE\tCreate alignment file FILE in Jalview format.\n"
+ "-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"
+ "-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"
@@ -658,7 +735,7 @@ public class Jalview
public void run()
{
Cache.log
- .info("Initialising googletracker for usage stats.");
+ .debug("Initialising googletracker for usage stats.");
Cache.initGoogleTracker();
Cache.log.debug("Tracking enabled.");
}
@@ -666,7 +743,7 @@ public class Jalview
{
public void run()
{
- Cache.log.info("Not enabling Google Tracking.");
+ Cache.log.debug("Not enabling Google Tracking.");
}
}, null, true);
desktop.addDialogThread(prompter);
@@ -784,7 +861,7 @@ public class Jalview
* = new Binding(); binding.setVariable("input", "world");
* gse.run("hello.groovy", binding);
*/
- Class[] bspec;
+ Class>[] bspec;
Object[] binding;
int blen = ((jalviewContext[0] == null) ? 0 : 1)
+ ((jalviewContext[1] == null) ? 0 : 1);
@@ -794,7 +871,7 @@ public class Jalview
binding = new Object[blen * 2];
blen = 0;
ClassLoader cl = null;
- Map vbinding = new Hashtable();
+ Map vbinding = new HashMap();
for (int jc = 0; jc < jalviewContext.length; jc++)
{
if (jalviewContext[jc] != null)
@@ -811,8 +888,8 @@ public class Jalview
blen++;
}
}
- Class gbindingc = cl.loadClass("groovy.lang.Binding");
- Constructor gbcons;
+ Class> gbindingc = cl.loadClass("groovy.lang.Binding");
+ Constructor> gbcons;
Object gbinding;
try
{
@@ -822,15 +899,15 @@ public class Jalview
{
// old style binding config - using series of string/object values to
// setVariable.
- gbcons = gbindingc.getConstructor(null);
- gbinding = gbcons.newInstance(null);
+ gbcons = gbindingc.getConstructor();
+ gbinding = gbcons.newInstance();
java.lang.reflect.Method setvar = gbindingc.getMethod(
"setVariable", bspec);
setvar.invoke(gbinding, binding);
}
- ;
- Class gsec = cl.loadClass("groovy.util.GroovyScriptEngine");
- Constructor gseccons = gsec.getConstructor(new Class[]
+
+ 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[]
@@ -903,6 +980,8 @@ public class Jalview
}
source.addElement(nickname);
}
+ System.out.println("CMD [-dasserver " + data
+ + "] executed successfully!");
} // loop until no more server entries are found.
if (locsources != null && locsources.indexOf('|') > -1)
{
@@ -930,7 +1009,7 @@ public class Jalview
private static FeatureFetcher startFeatureFetching(final Vector dasSources)
{
FeatureFetcher ff = new FeatureFetcher();
- AlignFrame afs[] = Desktop.getAlignframes();
+ AlignFrame afs[] = Desktop.getAlignFrames();
if (afs == null || afs.length == 0)
{
return null;
@@ -941,6 +1020,16 @@ public class Jalview
}
return ff;
}
+
+ public static boolean isHeadlessMode()
+ {
+ String isheadless = System.getProperty("java.awt.headless");
+ if (isheadless != null && isheadless.equalsIgnoreCase("true"))
+ {
+ return true;
+ }
+ return false;
+ }
}
/**
@@ -1109,4 +1198,4 @@ class FeatureFetcher
return queued == 0 && running == 0;
}
-};
+}