From b986166ad93c81466f6cb343b6b44d2f5c0f575e Mon Sep 17 00:00:00 2001 From: "Brian P. Hinz" Date: Fri, 4 Sep 2020 19:09:48 -0400 Subject: [PATCH] [java] don't show password field for secTypes that don't use it --- java/com/tigervnc/vncviewer/UserDialog.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/java/com/tigervnc/vncviewer/UserDialog.java b/java/com/tigervnc/vncviewer/UserDialog.java index 9804aafa..d35be48d 100644 --- a/java/com/tigervnc/vncviewer/UserDialog.java +++ b/java/com/tigervnc/vncviewer/UserDialog.java @@ -129,14 +129,16 @@ public class UserDialog implements UserPasswdGetter, UserMsgBox y += 25 + 5; } - JLabel passwdLabel = new JLabel("Password:"); - passwdLabel.setBounds(70, y, msg.getSize().width-70-10, 20); - msg.add(passwdLabel); - y += 20 + 5; final JPasswordField passwd = new JPasswordField(30); - passwd.setBounds(70, y, msg.getSize().width-70-10, 25); - msg.add(passwd); - y += 25 + 5; + if (password != null) { + JLabel passwdLabel = new JLabel("Password:"); + passwdLabel.setBounds(70, y, msg.getSize().width-70-10, 20); + msg.add(passwdLabel); + y += 20 + 5; + passwd.setBounds(70, y, msg.getSize().width-70-10, 25); + msg.add(passwd); + y += 25 + 5; + } msg.setPreferredSize(new Dimension(410, y)); @@ -149,7 +151,8 @@ public class UserDialog implements UserPasswdGetter, UserMsgBox options[0]){//default button title @Override public void selectInitialValue() { - passwd.requestFocusInWindow(); + if (password != null) + passwd.requestFocusInWindow(); } }; pane.setBorder(new EmptyBorder(0,0,0,0)); -- 2.39.5