mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Invert isWinnerPublisher to get desired default boolean value (backward compatible)

Browse source
This commit is contained in:
Manfred Karrer 2016-10-07 01:27:08 +02:00
parent 77fb064c93
commit d06cea7332
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/io/bitsquare/arbitration/DisputeManager.java
View file

@ -570,7 +570,7 @@ public class DisputeManager {
// There are cased where the user who receives the trade amount does not come online, so we might want to
// let the loser publish the tx.
// Default isWinnerIsPublisher is set to true
if (!disputeResult.isWinnerIsPublisher()) {
if (disputeResult.isLoserPublisher()) {
// we invert the logic
if (publisher == DisputeResult.Winner.BUYER)
publisher = DisputeResult.Winner.SELLER;

10
core/src/main/java/io/bitsquare/arbitration/DisputeResult.java
View file

@ -81,7 +81,7 @@ public final class DisputeResult implements Payload {
private String arbitratorAddressAsString;
private byte[] arbitratorPubKey;
private long closeDate;
private boolean winnerIsPublisher;
private boolean isLoserPublisher;
transient private BooleanProperty tamperProofEvidenceProperty = new SimpleBooleanProperty();
transient private BooleanProperty idVerificationProperty = new SimpleBooleanProperty();
@ -246,12 +246,12 @@ public final class DisputeResult implements Payload {
return winner;
}
public void setWinnerIsPublisher(boolean winnerIsPublisher) {
this.winnerIsPublisher = winnerIsPublisher;
public void setLoserPublisher(boolean loserPublisher) {
this.isLoserPublisher = loserPublisher;
}
public boolean isWinnerIsPublisher() {
return winnerIsPublisher;
public boolean isLoserPublisher() {
return isLoserPublisher;
}
@Override

14
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
View file

@ -83,7 +83,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
private ChangeListener<Toggle> feeToggleSelectionListener, reasonToggleSelectionListener;
private InputTextField buyerPayoutAmountInputTextField, sellerPayoutAmountInputTextField, arbitratorPayoutAmountInputTextField;
private ChangeListener<String> buyerPayoutAmountListener, sellerPayoutAmountListener, arbitratorPayoutAmountListener;
private CheckBox winnerIsPublisherCheckBox;
private CheckBox isLoserPublisherCheckBox;
// keep a reference to not get GCed
@ -193,7 +193,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
disputeResult.setArbitratorPayoutAmount(peersDisputeResult.getArbitratorPayoutAmount());
disputeResult.setDisputeFeePolicy(peersDisputeResult.getDisputeFeePolicy());
disputeResult.setWinner(peersDisputeResult.getWinner());
disputeResult.setWinnerIsPublisher(peersDisputeResult.isWinnerIsPublisher());
disputeResult.setLoserPublisher(peersDisputeResult.isLoserPublisher());
disputeResult.setReason(peersDisputeResult.getReason());
disputeResult.setSummaryNotes(peersDisputeResult.summaryNotesProperty().get());
@ -225,8 +225,8 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
reasonWasScamRadioButton.setDisable(true);
reasonWasOtherRadioButton.setDisable(true);
winnerIsPublisherCheckBox.setDisable(true);
winnerIsPublisherCheckBox.setSelected(peersDisputeResult.isWinnerIsPublisher());
isLoserPublisherCheckBox.setDisable(true);
isLoserPublisherCheckBox.setSelected(peersDisputeResult.isLoserPublisher());
calculatePayoutAmounts(disputeResult.getDisputeFeePolicy());
applyTradeAmountRadioButtonStates();
@ -239,7 +239,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
feePaymentPolicyListener = (observable, oldValue, newValue) -> applyPayoutAmounts(newValue.first, newValue.second);
feePaymentPolicyChanged.addListener(feePaymentPolicyListener);
winnerIsPublisherCheckBox.setSelected(true);
isLoserPublisherCheckBox.setSelected(false);
}
setFeeRadioButtonState();
@ -461,7 +461,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
arbitratorPayoutAmountInputTextField = addLabelInputTextField(gridPane, ++rowIndex, "Arbitrators payout amount:").second;
arbitratorPayoutAmountInputTextField.setEditable(false);
winnerIsPublisherCheckBox = addLabelCheckBox(gridPane, ++rowIndex, "Winner is publisher:").second;
isLoserPublisherCheckBox = addLabelCheckBox(gridPane, ++rowIndex, "Use loser as publisher:").second;
}
private void setFeeRadioButtonState() {
@ -615,7 +615,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
closeTicketButton.disableProperty().unbind();
dispute.setDisputeResult(disputeResult);
disputeResult.setWinnerIsPublisher(winnerIsPublisherCheckBox.isSelected());
disputeResult.setLoserPublisher(isLoserPublisherCheckBox.isSelected());
disputeResult.setCloseDate(new Date());
String text = "Ticket closed on " + formatter.formatDateTime(disputeResult.getCloseDate()) +
"\n\nSummary:" +