From 57a4549e0f95c10651db22e53dae9411e5e30c46 Mon Sep 17 00:00:00 2001
From: Ben Soares <b.soares@dundee.ac.uk>
Date: Thu, 30 Jul 2020 13:53:23 +0100
Subject: [PATCH] JAL-3633 last minute refinement so password box doesn't get
 focus all the time

---
 src/jalview/bin/Cache.java          |    3 ++-
 src/jalview/jbgui/GPreferences.java |   10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 7b2030f..8e36d68 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -1376,7 +1376,8 @@ public class Cache
                         .getString("label.proxy_password_required");
                 Preferences.openPreferences(Preferences.CONNECTIONS_TAB,
                         message);
-                Preferences.getInstance().proxyAuthPasswordCheckHighlight(true);
+                Preferences.getInstance()
+                        .proxyAuthPasswordCheckHighlight(true, true);
               }
               else
               {
diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 9b831ef..a366f33 100755
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -1225,13 +1225,19 @@ public class GPreferences extends JPanel
 
   public void proxyAuthPasswordCheckHighlight(boolean enabled)
   {
+    proxyAuthPasswordCheckHighlight(enabled, false);
+  }
+
+  public void proxyAuthPasswordCheckHighlight(boolean enabled,
+          boolean grabFocus)
+  {
     if (enabled && proxyType.isSelected(customProxy.getModel())
             && proxyAuth.isSelected()
             && !proxyAuthUsernameTB.getText().isEmpty()
             && proxyAuthPasswordPB.getDocument().getLength() == 0)
     {
-
-      proxyAuthPasswordPB.grabFocus();
+      if (grabFocus)
+        proxyAuthPasswordPB.grabFocus();
       proxyAuthPasswordPB.setBackground(Color.PINK);
     }
     else
-- 
1.7.10.2