X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=e5ad207ecd5b77f53c32f2e368c344d59c4ab5d0;hb=23d3cb8d0e4c227224587135f41132d436dc1178;hp=f05b3946d4fbba5539d3818a33d99ab8e9a5572c;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index f05b394..e5ad207 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -20,8 +20,6 @@ package jalview.bin; import jalview.gui.*; -import org.apache.log4j.*; - import javax.swing.*; import java.util.Vector; @@ -37,33 +35,6 @@ import java.util.Vector; */ public class Jalview { - /** - * Initialises the Apache Axis logger - */ - 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()); - } - - laxis.setLevel(Level.toLevel(Cache.getProperty("logs.Axis.Level"))); - lcastor.setLevel(Level.toLevel(Cache.getProperty("logs.Castor.Level"))); - - ConsoleAppender ap = new ConsoleAppender(new SimpleLayout(), - "System.err"); - ap.setName("JalviewLogger"); - laxis.addAppender(ap); - lcastor.addAppender(ap); - } /** * main class for Jalview application @@ -72,154 +43,225 @@ public class Jalview */ public static void main(String[] args) { - ArgsParser aparser = new ArgsParser(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")); - try - { - UIManager.setLookAndFeel( - // "javax.swing.plaf.metal.MetalLookAndFeel" - // "javax.swing.plaf.multi.MultiLookAndFeel" - UIManager.getSystemLookAndFeelClassName()); - } - catch (Exception ex) - { - } - Cache.loadProperties(aparser.getValue("props")); - jalview.gui.Preferences.initPreferences(); - try - { - initLogger(); - } - catch (Exception e) - { - System.err.println("Problems initializing the log4j system\n"); - } + 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! - String file = null, protocol = null, format = null, groups=null; - Desktop desktop = new Desktop(); + 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); + } - if(args==null || args.length==0) + 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(); } - else - { - 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" - +"-groups FILE\tUse the given file to mark groups on the alignment. \nGroups file is in the following tab delimited format\n" - +"TEXTSEQUENCE_IDSEQUENCE_INDEXSTART_RESIDUEEND_RESIDUECOLOUR\n" - +"SequenceID is used in preference to SequenceIndex if both are provided.\n" - +"Enter ID_NOT_SPECIFIED for SEQUENCE_ID or -1 for SEQUENCE_INDEX if unknown.\n" - +"COLOUR can be hexadecimal RGB or 'red', 'blue' etc.\n\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."); - System.exit(0); - } + String file = null, protocol = null, format = null, data=null; + jalview.io.FileLoader fileLoader = new jalview.io.FileLoader(); file = aparser.getValue("open"); - if (file == null) + if (file == null && desktop==null) { System.out.println("No files to open!"); System.exit(1); } - else if(!file.startsWith("http://")) + + if(file!=null) { - if (!(new java.io.File(file)).exists()) + + if (!file.startsWith("http://")) { - System.out.println("Can't find " + file); - System.exit(1); + if (! (new java.io.File(file)).exists()) + { + System.out.println("Can't find " + file); + if(headless) + System.exit(1); + } } - } - - if (!aparser.contains("nodisplay")) - desktop.setVisible(true); - protocol = "File"; + protocol = "File"; - if (file.indexOf("http:") > -1) - { - protocol = "URL"; - } + if (file.indexOf("http:") > -1) + { + protocol = "URL"; + } - if(file.endsWith(".jar")) - format = "Jalview"; - else - format = jalview.io.IdentifyFile.Identify(file, protocol); + if (file.endsWith(".jar")) + format = "Jalview"; + else + format = new jalview.io.IdentifyFile().Identify(file, protocol); - System.out.println("Opening: " + format + " file " + file); + System.out.println("Opening: " + format + " file " + file); - AlignFrame af = desktop.LoadFileWaitTillLoaded(file, protocol, format); + AlignFrame af = fileLoader.LoadFileWaitTillLoaded(file, protocol, format); - groups = aparser.getValue("groups"); - if(groups!=null) - { - af.parseGroupsFile(groups); - } + data = aparser.getValue("colour"); + if(data!=null) + { + data.replaceAll("%20", " "); + + jalview.schemes.ColourSchemeI cs = + jalview.schemes.ColourSchemeProperty.getColour(af.getViewport(). + getAlignment(), data); + + if(cs == null) + { + jalview.schemes.UserColourScheme ucs + = new jalview.schemes.UserColourScheme("white"); + ucs.parseAppletParameter(data); + cs = ucs; + } + + System.out.println("colour is " + data); + af.changeColour( cs ); + } - String imageName = "unnamed.png"; - while (aparser.getSize() > 1) - { - format = aparser.nextValue(); - file = aparser.nextValue(); - if (format.equalsIgnoreCase("png")) + // Must maintain ability to use the groups flag + data = aparser.getValue("groups"); + if (data != null) { - af.createPNG(new java.io.File(file)); - imageName = (new java.io.File(file)).getName(); - System.out.println("Creating PNG image: " + file); - continue; + af.parseFeaturesFile(data, protocol); + System.out.println("Added "+data); } - else if (format.equalsIgnoreCase("imgMap")) + data = aparser.getValue("features"); + if (data != null) { - af.createImageMap(new java.io.File(file), imageName); - System.out.println("Creating image map: " + file); - continue; + af.parseFeaturesFile(data, protocol); + System.out.println("Added "+data); } - else if (format.equalsIgnoreCase("eps")) + + data = aparser.getValue("annotations"); + if (data != null) { - System.out.println("Creating EPS file: " + file); - af.createEPS(new java.io.File(file)); - continue; + af.loadJalviewDataFile(data); + System.out.println("Added "+data); } - 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!!"); - } + 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!!"); - while (aparser.getSize() > 0) - { - System.out.println("Unknown arg: " + aparser.nextValue()); + } + + while (aparser.getSize() > 0) + { + System.out.println("Unknown arg: " + aparser.nextValue()); + } } - } - if (jalview.gui.Preferences.showStartupFile && - (jalview.gui.Preferences.startupFile != null)) + // We'll only open the default file if the desktop is visible. + // And the user + ////////////////////// + if ( + !headless + && file==null + && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true) + ) { - file = jalview.gui.Preferences.startupFile; + file = jalview.bin.Cache.getDefault("STARTUP_FILE", + "http://www.jalview.org/examples/exampleFile.jar"); + protocol = "File"; if (file.indexOf("http:") > -1) @@ -229,17 +271,14 @@ public class Jalview if (file.endsWith(".jar")) { - Jalview2XML.LoadJalviewAlign(file); + new Jalview2XML().LoadJalviewAlign(file); } else { - format = jalview.io.IdentifyFile.Identify(file, protocol); - desktop.LoadFile(file, protocol, format); + format = new jalview.io.IdentifyFile().Identify(file, protocol); + new jalview.io.FileLoader().LoadFile(file, protocol, format); } } - - if (!desktop.isVisible()) - System.exit(0); } }