JAL-3103 Remove BrowserLauncher2 and use Desktop.browse(url) with wrapper methods

[jalview.git] / src / jalview / jbgui / GPreferences.java

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 61b2f24..0d2b623 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -45,8 +45,6 @@ import javax.swing.AbstractCellEditor;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
-import javax.swing.ComboBoxModel;
-import javax.swing.DefaultComboBoxModel;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -93,7 +91,6 @@ import jalview.io.BackupFilenameParts;
 import jalview.io.BackupFiles;
 import jalview.io.BackupFilesPresetEntry;
 import jalview.io.IntKeyStringValueEntry;
-import jalview.util.BrowserLauncher;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.util.StringUtils;
@@ -770,13 +767,14 @@ public class GPreferences extends JPanel
     JPanel proxyPanel = initConnTabProxyPanel();
     initConnTabCheckboxes();
 
+    /* removing default browser preference and using Desktop.browse()
     // Add default Browser text box
     connectTab.add(browserLabel,
             new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
                     GridBagConstraints.WEST, GridBagConstraints.NONE,
                     new Insets(10, 0, 5, 5), 5, 1));
     defaultBrowser.setFont(LABEL_FONT);
-
+    
     ComboBoxModel<String> cbModel = new DefaultComboBoxModel(
             BrowserLauncher.getInstance().getBrowserList().toArray());
     String browserPref = Cache.getProperty("DEFAULT_BROWSER");
@@ -785,10 +783,11 @@ public class GPreferences extends JPanel
       cbModel.setSelectedItem(browserPref);
     }
     defaultBrowser.setModel(cbModel);
-
+    
     connectTab.add(defaultBrowser, new GridBagConstraints(1, 0, 1, 1, 1.0,
             0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
             new Insets(10, 0, 5, 10), 30, 1));
+    */
 
     // Add proxy server panel
     connectTab.add(proxyPanel, new GridBagConstraints(0, 1, 2, 1, 1.0, 0.0,