Improve formatting and simplify code

bisq-network · Jul 19, 2021 · ca02610 · ca02610
1 parent 4321f20
commit ca02610
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java
@@ -56,8 +56,13 @@ public static int addFormForBuyer(GridPane gridPane, int gridRow,
         return gridRow;
     }
 
-    public CapitualForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, CapitualValidator capitualValidator,
-                        InputValidator inputValidator, GridPane gridPane, int gridRow, CoinFormatter formatter) {
+    public CapitualForm(PaymentAccount paymentAccount,
+                        AccountAgeWitnessService accountAgeWitnessService,
+                        CapitualValidator capitualValidator,
+                        InputValidator inputValidator,
+                        GridPane gridPane,
+                        int gridRow,
+                        CoinFormatter formatter) {
         super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter);
         this.capitualAccount = (CapitualAccount) paymentAccount;
         this.capitualValidator = capitualValidator;

diff --git a/desktop/src/main/java/bisq/desktop/util/validation/CapitualValidator.java b/desktop/src/main/java/bisq/desktop/util/validation/CapitualValidator.java
@@ -7,7 +7,7 @@
 import javax.inject.Inject;
 
 public class CapitualValidator extends InputValidator {
-    private RegexValidator regexValidator;
+    private final RegexValidator regexValidator;
 
     @Inject
     public CapitualValidator(RegexValidator regexValidator) {
@@ -18,8 +18,7 @@ public CapitualValidator(RegexValidator regexValidator) {
 
     @Override
     public ValidationResult validate(String input) {
-        ValidationResult result = regexValidator.validate(input);
 
-        return result;
+        return regexValidator.validate(input);
     }
 }