X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=3e8018bfc44d155f5a50bb1d0d791d8c6904b898;hb=46bcdb06851cdf7800d74d720d49cf6960cd0c55;hp=c11d051a49d4daef9f8343b0246e4fb98221ff70;hpb=29779ec313172ec2f5b4594f33ebee8fff264915;p=jalview.git
diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index c11d051..3e8018b 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -1,159 +1,310 @@
/*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
-*
-* This program 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 2
-* of the License, or (at your option) any later version.
-*
-* This program 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 this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-*/
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program 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 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
package jalview.bin;
import jalview.gui.*;
-import jalview.io.*;
-
-import org.apache.log4j.*;
-
-import java.awt.event.*;
-
import javax.swing.*;
+import java.util.Vector;
+
+
+/**
+ * Main class for Jalview Application
+ *
+ *
start with java -Djava.ext.dirs=$PATH_TO_LIB$ jalview.bin.Jalview
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class Jalview
+{
+
+ /**
+ * main class for Jalview application
+ *
+ * @param args open filename
+ */
+ public static void main(String[] args)
+ {
+ System.out.println("Java version: "+System.getProperty("java.version"));
+ System.out.println(System.getProperty("os.arch")+" "
+ +System.getProperty("os.name")+" "
+ +System.getProperty("os.version"));
+
+
+ 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"
+ +"-annotations FILE\tAdd precalculated annotations to 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\n~Read documentation in Application or visit http://www.jalview.org for description of Features and Annotations file~\n\n");
+ System.exit(0);
+ }
+
+ Cache.loadProperties(aparser.getValue("props")); // must do this before anything else!
+
+ 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;
+ }
+
+ try
+ {
+ Cache.initLogger();
+ }
+ catch (java.lang.NoClassDefFoundError error)
+ {
+ error.printStackTrace();
+ System.out.println(
+ "\nEssential logging libraries not found."
+ +"\nUse: java -Djava.ext.dirs=$PATH_TO_LIB$ jalview.bin.Jalview");
+ System.exit(0);
+ }
-public class Jalview extends JApplet {
- public static JApplet applet;
- Desktop frame;
+ Desktop desktop = null;
+ if( !headless )
+ {
+ try
+ {
+ UIManager.setLookAndFeel(
+ UIManager.getSystemLookAndFeelClassName()
+ // UIManager.getCrossPlatformLookAndFeelClassName()
+//"com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+//"javax.swing.plaf.metal.MetalLookAndFeel"
+//"com.sun.java.swing.plaf.windows.WindowsLookAndFeel"
+//"com.sun.java.swing.plaf.motif.MotifLookAndFeel"
+
+ );
+ }
+ catch (Exception ex)
+ {
+ }
+
+ desktop = new Desktop();
+ desktop.setVisible(true);
+ desktop.discoverer.start();
+ }
- public void init() {
- applet = this;
- Cache.loadProperties();
- jalview.gui.Preferences.initPreferences();
- frame = new Desktop();
- frame.setResizable(true);
- frame.setVisible(true);
- frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
- frame.addWindowListener(new WindowAdapter() {
- public void windowClosing(WindowEvent e) {
- applet.stop();
- applet.destroy();
- }
- });
+ String file = null, protocol = null, format = null, data=null;
+ jalview.io.FileLoader fileLoader = new jalview.io.FileLoader();
- String file = getParameter("alignment");
+ file = aparser.getValue("open");
- if (file != null) {
- jalview.bin.Cache.setProperty("LAST_DIRECTORY", file);
+ if (file == null && desktop==null)
+ {
+ System.out.println("No files to open!");
+ System.exit(1);
+ }
- String protocol = "File";
+ if(file!=null)
+ {
- if (file.indexOf("http:") > -1) {
- protocol = "URL";
+ if (!file.startsWith("http://"))
+ {
+ if (! (new java.io.File(file)).exists())
+ {
+ System.out.println("Can't find " + file);
+ if(headless)
+ System.exit(1);
+ }
}
- String format = jalview.io.IdentifyFile.Identify(file, protocol);
+ protocol = "File";
- frame.LoadFile(file, protocol, format);
- }
- }
-
- public void destroy() {
- if (applet != null) {
- applet.stop();
- } else {
- System.exit(0);
- }
-
- frame.setVisible(false);
- }
-
- private static void initLogger() {
- Logger laxis = Logger.getLogger("org.apache.axis");
- Logger lcastor = Logger.getLogger("org.exolab.castor");
- if (Cache.getProperty("logs.Axis.Level") == null) {
- Cache.setProperty("logs.Axis.Level", Level.INFO.toString());
- }
- if (Cache.getProperty("logs.Castor.Level") == null) {
- Cache.setProperty("logs.Castor.Level", Level.INFO.toString());
- }
+ if (file.indexOf("http:") > -1)
+ {
+ protocol = "URL";
+ }
- laxis.setLevel(Level.toLevel(Cache.getProperty("logs.Axis.Level")));
- lcastor.setLevel(Level.toLevel(Cache.getProperty("logs.Castor.Level")));
+ if (file.endsWith(".jar"))
+ format = "Jalview";
+ else
+ format = new jalview.io.IdentifyFile().Identify(file, protocol);
- ConsoleAppender ap = new ConsoleAppender(new SimpleLayout(),
- "System.err");
- ap.setName("JalviewLogger");
- laxis.addAppender(ap);
- lcastor.addAppender(ap);
- }
+ System.out.println("Opening: " + format + " file " + file);
- public static void main(String[] args) {
- Cache.loadProperties();
- jalview.gui.Preferences.initPreferences();
+ AlignFrame af = fileLoader.LoadFileWaitTillLoaded(file, protocol, format);
- try {
- initLogger();
- } catch (Exception e) {
- System.err.println("Problems initializing the log4j system\n");
- e.printStackTrace();
- }
+ // Must maintain ability to use the groups flag
+ data = aparser.getValue("groups");
+ if (data != null)
+ {
+ af.parseGroupsFile(data);
+ System.out.println("Added "+data);
+ }
+ data = aparser.getValue("features");
+ if (data != null)
+ {
+ af.parseGroupsFile(data);
+ System.out.println("Added "+data);
+ }
- try {
- UIManager.setLookAndFeel(
- // "javax.swing.plaf.metal.MetalLookAndFeel"
- // "javax.swing.plaf.multi.MultiLookAndFeel"
- UIManager.getSystemLookAndFeelClassName());
- } catch (Exception ex) {
- }
+ data = aparser.getValue("annotations");
+ if (data != null)
+ {
+ af.loadJalviewDataFile(data);
+ System.out.println("Added "+data);
+ }
- Desktop frame = new Desktop();
- frame.setResizable(true);
- frame.setVisible(true);
- if ((args != null) && (args.length > 0)) {
- String file = null;
+ String imageName = "unnamed.png";
+ while (aparser.getSize() > 1)
+ {
+ format = aparser.nextValue();
+ file = aparser.nextValue();
+
+ if (format.equalsIgnoreCase("png"))
+ {
+ af.createPNG(new java.io.File(file));
+ imageName = (new java.io.File(file)).getName();
+ System.out.println("Creating PNG image: " + file);
+ continue;
+ }
+ else if (format.equalsIgnoreCase("imgMap"))
+ {
+ af.createImageMap(new java.io.File(file), imageName);
+ System.out.println("Creating image map: " + file);
+ continue;
+ }
+ else if (format.equalsIgnoreCase("eps"))
+ {
+ System.out.println("Creating EPS file: " + file);
+ af.createEPS(new java.io.File(file));
+ continue;
+ }
+
+ if (af.saveAlignment(file, format))
+ System.out.println("Written alignment in " + format +
+ " format to " + file);
+ else
+ System.out.println("Error writing file " + file + " in " + format +
+ " format!!");
- if (args[0].equals("-open")) {
- file = args[1];
- } else {
- file = args[0];
}
- String protocol = "File";
-
- if (file.indexOf("http:") > -1) {
- protocol = "URL";
+ while (aparser.getSize() > 0)
+ {
+ System.out.println("Unknown arg: " + aparser.nextValue());
}
+ }
- String format = jalview.io.IdentifyFile.Identify(file, protocol);
+ // We'll only open the default file if the desktop is visible.
+ //////////////////////
+ if (
+ !headless
+ && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true)
+ )
+ {
- frame.LoadFile(file, protocol, format);
- }
+ file = jalview.bin.Cache.getDefault("STARTUP_FILE",
+ "http://www.jalview.org/examples/exampleFile.jar");
- if (jalview.gui.Preferences.showStartupFile &&
- (jalview.gui.Preferences.startupFile != null)) {
- String file = jalview.gui.Preferences.startupFile;
- String protocol = "File";
+ protocol = "File";
- if (file.indexOf("http:") > -1) {
- protocol = "URL";
+ if (file.indexOf("http:") > -1)
+ {
+ protocol = "URL";
}
- if (file.endsWith(".jar")) {
- Jalview2XML.LoadJalviewAlign(file);
- } else {
- String format = jalview.io.IdentifyFile.Identify(file, protocol);
- frame.LoadFile(file, protocol, format);
+ if (file.endsWith(".jar"))
+ {
+ new Jalview2XML().LoadJalviewAlign(file);
}
- }
+ else
+ {
+ format = new jalview.io.IdentifyFile().Identify(file, protocol);
+ desktop.LoadFile(file, protocol, format);
+ }
+ }
}
}
+
+ 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);
+ }
+ }
+
+ public String getValue(String arg)
+ {
+ int index = vargs.indexOf(arg);
+ String ret = null;
+ if (index != -1)
+ {
+ ret = vargs.elementAt(index + 1).toString();
+ vargs.removeElementAt(index);
+ vargs.removeElementAt(index);
+ }
+ return ret;
+ }
+
+ public boolean contains(String arg)
+ {
+ if(vargs.contains(arg))
+ {
+ vargs.removeElement(arg);
+ return true;
+ }
+ else
+ return false;
+ }
+
+ public String nextValue()
+ {
+ return vargs.remove(0).toString();
+ }
+
+ public int getSize()
+ {
+ return vargs.size();
+ }
+
+ }