diff options
| author | 2020-06-04 00:53:27 +0200 | |
|---|---|---|
| committer | 2020-06-04 00:53:27 +0200 | |
| commit | 535447cd4e5871336b444702a53bfca713267c8b (patch) | |
| tree | 17fe765afd5b7b986ba34bef9a5931413e1f3733 /enigma-swing/src/main/java/cuchaz | |
| parent | Fix dialogs for scale (diff) | |
| download | enigma-535447cd4e5871336b444702a53bfca713267c8b.tar.gz enigma-535447cd4e5871336b444702a53bfca713267c8b.tar.xz enigma-535447cd4e5871336b444702a53bfca713267c8b.zip | |
Use StandardValidation.notBlank instead of manually checking field text
Diffstat (limited to 'enigma-swing/src/main/java/cuchaz')
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java index d78e5654..db1ceb14 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java | |||
| @@ -16,6 +16,7 @@ import cuchaz.enigma.network.EnigmaServer; | |||
| 16 | import cuchaz.enigma.utils.Pair; | 16 | import cuchaz.enigma.utils.Pair; |
| 17 | import cuchaz.enigma.utils.ServerAddress; | 17 | import cuchaz.enigma.utils.ServerAddress; |
| 18 | import cuchaz.enigma.utils.validation.Message; | 18 | import cuchaz.enigma.utils.validation.Message; |
| 19 | import cuchaz.enigma.utils.validation.StandardValidation; | ||
| 19 | 20 | ||
| 20 | public class ConnectToServerDialog extends AbstractDialog { | 21 | public class ConnectToServerDialog extends AbstractDialog { |
| 21 | 22 | ||
| @@ -52,9 +53,7 @@ public class ConnectToServerDialog extends AbstractDialog { | |||
| 52 | 53 | ||
| 53 | public void validateInputs() { | 54 | public void validateInputs() { |
| 54 | vc.setActiveElement(ipField); | 55 | vc.setActiveElement(ipField); |
| 55 | if (ipField.getText().trim().isEmpty()) { | 56 | if (StandardValidation.notBlank(vc, ipField.getText())) { |
| 56 | vc.raise(Message.EMPTY_FIELD); | ||
| 57 | } else if (ServerAddress.from(ipField.getText(), EnigmaServer.DEFAULT_PORT) == null) { | ||
| 58 | vc.raise(Message.INVALID_IP); | 57 | vc.raise(Message.INVALID_IP); |
| 59 | } | 58 | } |
| 60 | } | 59 | } |