[java] don't show password field for secTypes that don't use it

diff --git a/java/com/tigervnc/vncviewer/UserDialog.java b/java/com/tigervnc/vncviewer/UserDialog.java
index 9804aafa2d7f443546f6abfd338640b13e5ddcf7..d35be48d3c2f7fac7cd3d5b04cb71d286b9bbf4c 100644 (file)
--- 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));