X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=ef16e5553ac3eea7e7ad7c25d0a3bb3be04714e5;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=94206c23e053ece61a2b42a7fdf5c477abf0468f;hpb=03dfaa6ef08c4a7088081d6269a5bc9edb5a7316;p=jalview.git diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index 94206c2..ef16e55 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) - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * @@ -14,6 +14,7 @@ * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.bin; @@ -70,7 +71,11 @@ public class Jalview } }); } - protected static boolean proteine; + /** + * Put protein=true for get a protein example + */ + private static boolean protein=false; + /** * main class for Jalview application @@ -522,27 +527,14 @@ public class Jalview // And the user // //////////////////// - JFrame Typechooser =new JFrame("choose molecule type"); - FlowLayout fl = new FlowLayout(); - Typechooser.setLayout(fl); - Typechooser.setSize(400,400); - Typechooser.setDefaultCloseOperation(Typechooser.DISPOSE_ON_CLOSE); - JLabel label = new JLabel("What would you open ? "); - JButton rnabutton = new JButton("RNA molecule"); - JButton pbutton = new JButton("Proteine molecule"); - - pbutton.addActionListener(new pbuttonlistener()); - rnabutton.addActionListener(new rnabuttonlistener()); - Typechooser.getContentPane().add(label); - Typechooser.getContentPane().add(rnabutton); - Typechooser.getContentPane().add(pbutton); - Typechooser.setVisible(true); + + if (!headless && file == null && vamsasImport == null - && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true) && proteine == true) + && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true) && protein == true) { file = jalview.bin.Cache.getDefault( "STARTUP_FILE",