X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fbin%2FJalview.java;h=00a042d6b1f6b11d39decfaf70a831f3009ae4d8;hb=a23cc416cd520ac6dec6052591575b264f5d25bc;hp=7920fa965ab5d917c7a456e5734dc32502334292;hpb=ba53bdc57a25723eb975110fe457a2b82a138400;p=jalview.git
diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 7920fa9..00a042d 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -1,22 +1,35 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
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;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
@@ -33,12 +46,12 @@ import java.security.CodeSource;
import java.security.PermissionCollection;
import java.security.Permissions;
import java.security.Policy;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
-import javax.swing.*;
-
-import jalview.gui.*;
-import jalview.util.Platform;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
/**
* Main class for Jalview Application
@@ -81,56 +94,37 @@ 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;
if (aparser.contains("help") || aparser.contains("h"))
{
- System.out
- .println("Usage: jalview -open [FILE] [OUTPUT_FORMAT] [OUTPUT_FILE]\n\n"
- + "-nodisplay\tRun Jalview without User Interface.\n"
- + "-props FILE\tUse the given Jalview properties file instead of users default.\n"
- + "-colour COLOURSCHEME\tThe colourscheme to be applied to the alignment\n"
- + "-annotations FILE\tAdd precalculated annotations to the alignment.\n"
- + "-tree FILE\tLoad the given newick format tree file onto the alignment\n"
- + "-features FILE\tUse the given file to mark features on the alignment.\n"
- + "-fasta FILE\tCreate alignment file FILE in Fasta format.\n"
- + "-clustal FILE\tCreate alignment file FILE in Clustal format.\n"
- + "-pfam FILE\tCreate alignment file FILE in PFAM format.\n"
- + "-msf FILE\tCreate alignment file FILE in MSF format.\n"
- + "-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"
- + "-jalview FILE\tCreate alignment file FILE in Jalview format.\n"
- + "-png FILE\tCreate PNG image 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"
- + "-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"
- // +
- // "-setprop PROPERTY=VALUE\tSet the given Jalview property, after all other properties files have been read\n\t (quote the 'PROPERTY=VALUE' pair to ensure spaces are passed in correctly)"
- + "-dasserver nickname=URL\tAdd and enable a das server with given nickname\n\t\t\t(alphanumeric or underscores only) for retrieval of features for all alignments.\n"
- + "\t\t\tSources that also support the sequence command may be specified by prepending the URL with sequence:\n"
- + "\t\t\t e.g. sequence:http://localdas.somewhere.org/das/source)\n"
- + "-fetchfrom nickname\tQuery nickname for features for the alignments and display them.\n"
- // +
- // "-vdoc vamsas-document\tImport vamsas document into new session or join existing session with same URN\n"
- // + "-vses vamsas-session\tJoin session with given URN\n"
- + "-groovy FILE\tExecute groovy script in FILE, after all other arguments have been processed (if FILE is the text 'STDIN' then the file will be read from STDIN)\n"
- + "\n~Read documentation in Application or visit http://www.jalview.org for description of Features and Annotations file~\n\n");
+ showUsage();
System.exit(0);
}
+ if (aparser.contains("nodisplay") || aparser.contains("nogui")
+ || aparser.contains("headless"))
+ {
+ System.setProperty("java.awt.headless", "true");
+ headless = true;
+ }
Cache.loadProperties(aparser.getValue("props")); // must do this before
// anything else!
+
+ final String jabawsUrl = aparser.getValue("jabaws");
+ if (jabawsUrl != null)
+ {
+ try
+ {
+ Jws2Discoverer.getDiscoverer().setPreferredUrl(jabawsUrl);
+ } catch (MalformedURLException e)
+ {
+ System.err.println("Invalid jabaws parameter: " + jabawsUrl
+ + " ignored");
+ }
+ }
+
String defs = aparser.getValue("setprop");
while (defs != null)
{
@@ -148,16 +142,13 @@ public class Jalview
}
defs = aparser.getValue("setprop");
}
- if (aparser.contains("nodisplay"))
- {
- System.setProperty("java.awt.headless", "true");
- }
if (System.getProperty("java.awt.headless") != null
&& System.getProperty("java.awt.headless").equals("true"))
{
headless = true;
}
- System.setProperty("http.agent", "Jalview Desktop/"+Cache.getDefault("VERSION", "Unknown"));
+ System.setProperty("http.agent",
+ "Jalview Desktop/" + Cache.getDefault("VERSION", "Unknown"));
try
{
Cache.initLogger();
@@ -178,6 +169,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)
{
@@ -219,6 +225,8 @@ public class Jalview
desktop.checkForNews();
}
+ BioJsHTMLOutput.updateBioJS();
+
String file = null, protocol = null, format = null, data = null;
jalview.io.FileLoader fileLoader = new jalview.io.FileLoader();
Vector getFeatures = null; // vector of das source nicknames to fetch
@@ -326,7 +334,7 @@ public class Jalview
{
if (!headless)
{
- desktop.setProgressBar("Processing commandline arguments...",
+ desktop.setProgressBar(MessageManager.getString("status.processing_commandline_args"),
progress = System.currentTimeMillis());
}
System.out.println("Opening file: " + file);
@@ -403,6 +411,10 @@ public class Jalview
{
af.getViewport().setSortByTree(true);
}
+ if (aparser.contains("no-annotation"))
+ {
+ af.getViewport().setShowAnnotation(false);
+ }
if (aparser.contains("nosortbytree"))
{
af.getViewport().setSortByTree(false);
@@ -436,6 +448,7 @@ public class Jalview
{
FeatureFetcher ff = startFeatureFetching(getFeatures);
if (ff != null)
+ {
while (!ff.allFinished() || af.operationInProgress())
{
// wait around until fetching is finished.
@@ -447,6 +460,7 @@ public class Jalview
}
}
+ }
getFeatures = null; // have retrieved features - forget them now.
}
if (groovyscript != null)
@@ -480,6 +494,22 @@ public class Jalview
System.out.println("Creating PNG image: " + file);
continue;
}
+ else if (format.equalsIgnoreCase("svg"))
+ {
+ File imageFile = new java.io.File(file);
+ imageName = imageFile.getName();
+ af.createSVG(imageFile);
+ 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);
@@ -516,6 +546,7 @@ public class Jalview
// We'll only open the default file if the desktop is visible.
// And the user
// ////////////////////
+
if (!headless && file == null && vamsasImport == null
&& jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true))
{
@@ -591,6 +622,47 @@ public class Jalview
}
}
+ private static void showUsage()
+ {
+ System.out
+ .println("Usage: jalview -open [FILE] [OUTPUT_FORMAT] [OUTPUT_FILE]\n\n"
+ + "-nodisplay\tRun Jalview without User Interface.\n"
+ + "-props FILE\tUse the given Jalview properties file instead of users default.\n"
+ + "-colour COLOURSCHEME\tThe colourscheme to be applied to the alignment\n"
+ + "-annotations FILE\tAdd precalculated annotations to the alignment.\n"
+ + "-tree FILE\tLoad the given newick format tree file onto the alignment\n"
+ + "-features FILE\tUse the given file to mark features on the alignment.\n"
+ + "-fasta FILE\tCreate alignment file FILE in Fasta format.\n"
+ + "-clustal FILE\tCreate alignment file FILE in Clustal format.\n"
+ + "-pfam FILE\tCreate alignment file FILE in PFAM format.\n"
+ + "-msf FILE\tCreate alignment file FILE in MSF format.\n"
+ + "-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"
+ + "-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"
+ + "-noquestionnaire\tTurn off questionnaire check.\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"
+ // +
+ // "-setprop PROPERTY=VALUE\tSet the given Jalview property, after all other properties files have been read\n\t (quote the 'PROPERTY=VALUE' pair to ensure spaces are passed in correctly)"
+ + "-jabaws URL\tSpecify URL for Jabaws services (e.g. for a local installation).\n"
+ + "-dasserver nickname=URL\tAdd and enable a das server with given nickname\n\t\t\t(alphanumeric or underscores only) for retrieval of features for all alignments.\n"
+ + "\t\t\tSources that also support the sequence command may be specified by prepending the URL with sequence:\n"
+ + "\t\t\t e.g. sequence:http://localdas.somewhere.org/das/source)\n"
+ + "-fetchfrom nickname\tQuery nickname for features for the alignments and display them.\n"
+ // +
+ // "-vdoc vamsas-document\tImport vamsas document into new session or join existing session with same URN\n"
+ // + "-vses vamsas-session\tJoin session with given URN\n"
+ + "-groovy FILE\tExecute groovy script in FILE, after all other arguments have been processed (if FILE is the text 'STDIN' then the file will be read from STDIN)\n"
+ + "\n~Read documentation in Application or visit http://www.jalview.org for description of Features and Annotations file~\n\n");
+ }
+
private static void startUsageStats(final Desktop desktop)
{
/**
@@ -608,7 +680,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.");
}
@@ -616,7 +688,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);
@@ -734,7 +806,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);
@@ -744,7 +816,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)
@@ -761,8 +833,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
{
@@ -772,15 +844,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[]
@@ -880,7 +952,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;
@@ -902,6 +974,24 @@ public class Jalview
* @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)
+ {
+
+ }
+}
+
class ArgsParser
{
Vector vargs = null;
@@ -1024,7 +1114,7 @@ class FeatureFetcher
running++;
}
- af.setProgressBar("DAS features being retrieved...", id);
+ af.setProgressBar(MessageManager.getString("status.das_features_being_retrived"), id);
af.featureSettings_actionPerformed(null);
af.featureSettings.fetchDasFeatures(dasSources, true);
af.setProgressBar(null, id);
@@ -1040,4 +1130,5 @@ class FeatureFetcher
{
return queued == 0 && running == 0;
}
+
};