X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;h=0e04117f5d5b0a55f65c294e9a1123382a7c9ee8;hb=9092d9f4c2231645b58968e964c858e010be14e2;hp=65b333ef84f8d80f101ba3f4855d862236e034af;hpb=197e43e3b7bc447d36ebdd690f1e8133b4f6262b;p=jalview.git

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 65b333e..0e04117 100755
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -81,6 +81,10 @@ import jalview.ws.sifts.SiftsSettings;
  * @author $author$
  * @version $Revision$
  */
+/*
+ * for merge with Jalview-JS
+ public class Preferences extends GPreferences implements ApplicationSingletonI
+ */
 public class Preferences extends GPreferences
 {
   public static final String ENABLE_SPLIT_FRAME = "ENABLE_SPLIT_FRAME";
@@ -191,21 +195,26 @@ public class Preferences extends GPreferences
           MessageManager.getString("action.text"), "Text");
 
   // get singleton Preferences instance
-  public static Preferences getPreferences()
-  {
-    return getPreferences(0, null);
-  }
-
-  public static Preferences getPreferences(int selectTab, String message)
+  public static Preferences getInstance()
   {
     if (INSTANCE == null || INSTANCE.frame == null
             || INSTANCE.frame.isClosed())
     {
       INSTANCE = new Preferences();
     }
-    INSTANCE.selectTab(selectTab);
-    INSTANCE.setMessage(message);
     return INSTANCE;
+
+    /*
+     * Replace code with the following for Jalvew-JS
+    Preferences INSTANCE = ApplicationSingletonProvider.getInstance(Preferences.class);
+    if (INSTANCE == null || INSTANCE.frame == null
+            || INSTANCE.frame.isClosed())
+    {
+      ApplicationSingletonProvider.remove(Preferences.class);
+      INSTANCE = ApplicationSingletonProvider.getInstance(Preferences.class);
+    }
+    return INSTANCE;
+    */
   }
 
   public static void openPreferences()
@@ -215,7 +224,9 @@ public class Preferences extends GPreferences
 
   public static void openPreferences(int selectTab, String message)
   {
-    Preferences p = getPreferences(selectTab, message);
+    Preferences p = getInstance();
+    p.selectTab(selectTab);
+    p.setMessage(message);
     p.frame.show();
     p.frame.moveToFront();
     p.frame.grabFocus();
@@ -600,6 +611,7 @@ public class Preferences extends GPreferences
     proxyAuthPasswordPB.setText(Cache.proxyAuthPassword == null ? ""
             : new String(Cache.proxyAuthPassword));
     setCustomProxyEnabled();
+    applyProxyButtonEnabled(false);
 
     defaultBrowser.setText(Cache.getDefault("DEFAULT_BROWSER", ""));