Merge pull request JamzTheMan#9 from cwisniew/no-password-fix

Force user to enter password on connect to server dialog.
matejdro · Feb 9, 2021 · 27da997 · 27da997
2 parents 1bbad68 + f3edb00
commit 27da997
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/ui/ConnectToServerDialog.java b/src/main/java/net/rptools/maptool/client/ui/ConnectToServerDialog.java
@@ -241,6 +241,10 @@ public JTextField getUsernameTextField() {
     return (JTextField) getComponent("@username");
   }
 
+  public JTextField getPasswordTextField() {
+    return (JTextField) getComponent("@password");
+  }
+
   public JTextField getPortTextField() {
     return (JTextField) getComponent("@port");
   }
@@ -263,6 +267,10 @@ private void handleOK() {
       MapTool.showError("ServerDialog.error.username"); // $NON-NLS-1$
       return;
     }
+    if (getPasswordTextField().getText().length() == 0) {
+      MapTool.showError("ServerDialog.error.noConnectPassword"); // $NON-NLS-1$
+      return;
+    }
     getUsernameTextField().setText(username);
 
     String externalAddress = "Unknown";

diff --git a/src/main/resources/net/rptools/maptool/language/i18n.properties b/src/main/resources/net/rptools/maptool/language/i18n.properties
@@ -564,6 +564,7 @@ ServerDialog.error.portNumberException = Port from RPTools registry is not numer
 ServerDialog.error.server              = You must enter a server name or IP address.
 ServerDialog.error.serverNotFound      = Server "{0}" not found.
 ServerDialog.error.username            = A username must be provided.
+ServerDialog.error.noConnectPassword   = You must enter a password to connect to a server.
 ServerDialog.error.passwordMissing     = Both Player and GM Password must be provided.
 ServerDialog.error.passwordMustDiffer  = Player and GM Password can not be the same.