Merge pull request #3658 from bodymindarts/missing-annotations

Add missing @Named annotations for CoinFormatter injection
This commit is contained in:
Christoph Atteneder 2019-11-22 11:11:12 +01:00 committed by GitHub
commit 90bf1388da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View file

@ -36,6 +36,7 @@ import bisq.core.offer.OpenOffer;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.CoinFormatter;
import bisq.network.p2p.P2PService;
@ -55,6 +56,7 @@ import org.bitcoinj.wallet.listeners.WalletEventListener;
import com.googlecode.jcsv.writer.CSVEntryConverter;
import javax.inject.Inject;
import javax.inject.Named;
import de.jensd.fx.fontawesome.AwesomeIcon;
@ -127,7 +129,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
private TransactionsView(BtcWalletService btcWalletService,
P2PService p2PService,
WalletsSetup walletsSetup,
CoinFormatter formatter,
@Named(FormattingUtils.BTC_FORMATTER_KEY) CoinFormatter formatter,
Preferences preferences,
TradeDetailsWindow tradeDetailsWindow,
OfferDetailsWindow offerDetailsWindow,

View file

@ -54,6 +54,7 @@ import bisq.core.offer.OfferPayload;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.BsqFormatter;
import bisq.core.util.coin.CoinFormatter;
@ -70,6 +71,7 @@ import net.glxn.qrgen.QRCode;
import net.glxn.qrgen.image.ImageType;
import javax.inject.Inject;
import javax.inject.Named;
import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
@ -172,7 +174,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
@Inject
private TakeOfferView(TakeOfferViewModel model,
Navigation navigation,
CoinFormatter formatter,
@Named(FormattingUtils.BTC_FORMATTER_KEY) CoinFormatter formatter,
BsqFormatter bsqFormatter,
OfferDetailsWindow offerDetailsWindow,
Transitions transitions) {