/*
- * 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.
*
* 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.bin;
}
});
}
- protected static boolean proteine;
+ /**
+ * Put protein=true for get a protein example
+ */
+ private static boolean protein=false;
+
/**
* main class for Jalview application
+ "\n~Read documentation in Application or visit http://www.jalview.org for description of Features and Annotations file~\n\n");
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!
String defs = aparser.getValue("setprop");
}
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"))
{
// 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",