Merge branch 'hotfix/JAL-1521' into Release_2_8_2_Branch

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

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 1c63f7f..046d132 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -1,19 +1,22 @@
 /*
- * 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;
 
@@ -41,6 +44,7 @@ import java.util.*;
 import javax.swing.*;
 
 import jalview.gui.*;
+import jalview.util.MessageManager;
 import jalview.util.Platform;
 
 /**
@@ -70,7 +74,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
@@ -133,6 +141,12 @@ 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");
@@ -152,16 +166,13 @@ 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"))
     {
       headless = true;
     }
-    System.setProperty("http.agent", "Jalview Desktop/"+Cache.getDefault("VERSION", "Unknown"));
+    System.setProperty("http.agent",
+            "Jalview Desktop/" + Cache.getDefault("VERSION", "Unknown"));
     try
     {
       Cache.initLogger();
@@ -330,7 +341,7 @@ public class Jalview
     {
       if (!headless)
       {
-        desktop.setProgressBar("Processing commandline arguments...",
+        desktop.setProgressBar(MessageManager.getString("status.processing_commandline_args"),
                 progress = System.currentTimeMillis());
       }
       System.out.println("Opening file: " + file);
@@ -520,28 +531,10 @@ 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) && proteine == true)
+            && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true)
+            && protein == true)
     {
       file = jalview.bin.Cache.getDefault(
               "STARTUP_FILE",
@@ -614,8 +607,7 @@ public class Jalview
       desktop.setInBatchMode(false);
     }
   }
-  
-  
+
   private static void startUsageStats(final Desktop desktop)
   {
     /**
@@ -928,18 +920,21 @@ public class Jalview
  * 
  */
 
-class rnabuttonlistener  implements ActionListener{
-         public void actionPerformed(ActionEvent arg0) {
-                 System.out.println("Good idea ! ");
+class rnabuttonlistener implements ActionListener
+{
+  public void actionPerformed(ActionEvent arg0)
+  {
+    System.out.println("Good idea ! ");
 
-         }
+  }
 }
 
-class pbuttonlistener  implements ActionListener{
-         public void actionPerformed(ActionEvent arg0) {
-               
-         
-         }
+class pbuttonlistener implements ActionListener
+{
+  public void actionPerformed(ActionEvent arg0)
+  {
+
+  }
 }
 
 class ArgsParser
@@ -1064,7 +1059,7 @@ class FeatureFetcher
           running++;
         }
 
-        af.setProgressBar("DAS features being retrieved...", id);
+        af.setProgressBar(MessageManager.getString("status.das_features_being_retrived"), id);
         af.featureSettings_actionPerformed(null);
         af.featureSettings.fetchDasFeatures(dasSources, true);
         af.setProgressBar(null, id);
@@ -1080,7 +1075,5 @@ class FeatureFetcher
   {
     return queued == 0 && running == 0;
   }
-  
-  
-  
+
 };