JAL-3633 Small changes to allow future fitting with ApplicationSingletonI/Jalview...

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

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index ab60f90..ddef7a4 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -998,25 +998,19 @@ public class GPreferences extends JPanel
               @Override
               public void changedUpdate(DocumentEvent e)
               {
-                if (!proxyAuthPasswordPB.getBackground()
-                        .equals(Color.WHITE))
-                  proxyAuthPasswordPB.setBackground(Color.WHITE);
+                proxyAuthPasswordHighlight(true);
               }
 
               @Override
               public void insertUpdate(DocumentEvent e)
               {
-                if (!proxyAuthPasswordPB.getBackground()
-                        .equals(Color.WHITE))
-                  proxyAuthPasswordPB.setBackground(Color.WHITE);
+                proxyAuthPasswordHighlight(true);
               }
 
               @Override
               public void removeUpdate(DocumentEvent e)
               {
-                if (!proxyAuthPasswordPB.getBackground()
-                        .equals(Color.WHITE))
-                  proxyAuthPasswordPB.setBackground(Color.WHITE);
+                proxyAuthPasswordHighlight(true);
               }
 
             });
@@ -1238,10 +1232,21 @@ public class GPreferences extends JPanel
     return proxyPanel;
   }
 
-  public void proxyAuthPasswordFocus()
+  public void proxyAuthPasswordHighlight(boolean enabled)
   {
-    proxyAuthPasswordPB.grabFocus();
-    proxyAuthPasswordPB.setBackground(Color.PINK);
+    if (enabled && proxyType.isSelected(customProxy.getModel())
+            && proxyAuth.isSelected()
+            && !proxyAuthUsernameTB.getText().isEmpty()
+            && proxyAuthPasswordPB.getDocument().getLength() == 0)
+    {
+
+      proxyAuthPasswordPB.grabFocus();
+      proxyAuthPasswordPB.setBackground(Color.PINK);
+    }
+    else
+    {
+      proxyAuthPasswordPB.setBackground(Color.WHITE);
+    }
   }
 
   public void saveProxySettings()
@@ -3190,11 +3195,13 @@ public class GPreferences extends JPanel
   public void proxyType_actionPerformed()
   {
     setCustomProxyEnabled();
+    proxyAuthPasswordHighlight(true);
   }
 
   public void proxyAuth_actionPerformed()
   {
     setProxyAuthEnabled();
+    proxyAuthPasswordHighlight(true);
   }
 
   /**