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

Use generics for FormBuilder.ListView

Browse Source
This commit is contained in:
Manfred Karrer 2018-07-25 14:54:40 +02:00
parent f4beb7e911
commit 8d70aad2a1
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
7 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/bisq/desktop/main/account/arbitratorregistration/ArbitratorRegistrationView.java
View File

@ -64,7 +64,10 @@ import javafx.collections.ListChangeListener;
import javafx.util.Callback; import javafx.util.Callback;
import javafx.util.StringConverter; import javafx.util.StringConverter;
import static bisq.desktop.util.FormBuilder.*; import static bisq.desktop.util.FormBuilder.addButton;
import static bisq.desktop.util.FormBuilder.addButtonAfterGroup;
import static bisq.desktop.util.FormBuilder.addMultilineLabel;
import static bisq.desktop.util.FormBuilder.addTitledGroupBg;
@FxmlView @FxmlView
public class ArbitratorRegistrationView extends ActivatableViewAndModel<VBox, ArbitratorRegistrationViewModel> { public class ArbitratorRegistrationView extends ActivatableViewAndModel<VBox, ArbitratorRegistrationViewModel> {
@ -153,7 +156,7 @@ public class ArbitratorRegistrationView extends ActivatableViewAndModel<VBox, Ar
pubKeyTextField.textProperty().bind(model.registrationPubKeyAsHex); pubKeyTextField.textProperty().bind(model.registrationPubKeyAsHex);
Tuple2<Label, ListView> tuple = addLabelListView(gridPane, ++gridRow, Res.get("shared.yourLanguage")); Tuple2<Label, ListView<String>> tuple = FormBuilder.addLabelListView(gridPane, ++gridRow, Res.get("shared.yourLanguage"));
GridPane.setValignment(tuple.first, VPos.TOP); GridPane.setValignment(tuple.first, VPos.TOP);
languagesListView = tuple.second; languagesListView = tuple.second;
languagesListView.disableProperty().bind(model.registrationEditDisabled); languagesListView.disableProperty().bind(model.registrationEditDisabled);

3
src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java
View File

@ -66,7 +66,6 @@ import java.util.concurrent.TimeUnit;
import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup; import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup;
import static bisq.desktop.util.FormBuilder.add3ButtonsAfterGroup; import static bisq.desktop.util.FormBuilder.add3ButtonsAfterGroup;
import static bisq.desktop.util.FormBuilder.addLabelListView;
import static bisq.desktop.util.FormBuilder.addTitledGroupBg; import static bisq.desktop.util.FormBuilder.addTitledGroupBg;
@FxmlView @FxmlView
@ -213,7 +212,7 @@ public class AltCoinAccountsView extends ActivatableViewAndModel<GridPane, AltCo
private void buildForm() { private void buildForm() {
addTitledGroupBg(root, gridRow, 1, Res.get("shared.manageAccounts")); addTitledGroupBg(root, gridRow, 1, Res.get("shared.manageAccounts"));
Tuple2<Label, ListView> tuple = addLabelListView(root, gridRow, Res.get("account.altcoin.yourAltcoinAccounts"), Layout.FIRST_ROW_DISTANCE); Tuple2<Label, ListView<PaymentAccount>> tuple = FormBuilder.addLabelListView(root, gridRow, Res.get("account.altcoin.yourAltcoinAccounts"), Layout.FIRST_ROW_DISTANCE);
GridPane.setValignment(tuple.first, VPos.TOP); GridPane.setValignment(tuple.first, VPos.TOP);
paymentAccountsListView = tuple.second; paymentAccountsListView = tuple.second;
paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14); paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14);

3
src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
View File

@ -66,7 +66,6 @@ import javafx.util.Callback;
import javafx.util.StringConverter; import javafx.util.StringConverter;
import static bisq.desktop.util.FormBuilder.addCheckBox; import static bisq.desktop.util.FormBuilder.addCheckBox;
import static bisq.desktop.util.FormBuilder.addLabelListView;
import static bisq.desktop.util.FormBuilder.addTitledGroupBg; import static bisq.desktop.util.FormBuilder.addTitledGroupBg;
@FxmlView @FxmlView
@ -157,7 +156,7 @@ public class ArbitratorSelectionView extends ActivatableViewAndModel<GridPane, A
private void addLanguageGroup() { private void addLanguageGroup() {
addTitledGroupBg(root, gridRow, 1, Res.get("account.arbitratorSelection.whichLanguages")); addTitledGroupBg(root, gridRow, 1, Res.get("account.arbitratorSelection.whichLanguages"));
Tuple2<Label, ListView> tuple = addLabelListView(root, gridRow, Res.get("shared.yourLanguage"), Layout.FIRST_ROW_DISTANCE); Tuple2<Label, ListView<String>> tuple = FormBuilder.addLabelListView(root, gridRow, Res.get("shared.yourLanguage"), Layout.FIRST_ROW_DISTANCE);
GridPane.setValignment(tuple.first, VPos.TOP); GridPane.setValignment(tuple.first, VPos.TOP);
languagesListView = tuple.second; languagesListView = tuple.second;
languagesListView.setMinHeight(3 * Layout.LIST_ROW_HEIGHT + 2); languagesListView.setMinHeight(3 * Layout.LIST_ROW_HEIGHT + 2);

3
src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
View File

@ -120,7 +120,6 @@ import java.util.stream.Collectors;
import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup; import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup;
import static bisq.desktop.util.FormBuilder.add3ButtonsAfterGroup; import static bisq.desktop.util.FormBuilder.add3ButtonsAfterGroup;
import static bisq.desktop.util.FormBuilder.addLabelListView;
import static bisq.desktop.util.FormBuilder.addTitledGroupBg; import static bisq.desktop.util.FormBuilder.addTitledGroupBg;
@FxmlView @FxmlView
@ -326,7 +325,7 @@ public class FiatAccountsView extends ActivatableViewAndModel<GridPane, FiatAcco
private void buildForm() { private void buildForm() {
addTitledGroupBg(root, gridRow, 1, Res.get("shared.manageAccounts")); addTitledGroupBg(root, gridRow, 1, Res.get("shared.manageAccounts"));
Tuple2<Label, ListView> tuple = addLabelListView(root, gridRow, Res.get("account.fiat.yourFiatAccounts"), Layout.FIRST_ROW_DISTANCE); Tuple2<Label, ListView<PaymentAccount>> tuple = FormBuilder.addLabelListView(root, gridRow, Res.get("account.fiat.yourFiatAccounts"), Layout.FIRST_ROW_DISTANCE);
GridPane.setValignment(tuple.first, VPos.TOP); GridPane.setValignment(tuple.first, VPos.TOP);
tuple.first.setTextAlignment(TextAlignment.RIGHT); tuple.first.setTextAlignment(TextAlignment.RIGHT);
paymentAccountsListView = tuple.second; paymentAccountsListView = tuple.second;

9
src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
View File

@ -226,18 +226,19 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
final boolean isSepa = paymentMethod.equals(PaymentMethod.SEPA); final boolean isSepa = paymentMethod.equals(PaymentMethod.SEPA);
final String makerPaymentAccountId = offer.getMakerPaymentAccountId(); final String makerPaymentAccountId = offer.getMakerPaymentAccountId();
final PaymentAccount myPaymentAccount = user.getPaymentAccount(makerPaymentAccountId); final PaymentAccount myPaymentAccount = user.getPaymentAccount(makerPaymentAccountId);
String countryCode = offer.getCountryCode();
if (offer.isMyOffer(keyRing) && makerPaymentAccountId != null && myPaymentAccount != null) { if (offer.isMyOffer(keyRing) && makerPaymentAccountId != null && myPaymentAccount != null) {
addLabelTextField(gridPane, ++rowIndex, Res.get("offerDetailsWindow.myTradingAccount"), myPaymentAccount.getAccountName()); addLabelTextField(gridPane, ++rowIndex, Res.get("offerDetailsWindow.myTradingAccount"), myPaymentAccount.getAccountName());
} else { } else {
final String method = Res.get(paymentMethod.getId()); final String method = Res.get(paymentMethod.getId());
String methodWithBankId = method + bankId; String methodWithBankId = method + bankId;
String paymentMethodLabel = Res.get("shared.paymentMethod"); String paymentMethodLabel = Res.get("shared.paymentMethod");
if (isNationalBanks || isSpecificBanks || isSepa) { if (countryCode != null && (isNationalBanks || isSpecificBanks || isSepa)) {
if (BankUtil.isBankIdRequired(offer.getCountryCode())) if (BankUtil.isBankIdRequired(countryCode))
addLabelTextField(gridPane, ++rowIndex, addLabelTextField(gridPane, ++rowIndex,
paymentMethodLabel + " " + Res.get("offerDetailsWindow.offererBankId"), paymentMethodLabel + " " + Res.get("offerDetailsWindow.offererBankId"),
methodWithBankId); methodWithBankId);
else if (BankUtil.isBankNameRequired(offer.getCountryCode())) else if (BankUtil.isBankNameRequired(countryCode))
addLabelTextField(gridPane, ++rowIndex, addLabelTextField(gridPane, ++rowIndex,
paymentMethodLabel + " " + Res.get("offerDetailsWindow.offerersBankName"), paymentMethodLabel + " " + Res.get("offerDetailsWindow.offerersBankName"),
methodWithBankId); methodWithBankId);
@ -293,7 +294,7 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
} }
rows = 4; rows = 4;
String paymentMethodCountryCode = offer.getCountryCode(); String paymentMethodCountryCode = countryCode;
if (paymentMethodCountryCode != null) if (paymentMethodCountryCode != null)
rows++; rows++;
if (offer.getOfferFeePaymentTxId() != null) if (offer.getOfferFeePaymentTxId() != null)

4
src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
View File

@ -320,7 +320,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Activatab
} }
}); });
Tuple2<Label, ListView> fiatTuple = addLabelListView(root, ++gridRow, Res.get("setting.preferences.displayFiat")); Tuple2<Label, ListView<FiatCurrency>> fiatTuple = FormBuilder.addLabelListView(root, ++gridRow, Res.get("setting.preferences.displayFiat"));
GridPane.setValignment(fiatTuple.first, VPos.TOP); GridPane.setValignment(fiatTuple.first, VPos.TOP);
fiatCurrenciesListView = fiatTuple.second; fiatCurrenciesListView = fiatTuple.second;
fiatCurrenciesListView.setMinHeight(2 * Layout.LIST_ROW_HEIGHT + 2); fiatCurrenciesListView.setMinHeight(2 * Layout.LIST_ROW_HEIGHT + 2);
@ -367,7 +367,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Activatab
} }
}); });
Tuple2<Label, ListView> cryptoCurrenciesTuple = addLabelListView(root, gridRow, Res.get("setting.preferences.displayAltcoins")); Tuple2<Label, ListView<CryptoCurrency>> cryptoCurrenciesTuple = FormBuilder.addLabelListView(root, gridRow, Res.get("setting.preferences.displayAltcoins"));
GridPane.setValignment(cryptoCurrenciesTuple.first, VPos.TOP); GridPane.setValignment(cryptoCurrenciesTuple.first, VPos.TOP);
GridPane.setMargin(cryptoCurrenciesTuple.first, new Insets(0, 0, 0, 20)); GridPane.setMargin(cryptoCurrenciesTuple.first, new Insets(0, 0, 0, 20));
cryptoCurrenciesListView = cryptoCurrenciesTuple.second; cryptoCurrenciesListView = cryptoCurrenciesTuple.second;

6
src/main/java/bisq/desktop/util/FormBuilder.java
View File

@ -1200,14 +1200,14 @@ public class FormBuilder {
// Label + List // Label + List
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public static Tuple2<Label, ListView> addLabelListView(GridPane gridPane, int rowIndex, String title) { public static <T> Tuple2<Label, ListView<T>> addLabelListView(GridPane gridPane, int rowIndex, String title) {
return addLabelListView(gridPane, rowIndex, title, 0); return addLabelListView(gridPane, rowIndex, title, 0);
} }
public static Tuple2<Label, ListView> addLabelListView(GridPane gridPane, int rowIndex, String title, double top) { public static <T> Tuple2<Label, ListView<T>> addLabelListView(GridPane gridPane, int rowIndex, String title, double top) {
Label label = addLabel(gridPane, rowIndex, title, top); Label label = addLabel(gridPane, rowIndex, title, top);
ListView listView = new ListView(); ListView<T> listView = new ListView<>();
GridPane.setRowIndex(listView, rowIndex); GridPane.setRowIndex(listView, rowIndex);
GridPane.setColumnIndex(listView, 1); GridPane.setColumnIndex(listView, 1);
GridPane.setMargin(listView, new Insets(top, 0, 0, 0)); GridPane.setMargin(listView, new Insets(top, 0, 0, 0));