diff --git a/core/src/main/java/io/bitsquare/alert/AlertManager.java b/core/src/main/java/io/bitsquare/alert/AlertManager.java index e39a886716..aab3c86977 100644 --- a/core/src/main/java/io/bitsquare/alert/AlertManager.java +++ b/core/src/main/java/io/bitsquare/alert/AlertManager.java @@ -40,8 +40,8 @@ public class AlertManager { transient private static final Logger log = LoggerFactory.getLogger(AlertManager.class); private final AlertService alertService; - private KeyRing keyRing; - private User user; + private final KeyRing keyRing; + private final User user; private final ObjectProperty alertMessageProperty = new SimpleObjectProperty<>(); // Pub key for developer global alert message diff --git a/core/src/main/java/io/bitsquare/alert/AlertService.java b/core/src/main/java/io/bitsquare/alert/AlertService.java index 9ef4158975..7d6b54df74 100644 --- a/core/src/main/java/io/bitsquare/alert/AlertService.java +++ b/core/src/main/java/io/bitsquare/alert/AlertService.java @@ -33,7 +33,7 @@ import javax.inject.Inject; */ public class AlertService { private static final Logger log = LoggerFactory.getLogger(AlertService.class); - private P2PService p2PService; + private final P2PService p2PService; /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java b/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java index d9f5ca0c3a..96cef1115f 100644 --- a/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java +++ b/core/src/main/java/io/bitsquare/arbitration/ArbitratorService.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; public class ArbitratorService { private static final Logger log = LoggerFactory.getLogger(ArbitratorService.class); - private P2PService p2PService; + private final P2PService p2PService; interface ArbitratorMapResultHandler { void handleResult(Map arbitratorsMap); diff --git a/core/src/main/java/io/bitsquare/btc/AddressEntry.java b/core/src/main/java/io/bitsquare/btc/AddressEntry.java index 613860fd01..c8b2f6f703 100644 --- a/core/src/main/java/io/bitsquare/btc/AddressEntry.java +++ b/core/src/main/java/io/bitsquare/btc/AddressEntry.java @@ -56,7 +56,7 @@ public class AddressEntry implements Serializable { // Only set if its a TRADE Context @Nullable - private String offerId; + private final String offerId; private final Context context; private final byte[] pubKey; diff --git a/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java b/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java index 3498c36701..bd2c32f0ca 100644 --- a/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java +++ b/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; public class CurrencyUtil { transient private static final Logger log = LoggerFactory.getLogger(CurrencyUtil.class); - private static List allSortedCurrencies = createAllSortedCurrenciesList(); + private static final List allSortedCurrencies = createAllSortedCurrenciesList(); public static List getAllSortedCurrencies() { return allSortedCurrencies; diff --git a/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java b/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java index cbd1c918ad..bf2cf165c3 100644 --- a/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java @@ -38,7 +38,7 @@ public class SepaAccountContractData extends PaymentAccountContractData implemen private String iban; private String bic; // Dont use a set here as we need a deterministic ordering, otherwise the contract hash does not match - private ArrayList acceptedCountryCodes; + private final ArrayList acceptedCountryCodes; public SepaAccountContractData(String paymentMethod, String id, int maxTradePeriod) { super(paymentMethod, id, maxTradePeriod); diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java index 6306dbee84..30f90934c6 100644 --- a/core/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java @@ -83,7 +83,7 @@ public class TradeManager { private final Storage> tradableListStorage; private final TradableList trades; private final BooleanProperty pendingTradesInitialized = new SimpleBooleanProperty(); - private FirstPeerAuthenticatedListener firstPeerAuthenticatedListener; + private final FirstPeerAuthenticatedListener firstPeerAuthenticatedListener; /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/src/main/java/io/bitsquare/trade/offer/OfferBookService.java b/core/src/main/java/io/bitsquare/trade/offer/OfferBookService.java index c2d6abb497..dfd6488f71 100644 --- a/core/src/main/java/io/bitsquare/trade/offer/OfferBookService.java +++ b/core/src/main/java/io/bitsquare/trade/offer/OfferBookService.java @@ -35,7 +35,7 @@ import java.util.stream.Collectors; public class OfferBookService { private static final Logger log = LoggerFactory.getLogger(OfferBookService.class); - private P2PService p2PService; + private final P2PService p2PService; /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java b/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java index 824c49d63a..a6e1e02475 100644 --- a/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java +++ b/core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java @@ -58,8 +58,8 @@ public class OpenOfferManager { private static final Logger log = LoggerFactory.getLogger(OpenOfferManager.class); private final KeyRing keyRing; - private User user; - private P2PService p2PService; + private final User user; + private final P2PService p2PService; private final WalletService walletService; private final TradeWalletService tradeWalletService; private final OfferBookService offerBookService; diff --git a/core/src/main/java/io/bitsquare/user/PopupId.java b/core/src/main/java/io/bitsquare/user/PopupId.java index eda792c6e4..82543d7190 100644 --- a/core/src/main/java/io/bitsquare/user/PopupId.java +++ b/core/src/main/java/io/bitsquare/user/PopupId.java @@ -21,9 +21,9 @@ public class PopupId { // We don't use an enum because it would break updates if we add a new item in a new version - public static String TRADE_WALLET = "tradeWallet"; - public static String SEND_PAYMENT_INFO = "sendPaymentInfo"; - public static String PAYMENT_SENT = "paymentSent"; - public static String PAYMENT_RECEIVED = "paymentReceived"; + public static final String TRADE_WALLET = "tradeWallet"; + public static final String SEND_PAYMENT_INFO = "sendPaymentInfo"; + public static final String PAYMENT_SENT = "paymentSent"; + public static final String PAYMENT_RECEIVED = "paymentReceived"; } diff --git a/core/src/main/java/io/bitsquare/user/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java index 96cd07391c..a8fdf0d464 100644 --- a/core/src/main/java/io/bitsquare/user/Preferences.java +++ b/core/src/main/java/io/bitsquare/user/Preferences.java @@ -88,14 +88,14 @@ public class Preferences implements Serializable { private boolean useAnimations = true; private boolean useEffects = true; private boolean displaySecurityDepositInfo = true; - private ArrayList tradeCurrencies; + private final ArrayList tradeCurrencies; private BlockChainExplorer blockChainExplorerMainNet; private BlockChainExplorer blockChainExplorerTestNet; private boolean showPlaceOfferConfirmation; private boolean showTakeOfferConfirmation; private String backupDirectory; private boolean autoSelectArbitrators = true; - private Map showAgainMap; + private final Map showAgainMap; private boolean tacAccepted; private Locale preferredLocale; private TradeCurrency preferredTradeCurrency;