X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fbin%2FJalview.java;h=00a042d6b1f6b11d39decfaf70a831f3009ae4d8;hb=de75573aa38c4b40686256d4332c3a069b6a98ca;hp=0fe16645fc85cd09e4c7b740d85fdb438cf7c9a0;hpb=10e637daad8983c41db8679baabea5563d7371f4;p=jalview.git diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index 0fe1664..00a042d 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -20,6 +20,14 @@ */ 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; @@ -45,13 +53,6 @@ import java.util.Vector; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; -import jalview.gui.AlignFrame; -import jalview.gui.Desktop; -import jalview.io.HtmlSvgOutput; -import jalview.util.MessageManager; -import jalview.util.Platform; -import jalview.ws.jws2.Jws2Discoverer; - /** * Main class for Jalview Application
*
@@ -93,23 +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"); - // try - // { - // UIManager.setLookAndFeel(ch.randelshofer.quaqua.QuaquaManager - // .getLookAndFeel()); - // System.out - // .println("--------------------------------------------> in here"); - // } catch (UnsupportedLookAndFeelException e) - // { - // // TODO Auto-generated catch block - // e.printStackTrace(); - // } - // } ArgsParser aparser = new ArgsParser(args); boolean headless = false; @@ -241,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