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

Fix typo fist > first

Browse source
This commit is contained in:
Christoph Atteneder 2019-09-13 11:24:40 +02:00
parent a09557fc45
commit 8f2009683c
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
8 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeStepInfo.java
View file

@ -62,7 +62,7 @@ public class TradeStepInfo {
private Trade trade;
@Getter
private State state = State.UNDEFINED;
private Supplier<String> fistHalfOverWarnTextSupplier = () -> "";
private Supplier<String> firstHalfOverWarnTextSupplier = () -> "";
private Supplier<String> periodOverWarnTextSupplier = () -> "";
TradeStepInfo(TitledGroupBg titledGroupBg, Label label, AutoTooltipButton button) {
@ -84,8 +84,8 @@ public class TradeStepInfo {
button.setOnAction(e);
}
public void setFistHalfOverWarnTextSupplier(Supplier<String> fistHalfOverWarnTextSupplier) {
this.fistHalfOverWarnTextSupplier = fistHalfOverWarnTextSupplier;
public void setFirstHalfOverWarnTextSupplier(Supplier<String> firstHalfOverWarnTextSupplier) {
this.firstHalfOverWarnTextSupplier = firstHalfOverWarnTextSupplier;
}
public void setPeriodOverWarnTextSupplier(Supplier<String> periodOverWarnTextSupplier) {
@ -172,7 +172,7 @@ public class TradeStepInfo {
case WARN_HALF_PERIOD:
// orange button
titledGroupBg.setText(Res.get("portfolio.pending.support.headline.halfPeriodOver"));
label.setText(fistHalfOverWarnTextSupplier.get());
label.setText(firstHalfOverWarnTextSupplier.get());
button.setText(Res.get("portfolio.pending.openSupport").toUpperCase());
button.setId(null);
button.getStyleClass().remove("action-button");

19
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
View file

@ -339,7 +339,6 @@ public abstract class TradeStepView extends AnchorPane {
GridPane.setColumnSpan(titledGroupBg, 2);
infoLabel = addMultilineLabel(gridPane, gridRow, "", Layout.COMPACT_FIRST_ROW_AND_COMPACT_GROUP_DISTANCE);
// infoLabel = addMultilineLabel(gridPane, gridRow, "", 0);
GridPane.setColumnSpan(infoLabel, 2);
}
@ -380,12 +379,12 @@ public abstract class TradeStepView extends AnchorPane {
public void setTradeStepInfo(TradeStepInfo tradeStepInfo) {
this.tradeStepInfo = tradeStepInfo;
tradeStepInfo.setFistHalfOverWarnTextSupplier(this::getFistHalfOverWarnText);
tradeStepInfo.setFirstHalfOverWarnTextSupplier(this::getFirstHalfOverWarnText);
tradeStepInfo.setPeriodOverWarnTextSupplier(this::getPeriodOverWarnText);
}
protected String getFistHalfOverWarnText() {
protected String getFirstHalfOverWarnText() {
return "";
}
@ -409,7 +408,7 @@ public abstract class TradeStepView extends AnchorPane {
break;
case DISPUTE_REQUESTED:
if (tradeStepInfo != null) {
tradeStepInfo.setFistHalfOverWarnTextSupplier(this::getFistHalfOverWarnText);
tradeStepInfo.setFirstHalfOverWarnTextSupplier(this::getFirstHalfOverWarnText);
}
applyOnDisputeOpened();
@ -422,7 +421,7 @@ public abstract class TradeStepView extends AnchorPane {
break;
case DISPUTE_STARTED_BY_PEER:
if (tradeStepInfo != null) {
tradeStepInfo.setFistHalfOverWarnTextSupplier(this::getFistHalfOverWarnText);
tradeStepInfo.setFirstHalfOverWarnTextSupplier(this::getFirstHalfOverWarnText);
}
applyOnDisputeOpened();
@ -436,7 +435,7 @@ public abstract class TradeStepView extends AnchorPane {
break;
case MEDIATION_REQUESTED:
if (tradeStepInfo != null) {
tradeStepInfo.setFistHalfOverWarnTextSupplier(this::getFistHalfOverWarnText);
tradeStepInfo.setFirstHalfOverWarnTextSupplier(this::getFirstHalfOverWarnText);
}
applyOnDisputeOpened();
@ -449,7 +448,7 @@ public abstract class TradeStepView extends AnchorPane {
break;
case MEDIATION_STARTED_BY_PEER:
if (tradeStepInfo != null) {
tradeStepInfo.setFistHalfOverWarnTextSupplier(this::getFistHalfOverWarnText);
tradeStepInfo.setFirstHalfOverWarnTextSupplier(this::getFirstHalfOverWarnText);
}
applyOnDisputeOpened();
@ -595,13 +594,13 @@ public abstract class TradeStepView extends AnchorPane {
tradeStepInfo.setState(TradeStepInfo.State.WARN_HALF_PERIOD);
} else if (tradeStepInfo.getState() == TradeStepInfo.State.WARN_HALF_PERIOD) {
tradeStepInfo.setState(TradeStepInfo.State.SHOW_GET_HELP_BUTTON);
tradeStepInfo.setFistHalfOverWarnTextSupplier(this::getFistHalfOverWarnText);
tradeStepInfo.setFirstHalfOverWarnTextSupplier(this::getFirstHalfOverWarnText);
}
break;
case SECOND_HALF:
if (!trade.isFiatReceived()) {
if (tradeStepInfo != null) {
tradeStepInfo.setFistHalfOverWarnTextSupplier(this::getFistHalfOverWarnText);
tradeStepInfo.setFirstHalfOverWarnTextSupplier(this::getFirstHalfOverWarnText);
tradeStepInfo.setState(TradeStepInfo.State.WARN_HALF_PERIOD);
}
} else {
@ -610,7 +609,7 @@ public abstract class TradeStepView extends AnchorPane {
break;
case TRADE_PERIOD_OVER:
if (tradeStepInfo != null) {
tradeStepInfo.setFistHalfOverWarnTextSupplier(this::getPeriodOverWarnText);
tradeStepInfo.setFirstHalfOverWarnTextSupplier(this::getPeriodOverWarnText);
tradeStepInfo.setState(TradeStepInfo.State.WARN_PERIOD_OVER);
}
break;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java
View file

@ -51,7 +51,7 @@ public class BuyerStep1View extends TradeStepView {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
protected String getFistHalfOverWarnText() {
protected String getFirstHalfOverWarnText() {
return Res.get("portfolio.pending.step1.warn");
}

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
View file

@ -337,7 +337,7 @@ public class BuyerStep2View extends TradeStepView {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
protected String getFistHalfOverWarnText() {
protected String getFirstHalfOverWarnText() {
return Res.get("portfolio.pending.step2_buyer.warn",
model.dataModel.getCurrencyCode(),
model.getDateForOpenDispute());

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java
View file

@ -128,7 +128,7 @@ public class BuyerStep3View extends TradeStepView {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
protected String getFistHalfOverWarnText() {
protected String getFirstHalfOverWarnText() {
String substitute = model.isBlockChainMethod() ?
Res.get("portfolio.pending.step3_buyer.warn.part1a", model.dataModel.getCurrencyCode()) :
Res.get("portfolio.pending.step3_buyer.warn.part1b");

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java
View file

@ -51,7 +51,7 @@ public class SellerStep1View extends TradeStepView {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
protected String getFistHalfOverWarnText() {
protected String getFirstHalfOverWarnText() {
return Res.get("portfolio.pending.step1.warn");
}

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java
View file

@ -70,7 +70,7 @@ public class SellerStep2View extends TradeStepView {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
protected String getFistHalfOverWarnText() {
protected String getFirstHalfOverWarnText() {
return Res.get("portfolio.pending.step2_seller.warn",
model.dataModel.getCurrencyCode(),
model.getDateForOpenDispute());

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
View file

@ -246,7 +246,7 @@ public class SellerStep3View extends TradeStepView {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
protected String getFistHalfOverWarnText() {
protected String getFirstHalfOverWarnText() {
String substitute = model.isBlockChainMethod() ?
Res.get("portfolio.pending.step3_seller.warn.part1a", model.dataModel.getCurrencyCode()) :
Res.get("portfolio.pending.step3_seller.warn.part1b");