X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;fp=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=624041ce4963a39099e599dd5411488d282d49cb;hb=2a48bda703792ad6f45e4ab60bf7ef44a1fd781f;hp=9e47c6a7a2202f0b58f57813c60aa39a64a48ae0;hpb=55ac1885b2b6fda77037cd8b4b1daad52a60b4b2;p=jalview.git

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 9e47c6a..624041c 100755
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -958,25 +958,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);
               }
 
             });
@@ -1198,10 +1192,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()
@@ -3119,11 +3124,13 @@ public class GPreferences extends JPanel
   public void proxyType_actionPerformed()
   {
     setCustomProxyEnabled();
+    proxyAuthPasswordHighlight(true);
   }
 
   public void proxyAuth_actionPerformed()
   {
     setProxyAuthEnabled();
+    proxyAuthPasswordHighlight(true);
   }
 
   /**