Fix codacy comments

bisq-network · Jul 3, 2020 · 9a8622c · 9a8622c
1 parent fabd592
commit 9a8622c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/core/src/main/java/bisq/core/account/sign/SignedWitnessService.java b/core/src/main/java/bisq/core/account/sign/SignedWitnessService.java
@@ -51,15 +51,13 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 import lombok.Getter;
@@ -489,16 +487,16 @@ private void doRepublishAllSignedWitnesses() {
 
     // Remove SignedWitnesses that are signed by TRADE that also have an ARBITRATOR signature
     // for the same ownerPubKey and AccountAgeWitnessHash
-    private void cleanSignedWitnesses() {
-        var orphans = getRootSignedWitnessSet(false);
-        var signedWitnessesCopy = new HashSet<>(signedWitnessMap.values());
-        signedWitnessesCopy.forEach(sw -> orphans.forEach(orphan -> {
-            if (sw.getVerificationMethod() == SignedWitness.VerificationMethod.ARBITRATOR &&
-                    Arrays.equals(sw.getWitnessOwnerPubKey(), orphan.getWitnessOwnerPubKey()) &&
-                    Arrays.equals(sw.getAccountAgeWitnessHash(), orphan.getAccountAgeWitnessHash())) {
-                signedWitnessMap.remove(orphan.getHashAsByteArray());
-                log.info("Remove duplicate SignedWitness: {}", orphan.toString());
-            }
-        }));
-    }
+//    private void cleanSignedWitnesses() {
+//        var orphans = getRootSignedWitnessSet(false);
+//        var signedWitnessesCopy = new HashSet<>(signedWitnessMap.values());
+//        signedWitnessesCopy.forEach(sw -> orphans.forEach(orphan -> {
+//            if (sw.getVerificationMethod() == SignedWitness.VerificationMethod.ARBITRATOR &&
+//                    Arrays.equals(sw.getWitnessOwnerPubKey(), orphan.getWitnessOwnerPubKey()) &&
+//                    Arrays.equals(sw.getAccountAgeWitnessHash(), orphan.getAccountAgeWitnessHash())) {
+//                signedWitnessMap.remove(orphan.getHashAsByteArray());
+//                log.info("Remove duplicate SignedWitness: {}", orphan.toString());
+//            }
+//        }));
+//    }
 }
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java
@@ -53,18 +53,18 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import static bisq.desktop.util.FormBuilder.*;
+import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup;
+import static bisq.desktop.util.FormBuilder.addInputTextField;
+import static bisq.desktop.util.FormBuilder.addTopLabelListView;
+import static bisq.desktop.util.FormBuilder.removeRowsFromGridPane;
 
 @Slf4j
 public class SignUnsignedPubKeysWindow extends Overlay<SignUnsignedPubKeysWindow> {
 
-    private InputTextField searchTextField;
     private ListView<SignedWitness> unsignedPubKeys = new ListView<>();
     private InputTextField privateKey;
     private final AccountAgeWitnessService accountAgeWitnessService;
     private final ArbitratorManager arbitratorManager;
-    private ListView<SignedWitness> signedWitnessListView = new ListView<>();
-    private ListView<String> failedView = new ListView<>();
     private List<SignedWitness> signedWitnessList = new ArrayList<>();
     private List<String> failed = new ArrayList<>();
     private Callback<ListView<SignedWitness>, ListCell<SignedWitness>> signedWitnessCellFactory;
@@ -168,12 +168,12 @@ private void showResult() {
 
         Tuple3<Label, ListView<SignedWitness>, VBox> signedTuple = addTopLabelListView(gridPane, ++rowIndex,
                 Res.get("popup.accountSigning.unsignedPubKeys.result.signed"));
-        signedWitnessListView = signedTuple.second;
+        ListView<SignedWitness> signedWitnessListView = signedTuple.second;
         signedWitnessListView.setCellFactory(signedWitnessCellFactory);
         signedWitnessListView.setItems(FXCollections.observableArrayList(signedWitnessList));
         Tuple3<Label, ListView<String>, VBox> failedTuple = addTopLabelListView(gridPane, ++rowIndex,
                 Res.get("popup.accountSigning.unsignedPubKeys.result.failed"));
-        failedView = failedTuple.second;
+        ListView<String> failedView = failedTuple.second;
         failedView.setItems(FXCollections.observableArrayList(failed));
 
         ((AutoTooltipButton) actionButton).updateText(Res.get("shared.ok"));