Skip to content

Commit

Permalink
Clean up dead code parts
Browse files Browse the repository at this point in the history
  • Loading branch information
@ripcurlx
ripcurlx committed Oct 14, 2019
1 parent dc047ef commit 0dcc20c
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 101 deletions.
2 changes: 1 addition & 1 deletion core/src/main/resources/i18n/displayStrings.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ offerbook.filterByCurrency=Filter by currency
offerbook.filterByPaymentMethod=Filter by payment method
offerbook.timeSinceSigning=Time since signing
offerbook.timeSinceSigning.info=This account was verified and {0}
offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peers accounts
offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
offerbook.timeSinceSigning.info.peer=signed by a peer, waiting for limits to be lifted
offerbook.timeSinceSigning.info.peerLimitLifted=signed by a peer and limits were lifted
offerbook.timeSinceSigning.info.signer=signed by peer and can sign peer accounts
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/MainViewModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ private void setupHandlers() {
});
bisqSetup.setSpvFileCorruptedHandler(msg -> new Popup<>().warning(msg)
.actionButtonText(Res.get("settings.net.reSyncSPVChainButton"))
.onAction(() -> GUIUtil.reSyncSPVChain(walletsSetup, preferences))
.onAction(() -> GUIUtil.reSyncSPVChain(preferences))
.show());
bisqSetup.setVoteResultExceptionHandler(voteResultException -> log.warn(voteResultException.toString()));

Expand Down
11 changes: 5 additions & 6 deletions desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ public String getSecurityDepositPopOverLabel(String depositInBTC) {

public String getSecurityDepositInfo() {
return btcFormatter.formatCoinWithCode(dataModel.getSecurityDeposit()) +
GUIUtil.getPercentageOfTradeAmount(dataModel.getSecurityDeposit(), dataModel.getAmount().get(), btcFormatter);
GUIUtil.getPercentageOfTradeAmount(dataModel.getSecurityDeposit(), dataModel.getAmount().get());
}

public String getSecurityDepositWithCode() {
Expand All @@ -968,15 +968,15 @@ public String getTradeFee() {
final Coin makerFeeAsCoin = dataModel.getMakerFee();
final String makerFee = getFormatterForMakerFee().formatCoinWithCode(makerFeeAsCoin);
if (dataModel.isCurrencyForMakerFeeBtc())
return makerFee + GUIUtil.getPercentageOfTradeAmount(makerFeeAsCoin, dataModel.getAmount().get(), btcFormatter);
return makerFee + GUIUtil.getPercentageOfTradeAmount(makerFeeAsCoin, dataModel.getAmount().get());
else
return makerFee + " (" + Res.get("shared.tradingFeeInBsqInfo", btcFormatter.formatCoinWithCode(makerFeeAsCoin)) + ")";
}

public String getMakerFeePercentage() {
final Coin makerFeeAsCoin = dataModel.getMakerFee();
if (dataModel.isCurrencyForMakerFeeBtc())
return GUIUtil.getPercentage(makerFeeAsCoin, dataModel.getAmount().get(), btcFormatter);
return GUIUtil.getPercentage(makerFeeAsCoin, dataModel.getAmount().get());
else
return Res.get("dao.paidWithBsq");
}
Expand Down Expand Up @@ -1004,13 +1004,13 @@ public String getFundsStructure() {
public String getTxFee() {
Coin txFeeAsCoin = dataModel.getTxFee();
return btcFormatter.formatCoinWithCode(txFeeAsCoin) +
GUIUtil.getPercentageOfTradeAmount(txFeeAsCoin, dataModel.getAmount().get(), btcFormatter);
GUIUtil.getPercentageOfTradeAmount(txFeeAsCoin, dataModel.getAmount().get());

}

public String getTxFeePercentage() {
Coin txFeeAsCoin = dataModel.getTxFee();
return GUIUtil.getPercentage(txFeeAsCoin, dataModel.getAmount().get(), btcFormatter);
return GUIUtil.getPercentage(txFeeAsCoin, dataModel.getAmount().get());
}

public PaymentAccount getPaymentAccount() {
Expand Down Expand Up @@ -1046,7 +1046,6 @@ public M getDataModel() {
return dataModel;
}


///////////////////////////////////////////////////////////////////////////////////////////
// Utils
///////////////////////////////////////////////////////////////////////////////////////////
Expand Down
10 changes: 5 additions & 5 deletions desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ String getTradeAmount() {

public String getSecurityDepositInfo() {
return btcFormatter.formatCoinWithCode(dataModel.getSecurityDeposit()) +
GUIUtil.getPercentageOfTradeAmount(dataModel.getSecurityDeposit(), dataModel.getAmount().get(), btcFormatter);
GUIUtil.getPercentageOfTradeAmount(dataModel.getSecurityDeposit(), dataModel.getAmount().get());
}

public String getSecurityDepositWithCode() {
Expand All @@ -710,15 +710,15 @@ public String getTradeFee() {
final Coin takerFeeAsCoin = dataModel.getTakerFee();
final String takerFee = getFormatterForTakerFee().formatCoinWithCode(takerFeeAsCoin);
if (dataModel.isCurrencyForTakerFeeBtc())
return takerFee + GUIUtil.getPercentageOfTradeAmount(takerFeeAsCoin, dataModel.getAmount().get(), btcFormatter);
return takerFee + GUIUtil.getPercentageOfTradeAmount(takerFeeAsCoin, dataModel.getAmount().get());
else
return takerFee + " (" + Res.get("shared.tradingFeeInBsqInfo", btcFormatter.formatCoinWithCode(takerFeeAsCoin)) + ")";
}

public String getTakerFeePercentage() {
final Coin takerFeeAsCoin = dataModel.getTakerFee();
if (dataModel.isCurrencyForTakerFeeBtc())
return takerFeeAsCoin != null ? GUIUtil.getPercentage(takerFeeAsCoin, dataModel.getAmount().get(), btcFormatter) : Res.get("shared.na");
return takerFeeAsCoin != null ? GUIUtil.getPercentage(takerFeeAsCoin, dataModel.getAmount().get()) : Res.get("shared.na");
else
return Res.get("dao.paidWithBsq");
}
Expand All @@ -734,13 +734,13 @@ public String getTotalToPayInfo() {
public String getTxFee() {
Coin txFeeAsCoin = dataModel.getTotalTxFee();
return btcFormatter.formatCoinWithCode(txFeeAsCoin) +
GUIUtil.getPercentageOfTradeAmount(txFeeAsCoin, dataModel.getAmount().get(), btcFormatter);
GUIUtil.getPercentageOfTradeAmount(txFeeAsCoin, dataModel.getAmount().get());

}

public String getTxFeePercentage() {
Coin txFeeAsCoin = dataModel.getTotalTxFee();
return GUIUtil.getPercentage(txFeeAsCoin, dataModel.getAmount().get(), btcFormatter);
return GUIUtil.getPercentage(txFeeAsCoin, dataModel.getAmount().get());
}

public PaymentMethod getPaymentMethod() {
Expand Down
6 changes: 3 additions & 3 deletions desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public String getFiatVolume() {
public String getTxFee() {
if (trade != null && trade.getTradeAmount() != null) {
Coin txFee = dataModel.getTxFee();
String percentage = GUIUtil.getPercentageOfTradeAmount(txFee, trade.getTradeAmount(), btcFormatter);
String percentage = GUIUtil.getPercentageOfTradeAmount(txFee, trade.getTradeAmount());
return btcFormatter.formatCoinWithCode(txFee) + percentage;
} else {
return "";
Expand All @@ -299,7 +299,7 @@ public String getTradeFee() {
if (dataModel.isMaker() && dataModel.getOffer().isCurrencyForMakerFeeBtc() ||
!dataModel.isMaker() && dataModel.getTrade().isCurrencyForTakerFeeBtc()) {
Coin tradeFeeInBTC = dataModel.getTradeFeeInBTC();
String percentage = GUIUtil.getPercentageOfTradeAmount(tradeFeeInBTC, trade.getTradeAmount(), btcFormatter);
String percentage = GUIUtil.getPercentageOfTradeAmount(tradeFeeInBTC, trade.getTradeAmount());
return btcFormatter.formatCoinWithCode(tradeFeeInBTC) + percentage;
} else {
return bsqFormatter.formatCoinWithCode(dataModel.getTradeFeeAsBsq());
Expand All @@ -316,7 +316,7 @@ public String getSecurityDeposit() {
Coin securityDeposit = dataModel.isBuyer() ?
offer.getBuyerSecurityDeposit()
: offer.getSellerSecurityDeposit();
String percentage = GUIUtil.getPercentageOfTradeAmount(securityDeposit, trade.getTradeAmount(), btcFormatter);
String percentage = GUIUtil.getPercentageOfTradeAmount(securityDeposit, trade.getTradeAmount());
return btcFormatter.formatCoinWithCode(securityDeposit) + percentage;
} else {
return "";
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ public void activate() {
}
});

reSyncSPVChainButton.setOnAction(event -> GUIUtil.reSyncSPVChain(walletsSetup, preferences));
reSyncSPVChainButton.setOnAction(event -> GUIUtil.reSyncSPVChain(preferences));

bitcoinPeersSubscription = EasyBind.subscribe(walletsSetup.connectedPeersProperty(),
connectedPeers -> updateBitcoinPeersTextArea());
Expand Down
92 changes: 8 additions & 84 deletions desktop/src/main/java/bisq/desktop/util/GUIUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.control.ComboBox;
import javafx.scene.control.ContentDisplay;
import javafx.scene.control.Label;
import javafx.scene.control.ListCell;
import javafx.scene.control.ListView;
Expand All @@ -103,21 +104,16 @@
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Pane;
import javafx.scene.layout.Region;

import javafx.geometry.Orientation;

import javafx.beans.property.DoubleProperty;

import javafx.collections.FXCollections;

import javafx.util.Callback;
import javafx.util.StringConverter;

import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;

import java.nio.file.Paths;

Expand Down Expand Up @@ -209,7 +205,7 @@ public static void exportAccounts(ArrayList<PaymentAccount> accounts,
CorruptedDatabaseFilesHandler corruptedDatabaseFilesHandler) {
if (!accounts.isEmpty()) {
String directory = getDirectoryFromChooser(preferences, stage);
if (directory != null && !directory.isEmpty()) {
if (!directory.isEmpty()) {
Storage<PersistableList<PaymentAccount>> paymentAccountsStorage = new Storage<>(new File(directory), persistenceProtoResolver, corruptedDatabaseFilesHandler);
paymentAccountsStorage.initAndGetPersisted(new PaymentAccountList(accounts), fileName, 100);
paymentAccountsStorage.queueUpForSave();
Expand Down Expand Up @@ -309,7 +305,7 @@ public static void exportJSON(String fileName, JsonElement data, Stage stage) {
}
}

public static String getDirectoryFromChooser(Preferences preferences, Stage stage) {
private static String getDirectoryFromChooser(Preferences preferences, Stage stage) {
DirectoryChooser directoryChooser = new DirectoryChooser();
File initDir = new File(preferences.getDirectoryChooserPath());
if (initDir.isDirectory()) {
Expand All @@ -326,51 +322,6 @@ public static String getDirectoryFromChooser(Preferences preferences, Stage stag
}
}

public static ListCell<CurrencyListItem> getCurrencyListItemButtonCell(String postFixSingle, String postFixMulti,
Preferences preferences) {
return new ListCell<>() {

@Override
protected void updateItem(CurrencyListItem item, boolean empty) {
super.updateItem(item, empty);

if (item != null && !empty) {
String code = item.tradeCurrency.getCode();

AnchorPane pane = new AnchorPane();
Label currency = new AutoTooltipLabel(code + " - " + item.tradeCurrency.getName());
currency.getStyleClass().add("currency-label-selected");
AnchorPane.setLeftAnchor(currency, 0.0);
pane.getChildren().add(currency);

switch (code) {
case GUIUtil.SHOW_ALL_FLAG:
currency.setText(Res.get("list.currency.showAll"));
break;
case GUIUtil.EDIT_FLAG:
currency.setText(Res.get("list.currency.editList"));
break;
default:
if (preferences.isSortMarketCurrenciesNumerically()) {
Label numberOfOffers = new AutoTooltipLabel(item.numTrades + " " +
(item.numTrades == 1 ? postFixSingle : postFixMulti));
numberOfOffers.getStyleClass().add("offer-label-small");
AnchorPane.setRightAnchor(numberOfOffers, 0.0);
AnchorPane.setBottomAnchor(numberOfOffers, 2.0);
pane.getChildren().add(numberOfOffers);
}
}

setGraphic(pane);
setText("");
} else {
setGraphic(null);
setText("");
}
}
};
}

public static Callback<ListView<CurrencyListItem>, ListCell<CurrencyListItem>> getCurrencyListItemCellFactory(String postFixSingle,
String postFixMulti,
Preferences preferences) {
Expand Down Expand Up @@ -692,23 +643,12 @@ private static void doOpenWebPage(String target) {
}
}

public static void openMail(String to, String subject, String body) {
try {
subject = URLEncoder.encode(subject, "UTF-8").replace("+", "%20");
body = URLEncoder.encode(body, "UTF-8").replace("+", "%20");
Utilities.openURI(new URI("mailto:" + to + "?subject=" + subject + "&body=" + body));
} catch (IOException | URISyntaxException e) {
log.error("openMail failed " + e.getMessage());
e.printStackTrace();
}
}

public static String getPercentageOfTradeAmount(Coin fee, Coin tradeAmount, BSFormatter formatter) {
return " (" + getPercentage(fee, tradeAmount, formatter) +
public static String getPercentageOfTradeAmount(Coin fee, Coin tradeAmount) {
return " (" + getPercentage(fee, tradeAmount) +
" " + Res.get("guiUtil.ofTradeAmount") + ")";
}

public static String getPercentage(Coin part, Coin total, BSFormatter formatter) {
public static String getPercentage(Coin part, Coin total) {
return BSFormatter.formatToPercentWithSymbol((double) part.value / (double) total.value);
}

Expand All @@ -735,22 +675,6 @@ public static void showClearXchangeWarning() {
.show();
}

public static void fillAvailableHeight(Pane container, Region component, DoubleProperty initialOccupiedHeight) {
UserThread.runAfter(() -> {

double available;
if (container.getParent() instanceof Pane)
available = ((Pane) container.getParent()).getHeight();
else
available = container.getHeight();

if (initialOccupiedHeight.get() == -1 && component.getHeight() > 0) {
initialOccupiedHeight.set(available - component.getHeight());
}
component.setPrefHeight(available - initialOccupiedHeight.get());
}, 100, TimeUnit.MILLISECONDS);
}

public static String getBitcoinURI(String address, Coin amount, String label) {
return address != null ?
BitcoinURI.convertToBitcoinURI(Address.fromBase58(BisqEnvironment.getParameters(),
Expand Down Expand Up @@ -819,7 +743,7 @@ public static void requestFocus(Node node) {
UserThread.execute(node::requestFocus);
}

public static void reSyncSPVChain(WalletsSetup walletsSetup, Preferences preferences) {
public static void reSyncSPVChain(Preferences preferences) {
try {
new Popup<>().feedback(Res.get("settings.net.reSyncSPVSuccess"))
.useShutDownButton()
Expand Down Expand Up @@ -874,7 +798,7 @@ public static void showSelectableTextModal(String title, String text) {
}

public static StringConverter<PaymentAccount> getPaymentAccountsComboBoxStringConverter() {
return new StringConverter<PaymentAccount>() {
return new StringConverter<>() {
@Override
public String toString(PaymentAccount paymentAccount) {
if (paymentAccount.hasMultipleCurrencies()) {
Expand Down

0 comments on commit 0dcc20c

Please sign in to comment.