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

Add param request

Browse Source
This commit is contained in:
Manfred Karrer 2018-07-09 22:13:52 +02:00
parent 387078b157
commit 052c46fe06
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
2 changed files with 101 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/main/java/bisq/desktop/main/dao/proposal/ProposalDisplay.java
View File

@ -32,10 +32,13 @@ import bisq.core.dao.voting.proposal.ProposalConsensus;
import bisq.core.dao.voting.proposal.ProposalType;
import bisq.core.dao.voting.proposal.compensation.CompensationConsensus;
import bisq.core.dao.voting.proposal.compensation.CompensationProposal;
import bisq.core.dao.voting.proposal.param.Param;
import bisq.core.dao.voting.proposal.param.ParamProposal;
import bisq.core.locale.Res;
import bisq.core.provider.fee.FeeService;
import bisq.core.util.BsqFormatter;
import javafx.scene.control.ComboBox;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.TextArea;
import javafx.scene.layout.AnchorPane;
@ -47,7 +50,10 @@ import javafx.geometry.HPos;
import javafx.beans.value.ChangeListener;
import java.util.Objects;
import javafx.collections.FXCollections;
import javafx.util.StringConverter;
import java.util.UUID;
import lombok.extern.slf4j.Slf4j;
@ -64,7 +70,9 @@ public class ProposalDisplay {
private BsqWalletService bsqWalletService;
public InputTextField uidTextField, nameTextField, titleTextField, linkInputTextField;
@Nullable
public InputTextField requestedBsqTextField, bsqAddressTextField;
public InputTextField requestedBsqTextField, bsqAddressTextField, paramValueTextField;
@Nullable
public ComboBox<Param> paramComboBox;
private int gridRow;
public TextArea descriptionTextArea;
private HyperlinkWithIcon linkHyperlinkWithIcon;
@ -96,12 +104,16 @@ public class ProposalDisplay {
this.gridRowStartIndex = gridRowStartIndex;
this.gridRow = gridRowStartIndex;
int rowSpan;
boolean hasAddedFields = proposalType == ProposalType.COMPENSATION_REQUEST ||
proposalType == ProposalType.CHANGE_PARAM;
;
if (isMakeProposalScreen) {
rowSpan = proposalType == ProposalType.COMPENSATION_REQUEST ? 7 : 5;
rowSpan = hasAddedFields ? 7 : 5;
} else if (showDetails) {
rowSpan = proposalType == ProposalType.COMPENSATION_REQUEST ? 8 : 6;
rowSpan = hasAddedFields ? 8 : 6;
} else {
rowSpan = proposalType == ProposalType.COMPENSATION_REQUEST ? 5 : 4;
rowSpan = hasAddedFields ? 5 : 4;
}
addTitledGroupBg(gridPane, gridRow, rowSpan, title, top);
@ -117,7 +129,8 @@ public class ProposalDisplay {
titleTextField = addLabelInputTextField(gridPane, ++gridRow, Res.getWithCol("dao.proposal.title")).second;
descriptionTextArea = addLabelTextArea(gridPane, ++gridRow, Res.get("dao.proposal.display.description"), Res.get("dao.proposal.display.description.prompt", maxLengthDescriptionText)).second;
descriptionTextArea = addLabelTextArea(gridPane, ++gridRow, Res.get("dao.proposal.display.description"),
Res.get("dao.proposal.display.description.prompt", maxLengthDescriptionText)).second;
descriptionTextArea.setMaxHeight(42); // for 2 lines
descriptionTextArea.setMinHeight(descriptionTextArea.getMaxHeight());
if (isMakeProposalScreen)
@ -129,23 +142,44 @@ public class ProposalDisplay {
linkHyperlinkWithIcon.setManaged(false);
linkInputTextField.setPromptText(Res.get("dao.proposal.display.link.prompt"));
if (proposalType == ProposalType.COMPENSATION_REQUEST) {
requestedBsqTextField = addLabelInputTextField(gridPane, ++gridRow, Res.get("dao.proposal.display.requestedBsq")).second;
switch (proposalType) {
case COMPENSATION_REQUEST:
requestedBsqTextField = addLabelInputTextField(gridPane, ++gridRow, Res.get("dao.proposal.display.requestedBsq")).second;
if (feeService != null) {
BsqValidator bsqValidator = new BsqValidator(bsqFormatter);
//TODO should we use the BSQ or a BTC validator? Technically it is BTC at that stage...
//bsqValidator.setMinValue(feeService.getCreateCompensationRequestFee());
bsqValidator.setMinValue(CompensationConsensus.getMinCompensationRequestAmount());
requestedBsqTextField.setValidator(bsqValidator);
}
// TODO validator, addressTF
if (showDetails) {
bsqAddressTextField = addLabelInputTextField(gridPane, ++gridRow,
Res.get("dao.proposal.display.bsqAddress")).second;
bsqAddressTextField.setText("B" + bsqWalletService.getUnusedAddress().toBase58());
bsqAddressTextField.setValidator(new BsqAddressValidator(bsqFormatter));
}
break;
case GENERIC:
break;
case CHANGE_PARAM:
paramComboBox = addLabelComboBox(gridPane, ++gridRow, Res.get("dao.proposal.display.paramComboBox.label")).second;
paramComboBox.setItems(FXCollections.observableArrayList(Param.values()));
paramComboBox.setConverter(new StringConverter<Param>() {
@Override
public String toString(Param param) {
return param.name();
}
if (feeService != null) {
BsqValidator bsqValidator = new BsqValidator(bsqFormatter);
//TODO should we use the BSQ or a BTC validator? Technically it is BTC at that stage...
//bsqValidator.setMinValue(feeService.getCreateCompensationRequestFee());
bsqValidator.setMinValue(CompensationConsensus.getMinCompensationRequestAmount());
Objects.requireNonNull(requestedBsqTextField).setValidator(bsqValidator);
}
// TODO validator, addressTF
if (showDetails) {
bsqAddressTextField = addLabelInputTextField(gridPane, ++gridRow,
Res.get("dao.proposal.display.bsqAddress")).second;
Objects.requireNonNull(bsqAddressTextField).setText("B" + bsqWalletService.getUnusedAddress().toBase58());
bsqAddressTextField.setValidator(new BsqAddressValidator(bsqFormatter));
}
@Override
public Param fromString(String string) {
return null;
}
});
paramValueTextField = addLabelInputTextField(gridPane, ++gridRow, Res.get("dao.proposal.display.paramValue")).second;
break;
case REMOVE_ALTCOIN:
break;
}
if (!isMakeProposalScreen && showDetails)
@ -167,9 +201,13 @@ public class ProposalDisplay {
linkHyperlinkWithIcon.setOnAction(e -> GUIUtil.openWebPage(proposal.getLink()));
if (proposal instanceof CompensationProposal) {
CompensationProposal compensationProposal = (CompensationProposal) proposal;
Objects.requireNonNull(requestedBsqTextField).setText(bsqFormatter.formatCoinWithCode(compensationProposal.getRequestedBsq()));
requestedBsqTextField.setText(bsqFormatter.formatCoinWithCode(compensationProposal.getRequestedBsq()));
if (bsqAddressTextField != null)
bsqAddressTextField.setText(compensationProposal.getBsqAddress());
} else if (proposal instanceof ParamProposal) {
ParamProposal paramProposal = (ParamProposal) proposal;
paramComboBox.getSelectionModel().select(paramProposal.getParam());
paramValueTextField.setText(String.valueOf(paramProposal.getParamValue()));
}
if (txIdTextField != null)
txIdTextField.setup(proposal.getTxId());
@ -184,6 +222,8 @@ public class ProposalDisplay {
if (linkHyperlinkWithIcon != null) linkHyperlinkWithIcon.clear();
if (requestedBsqTextField != null) requestedBsqTextField.clear();
if (bsqAddressTextField != null) bsqAddressTextField.clear();
if (paramComboBox != null) paramComboBox.getSelectionModel().clearSelection();
if (paramValueTextField != null) paramValueTextField.clear();
if (txIdTextField != null) txIdTextField.cleanup();
if (descriptionTextArea != null) descriptionTextArea.textProperty().removeListener(descriptionTextAreaListener);
}
@ -198,6 +238,11 @@ public class ProposalDisplay {
requestedBsqTextField.setText("14000");
if (bsqAddressTextField != null)
bsqAddressTextField.setText("B" + bsqWalletService.getUnusedAddress().toBase58());
if (paramComboBox != null)
paramComboBox.getSelectionModel().select(8); // PROPOSAL_FEE
if (paramValueTextField != null)
paramValueTextField.setText("333");
}
public void setEditable(boolean isEditable) {
@ -210,6 +255,11 @@ public class ProposalDisplay {
if (bsqAddressTextField != null)
bsqAddressTextField.setEditable(isEditable);
if (paramComboBox != null)
paramComboBox.setEditable(isEditable);
if (paramValueTextField != null)
paramValueTextField.setEditable(isEditable);
linkInputTextField.setVisible(true);
linkInputTextField.setManaged(true);
linkHyperlinkWithIcon.setVisible(false);

33
src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
View File

@ -37,6 +37,7 @@ import bisq.core.dao.voting.proposal.Proposal;
import bisq.core.dao.voting.proposal.ProposalConsensus;
import bisq.core.dao.voting.proposal.ProposalType;
import bisq.core.dao.voting.proposal.ProposalWithTransaction;
import bisq.core.dao.voting.proposal.param.Param;
import bisq.core.locale.Res;
import bisq.core.provider.fee.FeeService;
import bisq.core.util.BSFormatter;
@ -63,12 +64,12 @@ import javafx.util.StringConverter;
import java.io.IOException;
import java.util.Arrays;
import java.util.Objects;
import static bisq.desktop.util.FormBuilder.addButtonAfterGroup;
import static bisq.desktop.util.FormBuilder.addLabelComboBox;
import static bisq.desktop.util.FormBuilder.addTitledGroupBg;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@FxmlView
public class MakeProposalView extends ActivatableView<GridPane, Void> implements ChainHeightListener {
@ -218,12 +219,16 @@ public class MakeProposalView extends ActivatableView<GridPane, Void> implements
switch (type) {
case COMPENSATION_REQUEST:
checkNotNull(proposalDisplay.requestedBsqTextField,
"proposalDisplay.requestedBsqTextField must not be null");
checkNotNull(proposalDisplay.bsqAddressTextField,
"proposalDisplay.bsqAddressTextField must not be null");
return daoFacade.getCompensationProposalWithTransaction(proposalDisplay.nameTextField.getText(),
proposalDisplay.titleTextField.getText(),
proposalDisplay.descriptionTextArea.getText(),
proposalDisplay.linkInputTextField.getText(),
bsqFormatter.parseToCoin(Objects.requireNonNull(proposalDisplay.requestedBsqTextField).getText()),
Objects.requireNonNull(proposalDisplay.bsqAddressTextField).getText());
bsqFormatter.parseToCoin(proposalDisplay.requestedBsqTextField.getText()),
proposalDisplay.bsqAddressTextField.getText());
case GENERIC:
//TODO
throw new RuntimeException("Not implemented yet");
@ -234,8 +239,26 @@ public class MakeProposalView extends ActivatableView<GridPane, Void> implements
proposalDisplay.descriptionTextArea.getText(),
proposalDisplay.linkInputTextField.getText());*/
case CHANGE_PARAM:
//TODO
throw new RuntimeException("Not implemented yet");
Param selectedParam = proposalDisplay.paramComboBox.getSelectionModel().getSelectedItem();
if (selectedParam == null)
throw new ValidationException("selectedParam is null");
String paramValueAsString = proposalDisplay.paramValueTextField.getText();
if (paramValueAsString == null || paramValueAsString.isEmpty())
throw new ValidationException("paramValue is null or empty");
long paramValue;
try {
paramValue = Long.valueOf(paramValueAsString);
} catch (Throwable t) {
throw new ValidationException("paramValue is not a long value", t);
}
//TODO add more custom param validation
return daoFacade.getParamProposalWithTransaction(proposalDisplay.nameTextField.getText(),
proposalDisplay.titleTextField.getText(),
proposalDisplay.descriptionTextArea.getText(),
proposalDisplay.linkInputTextField.getText(),
selectedParam,
paramValue);
case REMOVE_ALTCOIN:
//TODO
throw new RuntimeException("Not implemented yet");