Merge branch 'JAL-1347' into develop

[jalview.git] / src / jalview / bin / Jalview.java

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 5e4569a..94206c2 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -17,6 +17,10 @@
  */
 package jalview.bin;
 
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -66,6 +70,7 @@ public class Jalview
       }
     });
   }
+  protected static boolean proteine;
 
   /**
    * main class for Jalview application
@@ -128,6 +133,11 @@ public class Jalview
                       + "\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");
@@ -147,10 +157,6 @@ public class Jalview
       }
       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"))
     {
@@ -515,8 +521,28 @@ public class Jalview
     // We'll only open the default file if the desktop is visible.
     // 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))
+            && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true) && proteine == true)
     {
       file = jalview.bin.Cache.getDefault(
               "STARTUP_FILE",
@@ -589,7 +615,8 @@ public class Jalview
       desktop.setInBatchMode(false);
     }
   }
-
+  
+  
   private static void startUsageStats(final Desktop desktop)
   {
     /**
@@ -901,6 +928,21 @@ public class Jalview
  * @author Andrew Waterhouse and JBP documented.
  * 
  */
+
+class rnabuttonlistener  implements ActionListener{
+         public void actionPerformed(ActionEvent arg0) {
+                 System.out.println("Good idea ! ");
+
+         }
+}
+
+class pbuttonlistener  implements ActionListener{
+         public void actionPerformed(ActionEvent arg0) {
+               
+         
+         }
+}
+
 class ArgsParser
 {
   Vector vargs = null;
@@ -1039,4 +1081,7 @@ class FeatureFetcher
   {
     return queued == 0 && running == 0;
   }
+  
+  
+  
 };