Merge pull request #3364 from lusarz/refactor-filter-window

Refactor FilterWindow
bisq-network · Nov 12, 2019 · cc2df91 · cc2df91
2 parents ce20bb4 + d2f6702
commit cc2df91
Showing 1 changed file with 31 additions and 80 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java
@@ -41,8 +41,8 @@
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -197,90 +197,33 @@ private void addContent() {
         }
         Button sendButton = new AutoTooltipButton(Res.get("filterWindow.add"));
         sendButton.setOnAction(e -> {
-            List<String> offerIds = new ArrayList<>();
-            List<String> nodes = new ArrayList<>();
-            List<PaymentAccountFilter> paymentAccountFilters = new ArrayList<>();
-            List<String> bannedCurrencies = new ArrayList<>();
-            List<String> bannedPaymentMethods = new ArrayList<>();
-            List<String> arbitrators = new ArrayList<>();
-            List<String> mediators = new ArrayList<>();
-            List<String> refundAgents = new ArrayList<>();
-            List<String> seedNodes = new ArrayList<>();
-            List<String> priceRelayNodes = new ArrayList<>();
-            List<String> btcNodes = new ArrayList<>();
-
-            if (!offerIdsInputTextField.getText().isEmpty()) {
-                offerIds = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(offerIdsInputTextField.getText())
-                        .split(",")));
-            }
-
-            if (!nodesInputTextField.getText().isEmpty()) {
-                nodes = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(nodesInputTextField.getText()).split(",")));
-            }
-
-            if (!paymentAccountFilterInputTextField.getText().isEmpty()) {
-                paymentAccountFilters = new ArrayList<>(Arrays.asList(paymentAccountFilterInputTextField.getText()
-                        .replace(", ", ",")
-                        .split(","))
-                        .stream().map(item -> {
-                            String[] list = item.split("\\|");
-                            if (list.length == 3)
-                                return new PaymentAccountFilter(list[0], list[1], list[2]);
-                            else
-                                return new PaymentAccountFilter("", "", "");
-                        })
-                        .collect(Collectors.toList()));
-            }
-
-            if (!bannedCurrenciesInputTextField.getText().isEmpty()) {
-                bannedCurrencies = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(bannedCurrenciesInputTextField.getText())
-                        .split(",")));
-            }
-
-            if (!bannedPaymentMethodsInputTextField.getText().isEmpty()) {
-                bannedPaymentMethods = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(bannedPaymentMethodsInputTextField.getText())
-                        .split(",")));
-            }
-
-            if (!arbitratorsInputTextField.getText().isEmpty()) {
-                arbitrators = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(arbitratorsInputTextField.getText()).split(",")));
-            }
-
-            if (!mediatorsInputTextField.getText().isEmpty()) {
-                mediators = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(mediatorsInputTextField.getText()).split(",")));
-            }
-            if (!refundAgentsInputTextField.getText().isEmpty()) {
-                refundAgents = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(refundAgentsInputTextField.getText()).split(",")));
-            }
-
-            if (!seedNodesInputTextField.getText().isEmpty()) {
-                seedNodes = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(seedNodesInputTextField.getText()).split(",")));
-            }
-
-            if (!priceRelayNodesInputTextField.getText().isEmpty()) {
-                priceRelayNodes = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(priceRelayNodesInputTextField.getText()).split(",")));
-            }
-
-            if (!btcNodesInputTextField.getText().isEmpty()) {
-                btcNodes = new ArrayList<>(Arrays.asList(StringUtils.deleteWhitespace(btcNodesInputTextField.getText())
-                        .split(",")));
-            }
-
-            if (sendFilterMessageHandler.handle(new Filter(offerIds,
-                            nodes,
+            List<PaymentAccountFilter> paymentAccountFilters = readAsList(paymentAccountFilterInputTextField)
+                    .stream().map(item -> {
+                        String[] list = item.split("\\|");
+                        if (list.length == 3)
+                            return new PaymentAccountFilter(list[0], list[1], list[2]);
+                        else
+                            return new PaymentAccountFilter("", "", "");
+                    })
+                    .collect(Collectors.toList());
+
+
+            if (sendFilterMessageHandler.handle(new Filter(
+                            readAsList(offerIdsInputTextField),
+                            readAsList(nodesInputTextField),
                             paymentAccountFilters,
-                            bannedCurrencies,
-                            bannedPaymentMethods,
-                            arbitrators,
-                            seedNodes,
-                            priceRelayNodes,
+                            readAsList(bannedCurrenciesInputTextField),
+                            readAsList(bannedPaymentMethodsInputTextField),
+                            readAsList(arbitratorsInputTextField),
+                            readAsList(seedNodesInputTextField),
+                            readAsList(priceRelayNodesInputTextField),
                             preventPublicBtcNetworkCheckBox.isSelected(),
-                            btcNodes,
+                            readAsList(btcNodesInputTextField),
                             disableDaoCheckBox.isSelected(),
                             disableDaoBelowVersionInputTextField.getText(),
                             disableTradeBelowVersionInputTextField.getText(),
-                            mediators,
-                            refundAgents),
+                            readAsList(mediatorsInputTextField),
+                            readAsList(refundAgentsInputTextField)),
                     keyInputTextField.getText()))
                 hide();
             else
@@ -310,4 +253,12 @@ private void addContent() {
         gridPane.getChildren().add(hBox);
         GridPane.setMargin(hBox, new Insets(10, 0, 0, 0));
     }
+
+    private List<String> readAsList(InputTextField field) {
+        if (field.getText().isEmpty()) {
+            return Collections.emptyList();
+        } else {
+            return Arrays.asList(StringUtils.deleteWhitespace(field.getText()).split(","));
+        }
+    }
 }