From 7ab6cfed60c955ac0546e316f94f199954e3a8c1 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 15 Jan 2016 01:42:59 +0100 Subject: [PATCH] invert sorting, apply code inspection --- .../disputes/trader/TraderDisputeView.java | 42 +++++++------------ 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java b/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java index b002aa0531..911c1f4912 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java @@ -23,11 +23,8 @@ import de.jensd.fx.fontawesome.AwesomeIcon; import io.bitsquare.arbitration.Dispute; import io.bitsquare.arbitration.DisputeManager; import io.bitsquare.arbitration.messages.DisputeMailMessage; -import io.bitsquare.btc.TradeWalletService; -import io.bitsquare.btc.WalletService; import io.bitsquare.common.UserThread; import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.gui.Navigation; import io.bitsquare.gui.common.view.ActivatableView; import io.bitsquare.gui.common.view.FxmlView; import io.bitsquare.gui.components.TableGroupHeadline; @@ -75,19 +72,15 @@ public class TraderDisputeView extends ActivatableView { private final DisputeManager disputeManager; protected final KeyRing keyRing; - private final TradeWalletService tradeWalletService; - private final WalletService walletService; - private TradeManager tradeManager; + private final TradeManager tradeManager; private final Stage stage; private final BSFormatter formatter; - private final Navigation navigation; private final DisputeSummaryPopup disputeSummaryPopup; - private ContractPopup contractPopup; - private TradeDetailsPopup tradeDetailsPopup; + private final ContractPopup contractPopup; + private final TradeDetailsPopup tradeDetailsPopup; private final List tempAttachments = new ArrayList<>(); - private TableColumn tradeIdColumn, roleColumn, dateColumn, contractColumn, stateColumn; private TableView disputesTable; private Dispute selectedDispute; private ChangeListener disputeChangeListener; @@ -104,17 +97,14 @@ public class TraderDisputeView extends ActivatableView { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public TraderDisputeView(DisputeManager disputeManager, KeyRing keyRing, TradeWalletService tradeWalletService, WalletService walletService, - TradeManager tradeManager, Stage stage, BSFormatter formatter, Navigation navigation, DisputeSummaryPopup disputeSummaryPopup, + public TraderDisputeView(DisputeManager disputeManager, KeyRing keyRing, TradeManager tradeManager, Stage stage, + BSFormatter formatter, DisputeSummaryPopup disputeSummaryPopup, ContractPopup contractPopup, TradeDetailsPopup tradeDetailsPopup) { this.disputeManager = disputeManager; this.keyRing = keyRing; - this.tradeWalletService = tradeWalletService; - this.walletService = walletService; this.tradeManager = tradeManager; this.stage = stage; this.formatter = formatter; - this.navigation = navigation; this.disputeSummaryPopup = disputeSummaryPopup; this.contractPopup = contractPopup; this.tradeDetailsPopup = tradeDetailsPopup; @@ -127,15 +117,15 @@ public class TraderDisputeView extends ActivatableView { disputesTable.setMinHeight(150); root.getChildren().add(disputesTable); - tradeIdColumn = getTradeIdColumn(); + TableColumn tradeIdColumn = getTradeIdColumn(); disputesTable.getColumns().add(tradeIdColumn); - roleColumn = getRoleColumn(); + TableColumn roleColumn = getRoleColumn(); disputesTable.getColumns().add(roleColumn); - dateColumn = getDateColumn(); + TableColumn dateColumn = getDateColumn(); disputesTable.getColumns().add(dateColumn); - contractColumn = getContractColumn(); + TableColumn contractColumn = getContractColumn(); disputesTable.getColumns().add(contractColumn); - stateColumn = getStateColumn(); + TableColumn stateColumn = getStateColumn(); disputesTable.getColumns().add(stateColumn); disputesTable.getSortOrder().add(dateColumn); @@ -152,8 +142,8 @@ public class TraderDisputeView extends ActivatableView { protected void activate() { FilteredList filteredList = new FilteredList<>(disputeManager.getDisputesAsObservableList()); setFilteredListPredicate(filteredList); - SortedList sortedList = new SortedList(filteredList); - sortedList.setComparator((o1, o2) -> o1.getOpeningDate().compareTo(o2.getOpeningDate())); + SortedList sortedList = new SortedList<>(filteredList); + sortedList.setComparator((o1, o2) -> o2.getOpeningDate().compareTo(o1.getOpeningDate())); disputesTable.setItems(sortedList); disputesTable.getSelectionModel().selectedItemProperty().addListener(disputeChangeListener); @@ -286,7 +276,7 @@ public class TraderDisputeView extends ActivatableView { if (root.getChildren().size() > 1) root.getChildren().remove(1); - this.selectedDispute = dispute; + selectedDispute = null; } else if (selectedDispute != dispute) { this.selectedDispute = dispute; @@ -301,7 +291,7 @@ public class TraderDisputeView extends ActivatableView { AnchorPane.setLeftAnchor(tableGroupHeadline, 0d); ObservableList list = dispute.getDisputeMailMessagesAsObservableList(); - SortedList sortedList = new SortedList(list); + SortedList sortedList = new SortedList<>(list); sortedList.setComparator((o1, o2) -> o1.getDate().compareTo(o2.getDate())); list.addListener((ListChangeListener) c -> scrollToBottom()); messageListView = new ListView<>(sortedList); @@ -547,12 +537,12 @@ public class TraderDisputeView extends ActivatableView { } } - private void showNotArrivedIcon() { + /* private void showNotArrivedIcon() { statusIcon.setVisible(true); AwesomeDude.setIcon(statusIcon, AwesomeIcon.WARNING_SIGN, "14"); Tooltip.install(statusIcon, new Tooltip("Message did not arrive. Please try to send again.")); statusIcon.setTextFill(Paint.valueOf("#dd0000")); - } + }*/ private void showMailboxIcon() { statusIcon.setVisible(true);