From c1a9ccec5ed5cedd553b88a8ea94d3e70f8e1c1e Mon Sep 17 00:00:00 2001 From: Niyi Dada Date: Tue, 24 Sep 2019 01:57:52 +0100 Subject: [PATCH 1/3] Fixed sorting in views with TableView instances with no implemented sort. --- .../java/bisq/desktop/main/dao/bonding/bonds/BondsView.java | 5 ++++- .../main/dao/bonding/reputation/MyReputationView.java | 3 +++ .../java/bisq/desktop/main/dao/bonding/roles/RolesView.java | 3 +++ .../desktop/main/market/offerbook/OfferBookChartView.java | 4 ++++ .../desktop/main/overlays/windows/ProposalResultsWindow.java | 5 +++++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java index 6bff38ff018..bcd60bcccc2 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java @@ -185,8 +185,11 @@ public void updateItem(final BondListItem item, boolean empty) { }; } }); - + column.setComparator(Comparator.comparing(BondListItem::getAmount)); + column.setSortType(TableColumn.SortType.ASCENDING); tableView.getColumns().add(column); + tableView.getSortOrder().add(column); + column = new AutoTooltipTableColumn<>(Res.get("dao.bond.table.column.lockTime")); column.setMinWidth(40); column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue())); diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java index a4d84749dea..f8d0a233230 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java @@ -311,7 +311,10 @@ public void updateItem(final MyReputationListItem item, boolean empty) { }; } }); + column.setComparator(Comparator.comparing(MyReputationListItem::getAmount)); + column.setSortType(TableColumn.SortType.ASCENDING); tableView.getColumns().add(column); + tableView.getSortOrder().add(column); column = new AutoTooltipTableColumn<>(Res.get("dao.bond.table.column.lockTime")); column.setMinWidth(60); diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java index 0e8c4078312..99be366199f 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java @@ -157,6 +157,9 @@ public void updateItem(final RolesListItem item, boolean empty) { }; } }); + column.setComparator(Comparator.comparing(RolesListItem::getLockupDate).reversed()); + column.setSortType(TableColumn.SortType.ASCENDING); + tableView.getSortOrder().add(column); tableView.getColumns().add(column); column = new AutoTooltipTableColumn<>(Res.get("dao.bond.table.column.link")); diff --git a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java b/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java index b1e500c2b1a..116d5e3bf51 100644 --- a/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java +++ b/desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java @@ -609,6 +609,10 @@ public void updateItem(final OfferListItem newItem, boolean empty) { }); tableView.getColumns().add(volumeColumn); + volumeColumn.setComparator(Comparator.comparing(item -> item.offer.getPrice())); + volumeColumn.setSortType(TableColumn.SortType.ASCENDING); + tableView.getColumns().add(volumeColumn); + tableView.getColumns().add(amountColumn); tableView.getColumns().add(priceColumn); tableView.getColumns().add(avatarColumn); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java index 7620e1ac703..8075e74ecc3 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java @@ -72,6 +72,8 @@ import static bisq.desktop.util.FormBuilder.addButtonAfterGroup; +import java.util.Comparator; + @Slf4j public class ProposalResultsWindow extends TabbedOverlay { @@ -249,6 +251,9 @@ public void updateItem(final VoteListItem item, boolean empty) { }; } }); + column.setComparator(Comparator.comparing(VoteListItem::getBlindVoteDate)); + column.setSortType(TableColumn.SortType.DESCENDING); + votesTableView.getSortOrder().add(column); votesTableView.getColumns().add(column); column = new AutoTooltipTableColumn<>(Res.get("shared.blindVoteTxId")); From e705186007a5a5a796d88e4852d9235c841fce57 Mon Sep 17 00:00:00 2001 From: Niyi Dada Date: Tue, 24 Sep 2019 02:02:31 +0100 Subject: [PATCH 2/3] Reorder to fix conflict. --- .../desktop/main/dao/bonding/reputation/MyReputationView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java index f8d0a233230..efaaa8d160a 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java @@ -311,9 +311,9 @@ public void updateItem(final MyReputationListItem item, boolean empty) { }; } }); + tableView.getColumns().add(column); column.setComparator(Comparator.comparing(MyReputationListItem::getAmount)); column.setSortType(TableColumn.SortType.ASCENDING); - tableView.getColumns().add(column); tableView.getSortOrder().add(column); column = new AutoTooltipTableColumn<>(Res.get("dao.bond.table.column.lockTime")); From fe75046309e8f15347b1fca6dcacaa291a924c3c Mon Sep 17 00:00:00 2001 From: Niyi Dada Date: Tue, 24 Sep 2019 02:13:50 +0100 Subject: [PATCH 3/3] Rearrangement to resolve conflict. --- .../java/bisq/desktop/main/dao/bonding/bonds/BondsView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java index bcd60bcccc2..f05d3ae320b 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java @@ -185,9 +185,9 @@ public void updateItem(final BondListItem item, boolean empty) { }; } }); + tableView.getColumns().add(column); column.setComparator(Comparator.comparing(BondListItem::getAmount)); column.setSortType(TableColumn.SortType.ASCENDING); - tableView.getColumns().add(column); tableView.getSortOrder().add(column); column = new AutoTooltipTableColumn<>(Res.get("dao.bond.table.column.lockTime"));