mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup ballot domain

Browse Source
This commit is contained in:
Manfred Karrer 2018-08-09 00:39:12 +02:00
parent 4fddc5d089
commit 185eee2fcb
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java
View File

@ -185,7 +185,7 @@ public class ProposalsView extends ActivatableView<GridPane, Void> implements Bs
sortedList.comparatorProperty().bind(tableView.comparatorProperty());
daoFacade.getActiveOrMyUnconfirmedProposals().addListener(proposalListChangeListener);
daoFacade.getValidAndConfirmedBallots().addListener(ballotListChangeListener);
daoFacade.getBallots().addListener(ballotListChangeListener);
daoFacade.addBsqStateListener(this);
bsqWalletService.addBsqBalanceListener(this);
@ -213,7 +213,7 @@ public class ProposalsView extends ActivatableView<GridPane, Void> implements Bs
sortedList.comparatorProperty().unbind();
daoFacade.getActiveOrMyUnconfirmedProposals().removeListener(proposalListChangeListener);
daoFacade.getValidAndConfirmedBallots().removeListener(ballotListChangeListener);
daoFacade.getBallots().removeListener(ballotListChangeListener);
daoFacade.removeBsqStateListener(this);
bsqWalletService.removeBsqBalanceListener(this);
@ -284,7 +284,7 @@ public class ProposalsView extends ActivatableView<GridPane, Void> implements Bs
.collect(Collectors.toSet()));
} else {
// blind vote phase
List<Ballot> ballotList = daoFacade.getValidAndConfirmedBallots();
List<Ballot> ballotList = daoFacade.getBallots();
listItems.setAll(ballotList.stream()
.map(ballot -> new ProposalsListItem(ballot, daoFacade, bsqFormatter))
.collect(Collectors.toSet()));

2
src/main/java/bisq/desktop/main/dao/governance/result/VoteListItem.java
View File

@ -70,7 +70,7 @@ public class VoteListItem {
public Tuple2<AwesomeIcon, String> getIconStyleTuple() {
Optional<Boolean> isAccepted;
isAccepted = decryptedVote.getBallotList().stream()
.filter(ballot -> ballot.getProposalTxId().equals(proposalTxId))
.filter(ballot -> ballot.getTxId().equals(proposalTxId))
.map(Ballot::getVote)
.filter(vote -> vote instanceof BooleanVote)
.map(vote -> (BooleanVote) vote)

8
src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java
View File

@ -225,8 +225,8 @@ public class VoteResultView extends ActivatableView<GridPane, Void> implements B
if (selectedProposalListItem != null) {
EvaluatedProposal evaluatedProposal = selectedProposalListItem.getEvaluatedProposal();
Optional<Ballot> optionalBallot = daoFacade.getAllBallots().stream()
.filter(ballot -> ballot.getProposalTxId().equals(evaluatedProposal.getProposalTxId()))
Optional<Ballot> optionalBallot = daoFacade.getBallots().stream()
.filter(ballot -> ballot.getTxId().equals(evaluatedProposal.getProposalTxId()))
.findAny();
Ballot ballot = optionalBallot.orElse(null);
createProposalDisplay(evaluatedProposal, ballot);
@ -330,9 +330,9 @@ public class VoteResultView extends ActivatableView<GridPane, Void> implements B
proposalList.clear();
proposalList.forEach(ProposalListItem::resetTableRow);
Map<String, Ballot> ballotByProposalTxIdMap = daoFacade.getAllBallots()
Map<String, Ballot> ballotByProposalTxIdMap = daoFacade.getBallots()
.stream()
.collect(Collectors.toMap(Ballot::getProposalTxId, ballot -> ballot));
.collect(Collectors.toMap(Ballot::getTxId, ballot -> ballot));
proposalList.setAll(resultsOfCycle.getEvaluatedProposals().stream()
.map(evaluatedProposal -> new ProposalListItem(evaluatedProposal,
ballotByProposalTxIdMap.get(evaluatedProposal.getProposalTxId()),