From 474ec2145a5aca9cb5ce32b932911f292f607c24 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 18 Jan 2016 16:02:04 +0100 Subject: [PATCH] Adopt table row width, remove transient form static fields, cleanups --- .../java/io/bitsquare/common/crypto/PubKeyRing.java | 2 +- .../main/java/io/bitsquare/alert/AlertManager.java | 2 +- .../io/bitsquare/arbitration/ArbitratorManager.java | 2 +- .../main/java/io/bitsquare/arbitration/Dispute.java | 2 +- .../java/io/bitsquare/arbitration/DisputeResult.java | 2 +- .../arbitration/messages/DisputeMailMessage.java | 4 ++-- .../src/main/java/io/bitsquare/btc/AddressEntry.java | 4 ++-- .../main/java/io/bitsquare/btc/AddressEntryList.java | 2 +- .../java/io/bitsquare/btc/TradeWalletService.java | 9 ++++----- .../main/java/io/bitsquare/locale/CurrencyUtil.java | 2 +- .../bitsquare/payment/SepaAccountContractData.java | 2 +- .../java/io/bitsquare/trade/BuyerAsOffererTrade.java | 2 +- .../java/io/bitsquare/trade/BuyerAsTakerTrade.java | 2 +- .../src/main/java/io/bitsquare/trade/BuyerTrade.java | 2 +- core/src/main/java/io/bitsquare/trade/Contract.java | 2 -- .../io/bitsquare/trade/SellerAsOffererTrade.java | 2 +- .../java/io/bitsquare/trade/SellerAsTakerTrade.java | 2 +- .../main/java/io/bitsquare/trade/SellerTrade.java | 2 +- .../main/java/io/bitsquare/trade/TradableList.java | 2 +- core/src/main/java/io/bitsquare/trade/Trade.java | 12 ++++++------ .../main/java/io/bitsquare/trade/offer/Offer.java | 2 +- .../java/io/bitsquare/trade/offer/OpenOffer.java | 2 +- .../bitsquare/trade/protocol/trade/TradingPeer.java | 2 +- .../src/main/java/io/bitsquare/user/Preferences.java | 11 ++++++----- core/src/main/java/io/bitsquare/user/User.java | 2 +- gui/src/main/java/io/bitsquare/gui/Navigation.java | 4 ++-- .../portfolio/closedtrades/ClosedTradesView.fxml | 4 ++-- 27 files changed, 43 insertions(+), 45 deletions(-) diff --git a/common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java b/common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java index 762674e3c0..a51f12d3d6 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java +++ b/common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java @@ -39,7 +39,7 @@ public class PubKeyRing implements Serializable { // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(PubKeyRing.class); + private static final Logger log = LoggerFactory.getLogger(PubKeyRing.class); private final byte[] signaturePubKeyBytes; private final byte[] encryptionPubKeyBytes; diff --git a/core/src/main/java/io/bitsquare/alert/AlertManager.java b/core/src/main/java/io/bitsquare/alert/AlertManager.java index aab3c86977..f386223fa8 100644 --- a/core/src/main/java/io/bitsquare/alert/AlertManager.java +++ b/core/src/main/java/io/bitsquare/alert/AlertManager.java @@ -37,7 +37,7 @@ import java.security.SignatureException; import static org.bitcoinj.core.Utils.HEX; public class AlertManager { - transient private static final Logger log = LoggerFactory.getLogger(AlertManager.class); + private static final Logger log = LoggerFactory.getLogger(AlertManager.class); private final AlertService alertService; private final KeyRing keyRing; diff --git a/core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java b/core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java index 034b6d252e..4e5facc207 100644 --- a/core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java +++ b/core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java @@ -55,7 +55,7 @@ import java.util.stream.Collectors; import static org.bitcoinj.core.Utils.HEX; public class ArbitratorManager { - transient private static final Logger log = LoggerFactory.getLogger(ArbitratorManager.class); + private static final Logger log = LoggerFactory.getLogger(ArbitratorManager.class); private final KeyRing keyRing; private final ArbitratorService arbitratorService; diff --git a/core/src/main/java/io/bitsquare/arbitration/Dispute.java b/core/src/main/java/io/bitsquare/arbitration/Dispute.java index aa1f1ecaf1..c259ab2e52 100644 --- a/core/src/main/java/io/bitsquare/arbitration/Dispute.java +++ b/core/src/main/java/io/bitsquare/arbitration/Dispute.java @@ -40,7 +40,7 @@ import java.util.List; public class Dispute implements Serializable { // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(Dispute.class); + private static final Logger log = LoggerFactory.getLogger(Dispute.class); /////////////////////////////////////////////////////////////////////////////////////////// // Fields diff --git a/core/src/main/java/io/bitsquare/arbitration/DisputeResult.java b/core/src/main/java/io/bitsquare/arbitration/DisputeResult.java index 85f50a35d9..a1990e61ac 100644 --- a/core/src/main/java/io/bitsquare/arbitration/DisputeResult.java +++ b/core/src/main/java/io/bitsquare/arbitration/DisputeResult.java @@ -33,7 +33,7 @@ import java.util.Date; public class DisputeResult implements Serializable { // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(DisputeResult.class); + private static final Logger log = LoggerFactory.getLogger(DisputeResult.class); public enum FeePaymentPolicy { LOSER, diff --git a/core/src/main/java/io/bitsquare/arbitration/messages/DisputeMailMessage.java b/core/src/main/java/io/bitsquare/arbitration/messages/DisputeMailMessage.java index f8cce03b36..3ad01b808c 100644 --- a/core/src/main/java/io/bitsquare/arbitration/messages/DisputeMailMessage.java +++ b/core/src/main/java/io/bitsquare/arbitration/messages/DisputeMailMessage.java @@ -35,7 +35,7 @@ import java.util.List; public final class DisputeMailMessage extends DisputeMessage { // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(DisputeMailMessage.class); + private static final Logger log = LoggerFactory.getLogger(DisputeMailMessage.class); private final long date; private final String tradeId; @@ -189,7 +189,7 @@ public final class DisputeMailMessage extends DisputeMessage { public static class Attachment implements Serializable { // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(Attachment.class); + private static final Logger log = LoggerFactory.getLogger(Attachment.class); private final byte[] bytes; private final String fileName; diff --git a/core/src/main/java/io/bitsquare/btc/AddressEntry.java b/core/src/main/java/io/bitsquare/btc/AddressEntry.java index c8b2f6f703..fa90137416 100644 --- a/core/src/main/java/io/bitsquare/btc/AddressEntry.java +++ b/core/src/main/java/io/bitsquare/btc/AddressEntry.java @@ -41,7 +41,7 @@ public class AddressEntry implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - private transient static final Logger log = LoggerFactory.getLogger(AddressEntry.class); + private static final Logger log = LoggerFactory.getLogger(AddressEntry.class); public enum Context { TRADE, @@ -52,7 +52,7 @@ public class AddressEntry implements Serializable { // It will be restored when the wallet is ready at setDeterministicKey // So after startup it never must be null @Nullable - private transient DeterministicKey keyPair; + transient private DeterministicKey keyPair; // Only set if its a TRADE Context @Nullable diff --git a/core/src/main/java/io/bitsquare/btc/AddressEntryList.java b/core/src/main/java/io/bitsquare/btc/AddressEntryList.java index 915ef33bf6..e1397c7716 100644 --- a/core/src/main/java/io/bitsquare/btc/AddressEntryList.java +++ b/core/src/main/java/io/bitsquare/btc/AddressEntryList.java @@ -34,7 +34,7 @@ import java.util.ArrayList; public class AddressEntryList extends ArrayList implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(AddressEntryList.class); + private static final Logger log = LoggerFactory.getLogger(AddressEntryList.class); final transient private Storage storage; transient private Wallet wallet; diff --git a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java index 0609652ccc..841cedcdc5 100644 --- a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java +++ b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java @@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import io.bitsquare.app.Log; import io.bitsquare.btc.data.InputsAndChangeOutput; import io.bitsquare.btc.data.PreparedDepositTxAndOffererInputs; import io.bitsquare.btc.data.RawInput; @@ -816,13 +817,11 @@ public class TradeWalletService { * @throws VerificationException */ public Transaction addTransactionToWallet(Transaction transaction) throws VerificationException { - log.trace("addTxToWallet called"); - log.trace("transaction " + transaction.toString()); + Log.traceCall("transaction " + transaction.toString()); // We need to recreate the transaction otherwise we get a null pointer... Transaction result = new Transaction(params, transaction.bitcoinSerialize()); result.getConfidence(Context.get()).setSource(TransactionConfidence.Source.SELF); - log.trace("transaction " + result.toString()); if (wallet != null) wallet.receivePending(result, null, true); @@ -835,12 +834,12 @@ public class TradeWalletService { * @throws VerificationException */ public Transaction addTransactionToWallet(byte[] serializedTransaction) throws VerificationException { - log.trace("addTxToWallet called"); + Log.traceCall(); // We need to recreate the tx otherwise we get a null pointer... Transaction transaction = new Transaction(params, serializedTransaction); transaction.getConfidence(Context.get()).setSource(TransactionConfidence.Source.NETWORK); - log.trace("transaction " + transaction.toString()); + log.trace("transaction from serializedTransaction: " + transaction.toString()); if (wallet != null) wallet.receivePending(transaction, null, true); diff --git a/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java b/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java index bd2c32f0ca..e7aa27fc4e 100644 --- a/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java +++ b/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java @@ -25,7 +25,7 @@ import java.util.*; import java.util.stream.Collectors; public class CurrencyUtil { - transient private static final Logger log = LoggerFactory.getLogger(CurrencyUtil.class); + private static final Logger log = LoggerFactory.getLogger(CurrencyUtil.class); private static final List allSortedCurrencies = createAllSortedCurrenciesList(); diff --git a/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java b/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java index bf2cf165c3..347bacd8c5 100644 --- a/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java +++ b/core/src/main/java/io/bitsquare/payment/SepaAccountContractData.java @@ -32,7 +32,7 @@ public class SepaAccountContractData extends PaymentAccountContractData implemen // That object is sent over the wire, so we need to take care of version compatibility. private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(SepaAccountContractData.class); + private static final Logger log = LoggerFactory.getLogger(SepaAccountContractData.class); private String holderName; private String iban; diff --git a/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java index d491ac068c..faf6cf63e9 100644 --- a/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java +++ b/core/src/main/java/io/bitsquare/trade/BuyerAsOffererTrade.java @@ -39,7 +39,7 @@ public class BuyerAsOffererTrade extends BuyerTrade implements OffererTrade, Ser // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererTrade.class); + private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererTrade.class); /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java index ecaf826d79..bd90546f9b 100644 --- a/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/BuyerAsTakerTrade.java @@ -39,7 +39,7 @@ public class BuyerAsTakerTrade extends BuyerTrade implements TakerTrade, Seriali // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(BuyerAsTakerTrade.class); + private static final Logger log = LoggerFactory.getLogger(BuyerAsTakerTrade.class); /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/src/main/java/io/bitsquare/trade/BuyerTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerTrade.java index 83e0b7e603..f0c0b9e021 100644 --- a/core/src/main/java/io/bitsquare/trade/BuyerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/BuyerTrade.java @@ -34,7 +34,7 @@ public abstract class BuyerTrade extends Trade implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererTrade.class); + private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererTrade.class); BuyerTrade(Offer offer, Coin tradeAmount, Address tradingPeerAddress, Storage storage) { super(offer, tradeAmount, tradingPeerAddress, storage); diff --git a/core/src/main/java/io/bitsquare/trade/Contract.java b/core/src/main/java/io/bitsquare/trade/Contract.java index 4e73685294..cee0e54122 100644 --- a/core/src/main/java/io/bitsquare/trade/Contract.java +++ b/core/src/main/java/io/bitsquare/trade/Contract.java @@ -38,8 +38,6 @@ public class Contract implements Serializable { @JsonExclude public static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; - public static final String TAC = "I commit to the trade conditions as defined above."; - public final Offer offer; private final long tradeAmount; public final String takeOfferFeeTxID; diff --git a/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java b/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java index 2e8122d036..35aef2b93b 100644 --- a/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java +++ b/core/src/main/java/io/bitsquare/trade/SellerAsOffererTrade.java @@ -35,7 +35,7 @@ public class SellerAsOffererTrade extends SellerTrade implements OffererTrade, S // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(SellerAsOffererTrade.class); + private static final Logger log = LoggerFactory.getLogger(SellerAsOffererTrade.class); /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java b/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java index 81d0cd4923..51a824228d 100644 --- a/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/SellerAsTakerTrade.java @@ -36,7 +36,7 @@ public class SellerAsTakerTrade extends SellerTrade implements TakerTrade, Seria // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(SellerAsTakerTrade.class); + private static final Logger log = LoggerFactory.getLogger(SellerAsTakerTrade.class); /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/src/main/java/io/bitsquare/trade/SellerTrade.java b/core/src/main/java/io/bitsquare/trade/SellerTrade.java index e1489ec95a..e5aca2c84b 100644 --- a/core/src/main/java/io/bitsquare/trade/SellerTrade.java +++ b/core/src/main/java/io/bitsquare/trade/SellerTrade.java @@ -34,7 +34,7 @@ public abstract class SellerTrade extends Trade implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(BuyerAsTakerTrade.class); + private static final Logger log = LoggerFactory.getLogger(BuyerAsTakerTrade.class); public SellerTrade(Offer offer, Coin tradeAmount, Address tradingPeerAddress, Storage storage) { super(offer, tradeAmount, tradingPeerAddress, storage); diff --git a/core/src/main/java/io/bitsquare/trade/TradableList.java b/core/src/main/java/io/bitsquare/trade/TradableList.java index 5fe0af2662..0cc3cb97c8 100644 --- a/core/src/main/java/io/bitsquare/trade/TradableList.java +++ b/core/src/main/java/io/bitsquare/trade/TradableList.java @@ -33,7 +33,7 @@ public class TradableList extends ArrayList implements Se // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(TradableList.class); + private static final Logger log = LoggerFactory.getLogger(TradableList.class); transient final private Storage> storage; // Use getObservableList() also class locally, to be sure that object exists in case we use the object as deserialized form diff --git a/core/src/main/java/io/bitsquare/trade/Trade.java b/core/src/main/java/io/bitsquare/trade/Trade.java index 7ae9bceaf7..420fbbc67e 100644 --- a/core/src/main/java/io/bitsquare/trade/Trade.java +++ b/core/src/main/java/io/bitsquare/trade/Trade.java @@ -60,7 +60,7 @@ abstract public class Trade implements Tradable, Model, Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - private transient static final Logger log = LoggerFactory.getLogger(Trade.class); + private static final Logger log = LoggerFactory.getLogger(Trade.class); public enum State { PREPARATION(Phase.PREPARATION), @@ -128,8 +128,8 @@ abstract public class Trade implements Tradable, Model, Serializable { // Mutable private Coin tradeAmount; private Address tradingPeerAddress; - private transient ObjectProperty tradeAmountProperty; - private transient ObjectProperty tradeVolumeProperty; + transient private ObjectProperty tradeAmountProperty; + transient private ObjectProperty tradeVolumeProperty; /////////////////////////////////////////////////////////////////////////////////////////// @@ -137,9 +137,9 @@ abstract public class Trade implements Tradable, Model, Serializable { /////////////////////////////////////////////////////////////////////////////////////////// // Transient/Immutable - private transient ObjectProperty processStateProperty; - private transient ObjectProperty disputeStateProperty; - private transient ObjectProperty tradePeriodStateProperty; + transient private ObjectProperty processStateProperty; + transient private ObjectProperty disputeStateProperty; + transient private ObjectProperty tradePeriodStateProperty; // Trades are saved in the TradeList transient private Storage storage; transient protected TradeProtocol tradeProtocol; diff --git a/core/src/main/java/io/bitsquare/trade/offer/Offer.java b/core/src/main/java/io/bitsquare/trade/offer/Offer.java index 7bd5d38335..feeb238896 100644 --- a/core/src/main/java/io/bitsquare/trade/offer/Offer.java +++ b/core/src/main/java/io/bitsquare/trade/offer/Offer.java @@ -50,7 +50,7 @@ public final class Offer implements PubKeyProtectedExpirablePayload { @JsonExclude private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; @JsonExclude - transient private static final Logger log = LoggerFactory.getLogger(Offer.class); + private static final Logger log = LoggerFactory.getLogger(Offer.class); public static final long TTL = 10 * 60 * 1000; // 10 min. public final static String TAC_OFFERER = "When placing that offer I accept that anyone who fulfills my conditions can " + diff --git a/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java b/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java index 3fdb0eca0a..a92da2eeb8 100644 --- a/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java +++ b/core/src/main/java/io/bitsquare/trade/offer/OpenOffer.java @@ -36,7 +36,7 @@ public class OpenOffer implements Tradable, Serializable { private static final Logger log = LoggerFactory.getLogger(OpenOffer.class); // Timeout for offer reservation during takeoffer process. If deposit tx is not completed in that time we reset the offer to AVAILABLE state. - transient private static final long TIMEOUT_SEC = 30; + private static final long TIMEOUT_SEC = 30; transient private java.util.Timer timeoutTimer; public enum State { diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradingPeer.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradingPeer.java index 39f609f7c3..3d7d1e830a 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradingPeer.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradingPeer.java @@ -34,7 +34,7 @@ public class TradingPeer implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(TradingPeer.class); + private static final Logger log = LoggerFactory.getLogger(TradingPeer.class); // Mutable private String accountId; diff --git a/core/src/main/java/io/bitsquare/user/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java index a56716eb0f..3d521fbfef 100644 --- a/core/src/main/java/io/bitsquare/user/Preferences.java +++ b/core/src/main/java/io/bitsquare/user/Preferences.java @@ -43,10 +43,10 @@ public class Preferences implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(Preferences.class); + private static final Logger log = LoggerFactory.getLogger(Preferences.class); // Deactivate mBit for now as most screens are not supporting it yet - transient private static final List BTC_DENOMINATIONS = Arrays.asList(MonetaryFormat.CODE_BTC/*, MonetaryFormat.CODE_MBTC*/); + private static final List BTC_DENOMINATIONS = Arrays.asList(MonetaryFormat.CODE_BTC/*, MonetaryFormat.CODE_MBTC*/); transient static final private ArrayList blockChainExplorersTestNet = new ArrayList<>(Arrays.asList( new BlockChainExplorer("Blocktrail", "https://www.blocktrail.com/tBTC/tx/", "https://www.blocktrail.com/tBTC/address/"), new BlockChainExplorer("Blockexplorer", "https://blockexplorer.com/testnet/tx/", "https://blockexplorer.com/testnet/address/"), @@ -66,13 +66,13 @@ public class Preferences implements Serializable { return BTC_DENOMINATIONS; } - private transient static Locale defaultLocale = Locale.getDefault(); + private static Locale defaultLocale = Locale.getDefault(); public static Locale getDefaultLocale() { return defaultLocale; } - private transient static TradeCurrency defaultTradeCurrency = new TradeCurrency(CurrencyUtil.getCurrencyByCountryCode(CountryUtil.getDefaultCountryCode()).getCurrency().getCurrencyCode()); + private static TradeCurrency defaultTradeCurrency = new TradeCurrency(CurrencyUtil.getCurrencyByCountryCode(CountryUtil.getDefaultCountryCode()).getCurrency().getCurrencyCode()); public static TradeCurrency getDefaultTradeCurrency() { return defaultTradeCurrency; @@ -219,7 +219,8 @@ public class Preferences implements Serializable { bitsquareEnvironment.saveBitcoinNetwork(bitcoinNetwork); this.bitcoinNetwork = bitcoinNetwork; - storage.queueUpForSave(); + + // We don't store the bitcoinNetwork locally as BitcoinNetwork is not serializable! } private void setTradeCurrencies(List tradeCurrencies) { diff --git a/core/src/main/java/io/bitsquare/user/User.java b/core/src/main/java/io/bitsquare/user/User.java index 16eec24b01..606d730a0d 100644 --- a/core/src/main/java/io/bitsquare/user/User.java +++ b/core/src/main/java/io/bitsquare/user/User.java @@ -52,7 +52,7 @@ public class User implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(User.class); + private static final Logger log = LoggerFactory.getLogger(User.class); // Transient immutable fields transient final private Storage storage; diff --git a/gui/src/main/java/io/bitsquare/gui/Navigation.java b/gui/src/main/java/io/bitsquare/gui/Navigation.java index 9023c178d1..82fc6d34f8 100644 --- a/gui/src/main/java/io/bitsquare/gui/Navigation.java +++ b/gui/src/main/java/io/bitsquare/gui/Navigation.java @@ -34,9 +34,9 @@ import java.util.concurrent.CopyOnWriteArraySet; public class Navigation implements Serializable { // That object is saved to disc. We need to take care of changes to not break deserialization. private static final long serialVersionUID = Version.LOCAL_DB_VERSION; - transient private static final Logger log = LoggerFactory.getLogger(Navigation.class); + private static final Logger log = LoggerFactory.getLogger(Navigation.class); - transient private static final ViewPath DEFAULT_VIEW_PATH = ViewPath.to(MainView.class, MarketView.class); + private static final ViewPath DEFAULT_VIEW_PATH = ViewPath.to(MainView.class, MarketView.class); public interface Listener { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml index 1ebbd9ca71..d0cad3072f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml @@ -28,8 +28,8 @@ - - + +