Thank you, Oracle!

[jalview.git] / forester / java / src / org / forester / archaeopteryx / MainFrameApplication.java

diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
index 853b1d5..3b5138b 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
+++ b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java
@@ -244,14 +244,12 @@ public final class MainFrameApplication extends MainFrame {
         setOptions( Options.createInstance( _configuration ) );\r
         setInferenceManager( InferenceManager.createInstance( _configuration ) );\r
         setPhylogeneticInferenceOptions( PhylogeneticInferenceOptions.createInstance( _configuration ) );\r
-        //     _textframe = null; #~~~~\r
         // set title\r
         setTitle( Constants.PRG_NAME + " " + Constants.VERSION + " (" + Constants.PRG_DATE + ")" );\r
         _mainpanel = new MainPanel( _configuration, this );\r
         // The file dialogs\r
         _open_filechooser = new JFileChooser();\r
-        _open_filechooser.setCurrentDirectory( new File( "." ) );\r
-        _open_filechooser.setMultiSelectionEnabled( false );\r
+        _open_filechooser.setMultiSelectionEnabled( true );\r
         _open_filechooser.addChoosableFileFilter( MainFrame.xmlfilter );\r
         _open_filechooser.addChoosableFileFilter( MainFrame.nhxfilter );\r
         _open_filechooser.addChoosableFileFilter( MainFrame.nhfilter );\r
@@ -260,44 +258,41 @@ public final class MainFrameApplication extends MainFrame {
         _open_filechooser.addChoosableFileFilter( _open_filechooser.getAcceptAllFileFilter() );\r
         _open_filechooser.setFileFilter( MainFrame.defaultfilter );\r
         _open_filechooser_for_species_tree = new JFileChooser();\r
-        _open_filechooser_for_species_tree.setCurrentDirectory( new File( "." ) );\r
         _open_filechooser_for_species_tree.setMultiSelectionEnabled( false );\r
         _open_filechooser_for_species_tree.addChoosableFileFilter( MainFrame.xmlfilter );\r
         _open_filechooser_for_species_tree.addChoosableFileFilter( MainFrame.tolfilter );\r
         _open_filechooser_for_species_tree.setFileFilter( MainFrame.xmlfilter );\r
-        _save_filechooser = new JFileChooser();\r
-        _save_filechooser.setCurrentDirectory( new File( "." ) );\r
-        _save_filechooser.setMultiSelectionEnabled( false );\r
-        _save_filechooser.setFileFilter( MainFrame.xmlfilter );\r
-        _save_filechooser.addChoosableFileFilter( MainFrame.nhfilter );\r
-        _save_filechooser.addChoosableFileFilter( MainFrame.nexusfilter );\r
-        _save_filechooser.addChoosableFileFilter( _save_filechooser.getAcceptAllFileFilter() );\r
-        _writetopdf_filechooser = new JFileChooser();\r
-        _writetopdf_filechooser.addChoosableFileFilter( MainFrame.pdffilter );\r
-        _writetographics_filechooser = new JFileChooser();\r
-        _writetographics_filechooser.addChoosableFileFilter( MainFrame.graphicsfilefilter );\r
         // Msa:\r
         _msa_filechooser = new JFileChooser();\r
         _msa_filechooser.setName( "Read Multiple Sequence Alignment File" );\r
-        _msa_filechooser.setCurrentDirectory( new File( "." ) );\r
         _msa_filechooser.setMultiSelectionEnabled( false );\r
         _msa_filechooser.addChoosableFileFilter( _msa_filechooser.getAcceptAllFileFilter() );\r
         _msa_filechooser.addChoosableFileFilter( MainFrame.msafilter );\r
         // Seqs:\r
         _seqs_pi_filechooser = new JFileChooser();\r
         _seqs_pi_filechooser.setName( "Read Sequences File" );\r
-        _seqs_pi_filechooser.setCurrentDirectory( new File( "." ) );\r
         _seqs_pi_filechooser.setMultiSelectionEnabled( false );\r
         _seqs_pi_filechooser.addChoosableFileFilter( _seqs_pi_filechooser.getAcceptAllFileFilter() );\r
         _seqs_pi_filechooser.addChoosableFileFilter( MainFrame.seqsfilter );\r
         // Expression\r
         _values_filechooser = new JFileChooser();\r
-        _values_filechooser.setCurrentDirectory( new File( "." ) );\r
         _values_filechooser.setMultiSelectionEnabled( false );\r
         // Sequences\r
         _sequences_filechooser = new JFileChooser();\r
-        _sequences_filechooser.setCurrentDirectory( new File( "." ) );\r
         _sequences_filechooser.setMultiSelectionEnabled( false );\r
+        try {\r
+            final String home_dir = System.getProperty( "user.home" );\r
+            _open_filechooser.setCurrentDirectory( new File( home_dir ) );\r
+            _open_filechooser_for_species_tree.setCurrentDirectory( new File( home_dir ) );\r
+            _msa_filechooser.setCurrentDirectory( new File( home_dir ) );\r
+            _seqs_pi_filechooser.setCurrentDirectory( new File( home_dir ) );\r
+            _values_filechooser.setCurrentDirectory( new File( home_dir ) );\r
+            _sequences_filechooser.setCurrentDirectory( new File( home_dir ) );\r
+        }\r
+        catch ( final Exception e ) {\r
+            e.printStackTrace();\r
+            // Do nothing. Not important.\r
+        }\r
         // build the menu bar\r
         _jmenubar = new JMenuBar();\r
         if ( !_configuration.isUseNativeUI() ) {\r
@@ -1440,7 +1435,6 @@ public final class MainFrameApplication extends MainFrame {
         Phylogeny[] phys = null;\r
         // Set an initial directory if none set yet\r
         final File my_dir = getCurrentDir();\r
-        _open_filechooser.setMultiSelectionEnabled( true );\r
         // Open file-open dialog and set current directory\r
         if ( my_dir != null ) {\r
             _open_filechooser.setCurrentDirectory( my_dir );\r