From be1096582c35bd2a9f8c9eff8c48a814121d8388 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 12 Mar 2017 15:09:34 -0500 Subject: [PATCH] Rebranding: rename package io.bitsquare to io.bisq --- .../io/{bitsquare => bisq}/app/AppModule.java | 2 +- .../{bitsquare => bisq}/app/Capabilities.java | 2 +- .../io/{bitsquare => bisq}/app/DevEnv.java | 2 +- .../java/io/{bitsquare => bisq}/app/Log.java | 4 +- .../io/{bitsquare => bisq}/app/Version.java | 4 +- .../common/ByteArrayUtils.java | 4 +- .../io/{bitsquare => bisq}/common/Clock.java | 2 +- .../common/CommonOptionKeys.java | 2 +- .../common/FrameRateTimer.java | 2 +- .../common/MasterTimer.java | 2 +- .../io/{bitsquare => bisq}/common/Timer.java | 2 +- .../common/UserThread.java | 2 +- .../common/crypto/CryptoException.java | 2 +- .../common/crypto/DecryptedDataTuple.java | 4 +- .../common/crypto/Encryption.java | 4 +- .../common/crypto/Hash.java | 4 +- .../common/crypto/KeyRing.java | 2 +- .../common/crypto/KeyStorage.java | 4 +- .../common/crypto/PubKeyRing.java | 10 +- .../common/crypto/SealedAndSigned.java | 8 +- .../common/crypto/Sig.java | 2 +- .../common/crypto/Util.java | 2 +- .../common/handlers/ErrorMessageHandler.java | 2 +- .../common/handlers/ExceptionHandler.java | 2 +- .../common/handlers/FaultHandler.java | 2 +- .../common/handlers/ResultHandler.java | 2 +- .../common/persistance/Persistable.java | 2 +- .../taskrunner/InterceptTaskException.java | 2 +- .../common/taskrunner/Model.java | 2 +- .../common/taskrunner/Task.java | 2 +- .../common/taskrunner/TaskRunner.java | 6 +- .../common/util/DesktopUtil.java | 2 +- .../common/util/JsonExclude.java | 2 +- .../util/LimitedKeyStrengthException.java | 2 +- .../common/util/MathUtils.java | 2 +- .../common/util/Profiler.java | 2 +- .../common/util/ProtoBufferUtils.java | 4 +- .../common/util/RestartUtil.java | 2 +- .../common/util/Tuple2.java | 2 +- .../common/util/Tuple3.java | 2 +- .../common/util/Tuple4.java | 2 +- .../common/util/Utilities.java | 6 +- .../common/wire/Payload.java | 4 +- .../io/LookAheadObjectInputStream.java | 2 +- .../locale/CurrencyTuple.java | 2 +- .../io/{bitsquare => bisq}/locale/Res.java | 2 +- .../{bitsquare => bisq}/messages/Message.java | 4 +- .../messages/ToProtoBuffer.java | 2 +- .../storage/FileManager.java | 8 +- .../{bitsquare => bisq}/storage/FileUtil.java | 2 +- .../storage/PlainTextWrapper.java | 2 +- .../storage/ResourceNotFoundException.java | 2 +- .../{bitsquare => bisq}/storage/Storage.java | 2 +- common/src/main/resources/logback.xml | 4 +- .../common/crypto/EncryptionTest.java | 4 +- .../common/crypto/SigTest.java | 4 +- .../common/util/UtilitiesTest.java | 2 +- .../common/wire/proto/ProtoBufferTest.java | 5 +- .../alert/AlertManager.java | 18 +- .../alert/AlertModule.java | 6 +- .../alert/PrivateNotificationManager.java | 24 +-- .../app/BitsquareExecutable.java | 105 +++++++---- .../arbitration/ArbitratorManager.java | 30 +-- .../arbitration/ArbitratorModule.java | 4 +- .../arbitration/ArbitratorService.java | 14 +- .../DisputeAlreadyOpenException.java | 2 +- .../arbitration/DisputeManager.java | 58 +++--- .../MessageDeliveryFailedException.java | 2 +- .../{bitsquare => bisq}/btc/AddressEntry.java | 8 +- .../btc/AddressEntryException.java | 2 +- .../btc/AddressEntryList.java | 8 +- .../btc/BitcoinModule.java | 26 +-- .../btc/InsufficientFundsException.java | 2 +- .../btc/ProxySocketFactory.java | 2 +- .../{bitsquare => bisq}/btc/RegTestHost.java | 2 +- .../btc/SeedPeersSocks5Dns.java | 2 +- .../btc/blockchain/GetTransactionRequest.java | 12 +- .../providers/BlockTrailProvider.java | 8 +- .../providers/BlockchainTxProvider.java | 8 +- .../providers/BlockrIOProvider.java | 8 +- .../providers/TradeBlockProvider.java | 8 +- .../btc/data/InputsAndChangeOutput.java | 4 +- .../PreparedDepositTxAndOffererInputs.java | 4 +- .../btc/exceptions/SigningException.java | 2 +- .../TransactionVerificationException.java | 2 +- .../btc/exceptions/WalletException.java | 2 +- .../listeners/AddressConfidenceListener.java | 2 +- .../btc/listeners/BalanceListener.java | 2 +- .../btc/listeners/TxConfidenceListener.java | 2 +- .../btc/provider/squ/BsqUtxoFeedData.java | 2 +- .../btc/provider/squ/BsqUtxoFeedProvider.java | 10 +- .../btc/provider/squ/BsqUtxoFeedRequest.java | 6 +- .../btc/provider/squ/BsqUtxoFeedService.java | 14 +- .../wallet/BitsquareDefaultCoinSelector.java | 4 +- .../btc/wallet/BitsquareKeyChainFactory.java | 2 +- .../btc/wallet/BitsquareKeyChainGroup.java | 2 +- .../btc/wallet/BsqCoinSelector.java | 4 +- .../btc/wallet/BsqDeterministicKeyChain.java | 2 +- .../btc/wallet/BsqUtxoTransactionOutput.java | 2 +- .../btc/wallet/BsqWallet.java | 2 +- .../btc/wallet/BsqWalletService.java | 20 +- .../btc/wallet/BtcCoinSelector.java | 2 +- ...BtcCompensationRequestFeeCoinSelector.java | 2 +- .../btc/wallet/BtcDeterministicKeyChain.java | 2 +- .../btc/wallet/BtcWalletService.java | 22 +-- .../btc/wallet/ChangeBelowDustException.java | 2 +- .../btc/wallet/TradeWalletService.java | 24 +-- .../btc/wallet/WalletConfig.java | 4 +- .../btc/wallet/WalletService.java | 22 +-- .../btc/wallet/WalletsManager.java | 8 +- .../btc/wallet/WalletsSetup.java | 36 ++-- .../crypto/ScryptUtil.java | 6 +- .../{bitsquare => bisq}/dao/DaoManager.java | 14 +- .../io/{bitsquare => bisq}/dao/DaoModule.java | 22 +-- .../dao/DaoPeriodService.java | 8 +- .../{bitsquare => bisq}/dao/DaoService.java | 2 +- .../dao/blockchain/BsqBlock.java | 2 +- .../blockchain/BsqBlockchainException.java | 2 +- .../dao/blockchain/BsqBlockchainManager.java | 6 +- .../blockchain/BsqBlockchainRpcService.java | 12 +- .../BsqBlockchainRpcServiceMain.java | 4 +- .../dao/blockchain/BsqBlockchainService.java | 8 +- .../dao/blockchain/BsqTransaction.java | 2 +- .../dao/blockchain/BsqTxInput.java | 2 +- .../dao/blockchain/BsqTxOutput.java | 2 +- .../dao/blockchain/BsqUTXO.java | 2 +- .../dao/blockchain/UtxoListener.java | 2 +- .../dao/compensation/CompensationRequest.java | 8 +- .../CompensationRequestManager.java | 22 +-- .../dao/tokens/TransactionParser.java | 2 +- .../io/{bitsquare => bisq}/dao/tokens/Tx.java | 2 +- .../dao/tokens/TxInput.java | 2 +- .../dao/tokens/TxOutput.java | 2 +- .../dao/tokens/TxService.java | 2 +- .../dao/vote/CompensationRequestVoteItem.java | 8 +- ...CompensationRequestVoteItemCollection.java | 6 +- .../dao/vote/VoteItem.java | 6 +- .../dao/vote/VoteItemsList.java | 40 ++-- .../dao/vote/VotingDefaultValues.java | 4 +- .../dao/vote/VotingManager.java | 22 +-- .../dao/vote/VotingService.java | 2 +- .../dao/vote/VotingType.java | 2 +- .../filter/FilterManager.java | 20 +- .../filter/FilterModule.java | 6 +- .../payment/AliPayAccount.java | 12 +- .../payment/BankAccount.java | 2 +- .../BankNameRestrictedBankAccount.java | 2 +- .../payment/CashDepositAccount.java | 10 +- .../payment/ChaseQuickPayAccount.java | 12 +- .../payment/ClearXchangeAccount.java | 12 +- .../payment/CountryBasedPaymentAccount.java | 10 +- .../payment/CryptoCurrencyAccount.java | 10 +- .../payment/FasterPaymentsAccount.java | 12 +- .../payment/InteracETransferAccount.java | 12 +- .../payment/NationalBankAccount.java | 12 +- .../payment/OKPayAccount.java | 12 +- .../payment/PaymentAccount.java | 12 +- .../payment/PaymentAccountFactory.java | 4 +- .../payment/PaymentAccountUtil.java | 8 +- .../payment/PerfectMoneyAccount.java | 12 +- .../payment/SameBankAccount.java | 12 +- .../SameCountryRestrictedBankAccount.java | 2 +- .../payment/SepaAccount.java | 10 +- .../payment/SpecificBanksAccount.java | 10 +- .../payment/SwishAccount.java | 12 +- .../payment/USPostalMoneyOrderAccount.java | 12 +- .../trade/BuyerAsOffererTrade.java | 16 +- .../trade/BuyerAsTakerTrade.java | 14 +- .../{bitsquare => bisq}/trade/BuyerTrade.java | 16 +- .../trade/OffererTrade.java | 6 +- .../trade/SellerAsOffererTrade.java | 16 +- .../trade/SellerAsTakerTrade.java | 14 +- .../trade/SellerTrade.java | 16 +- .../{bitsquare => bisq}/trade/TakerTrade.java | 2 +- .../{bitsquare => bisq}/trade/Tradable.java | 6 +- .../trade/TradableList.java | 8 +- .../io/{bitsquare => bisq}/trade/Trade.java | 40 ++-- .../trade/TradeManager.java | 70 +++---- .../trade/TradeModule.java | 12 +- .../trade/closed/ClosedTradableManager.java | 14 +- .../trade/failed/FailedTradesManager.java | 14 +- .../trade/handlers/TradeResultHandler.java | 4 +- .../handlers/TransactionResultHandler.java | 2 +- .../trade/offer/OfferBookService.java | 28 +-- .../trade/offer/OfferForJson.java | 10 +- .../trade/offer/OfferModule.java | 4 +- .../trade/offer/OpenOffer.java | 16 +- .../trade/offer/OpenOfferManager.java | 70 +++---- .../protocol/placeoffer/PlaceOfferModel.java | 14 +- .../placeoffer/PlaceOfferProtocol.java | 14 +- .../tasks/AddOfferToRemoteOfferBook.java | 8 +- .../tasks/BroadcastCreateOfferFeeTx.java | 10 +- .../placeoffer/tasks/CreateOfferFeeTx.java | 20 +- .../placeoffer/tasks/ValidateOffer.java | 8 +- .../trade/ArbitrationSelectionRule.java | 6 +- .../trade/BuyerAsOffererProtocol.java | 32 ++-- .../protocol/trade/BuyerAsTakerProtocol.java | 28 +-- .../trade/protocol/trade/BuyerProtocol.java | 6 +- .../trade/protocol/trade/OffererProtocol.java | 6 +- .../trade/protocol/trade/ProcessModel.java | 44 ++--- .../trade/SellerAsOffererProtocol.java | 34 ++-- .../protocol/trade/SellerAsTakerProtocol.java | 30 +-- .../trade/protocol/trade/SellerProtocol.java | 6 +- .../trade/protocol/trade/TakerProtocol.java | 2 +- .../trade/protocol/trade/TradeProtocol.java | 26 +-- .../trade/protocol/trade/TradeTaskRunner.java | 10 +- .../trade/protocol/trade/TradingPeer.java | 12 +- .../trade/protocol/trade/tasks/TradeTask.java | 14 +- ...ffererCreatesAndSignsDepositTxAsBuyer.java | 18 +- .../buyer/ProcessFinalizePayoutTxRequest.java | 12 +- .../buyer/SendFiatTransferStartedMessage.java | 16 +- .../buyer/SendPayoutTxFinalizedMessage.java | 12 +- .../tasks/buyer/SignAndFinalizePayoutTx.java | 14 +- .../TakerCreatesDepositTxInputsAsBuyer.java | 14 +- .../TakerSignAndPublishDepositTxAsBuyer.java | 18 +- .../tasks/offerer/CreateAndSignContract.java | 29 +-- .../tasks/offerer/LoadTakeOfferFeeTx.java | 8 +- .../ProcessDepositTxPublishedMessage.java | 18 +- .../offerer/ProcessPayDepositRequest.java | 20 +- .../tasks/offerer/PublishTradeStatistics.java | 10 +- .../offerer/SendPublishDepositTxRequest.java | 16 +- .../offerer/SetupDepositBalanceListener.java | 18 +- .../offerer/VerifyArbitrationSelection.java | 10 +- .../offerer/VerifyTakeOfferFeePayment.java | 8 +- .../tasks/offerer/VerifyTakerAccount.java | 8 +- ...fererCreatesAndSignsDepositTxAsSeller.java | 18 +- .../ProcessFiatTransferStartedMessage.java | 14 +- .../ProcessPayoutTxFinalizedMessage.java | 14 +- .../seller/SendFinalizePayoutTxRequest.java | 16 +- .../SignAndPublishDepositTxAsSeller.java | 18 +- .../trade/tasks/seller/SignPayoutTx.java | 12 +- .../TakerCreatesDepositTxInputsAsSeller.java | 16 +- .../tasks/shared/BroadcastAfterLockTime.java | 12 +- .../tasks/taker/BroadcastTakeOfferFeeTx.java | 8 +- .../tasks/taker/CreateTakeOfferFeeTx.java | 20 +- .../tasks/taker/LoadCreateOfferFeeTx.java | 8 +- .../taker/ProcessPublishDepositTxRequest.java | 18 +- .../tasks/taker/PublishTradeStatistics.java | 10 +- .../trade/tasks/taker/SelectArbitrator.java | 10 +- .../taker/SendDepositTxPublishedMessage.java | 12 +- .../tasks/taker/SendPayDepositRequest.java | 16 +- .../tasks/taker/VerifyAndSignContract.java | 26 +-- .../tasks/taker/VerifyOfferFeePayment.java | 8 +- .../tasks/taker/VerifyOffererAccount.java | 8 +- .../statistics/TradeStatisticsForJson.java | 10 +- .../statistics/TradeStatisticsManager.java | 24 +-- .../io/{bitsquare => bisq}/user/User.java | 24 +-- .../util/joptsimple/EnumValueConverter.java | 2 +- core/src/main/resources/logback.xml | 4 +- .../btc/RestrictionsTest.java | 4 +- .../blockchain/BlockchainTxserviceTest.java | 2 +- .../pricefeed/MarketPriceFeedServiceTest.java | 4 +- .../MarketPriceFeedTxserviceTest.java | 2 +- .../blockchain/BsqBlockchainServiceTest.java | 2 +- .../dao/tokens/MockTxService.java | 2 +- .../dao/tokens/TransactionParserTest.java | 2 +- .../dao/vote/VoteManagerTest.java | 4 +- .../dao/vote/VotingDefaultValuesTest.java | 2 +- gui/pom.xml | 2 +- .../{bitsquare => bisq}/app/BitsquareApp.java | 64 +++---- .../app/BitsquareAppMain.java | 6 +- .../app/BitsquareAppModule.java | 38 ++-- .../gui/CandleStickChart.css | 0 .../io/{bitsquare => bisq}/gui/GuiModule.java | 28 +-- .../{bitsquare => bisq}/gui/Navigation.java | 16 +- .../{bitsquare => bisq}/gui/SystemTray.java | 14 +- .../io/{bitsquare => bisq}/gui/bitsquare.css | 0 .../gui/common/UITimer.java | 4 +- .../gui/common/ViewfxException.java | 2 +- .../gui/common/fxml/FxmlViewLoader.java | 12 +- .../gui/common/model/Activatable.java | 2 +- .../common/model/ActivatableDataModel.java | 2 +- .../common/model/ActivatableViewModel.java | 2 +- .../model/ActivatableWithDataModel.java | 2 +- .../gui/common/model/DataModel.java | 2 +- .../gui/common/model/Model.java | 2 +- .../gui/common/model/ViewModel.java | 2 +- .../gui/common/model/WithDataModel.java | 2 +- .../gui/common/view/AbstractView.java | 2 +- .../gui/common/view/ActivatableView.java | 2 +- .../common/view/ActivatableViewAndModel.java | 4 +- .../gui/common/view/CachingViewLoader.java | 2 +- .../common/view/DefaultPathConvention.java | 2 +- .../gui/common/view/FxmlView.java | 2 +- .../gui/common/view/InitializableView.java | 2 +- .../gui/common/view/View.java | 2 +- .../gui/common/view/ViewFactory.java | 2 +- .../gui/common/view/ViewLoader.java | 2 +- .../gui/common/view/ViewPath.java | 6 +- .../view/guice/InjectorViewFactory.java | 4 +- .../gui/components/AddressTextField.java | 10 +- .../AddressWithIconAndDirection.java | 2 +- .../gui/components/BalanceTextField.java | 4 +- .../BalanceWithConfirmationTextField.java | 14 +- .../gui/components/BusyAnimation.java | 6 +- .../gui/components/HyperlinkWithIcon.java | 2 +- .../gui/components/InfoDisplay.java | 6 +- .../gui/components/InputTextField.java | 6 +- .../gui/components/PasswordTextField.java | 6 +- .../gui/components/PeerInfoIcon.java | 12 +- .../gui/components/SearchComboBox.java | 4 +- .../gui/components/TableGroupHeadline.java | 2 +- .../gui/components/TextFieldWithCopyIcon.java | 6 +- .../gui/components/TitledGroupBg.java | 2 +- .../gui/components/TxIdTextField.java | 19 +- .../indicator/TxConfidenceIndicator.java | 4 +- .../StaticProgressIndicatorBehavior.java | 4 +- .../skin/StaticProgressIndicatorSkin.java | 6 +- .../components/paymentmethods/AliPayForm.java | 24 +-- .../components/paymentmethods/BankForm.java | 38 ++-- .../paymentmethods/CashDepositForm.java | 113 ++++++----- .../paymentmethods/ChaseQuickPayForm.java | 48 +++-- .../paymentmethods/ClearXchangeForm.java | 45 +++-- .../paymentmethods/CryptoCurrencyForm.java | 30 +-- .../paymentmethods/FasterPaymentsForm.java | 30 +-- .../paymentmethods/InteracETransferForm.java | 60 +++--- .../paymentmethods/NationalBankForm.java | 10 +- .../components/paymentmethods/OKPayForm.java | 26 +-- .../paymentmethods/PaymentMethodForm.java | 22 +-- .../paymentmethods/PerfectMoneyForm.java | 26 +-- .../paymentmethods/SameBankForm.java | 24 +-- .../components/paymentmethods/SepaForm.java | 71 ++++--- .../paymentmethods/SpecificBankForm.java | 20 +- .../components/paymentmethods/SwishForm.java | 28 +-- .../USPostalMoneyOrderForm.java | 26 +-- .../io/{bitsquare => bisq}/gui/images.css | 0 .../gui/main/MainView.fxml | 2 +- .../gui/main/MainView.java | 54 +++--- .../gui/main/MainViewModel.java | 114 +++++------ .../gui/main/PriceFeedComboBoxItem.java | 2 +- .../gui/main/account/AccountView.fxml | 2 +- .../gui/main/account/AccountView.java | 22 +-- .../gui/main/account/AccountViewModel.java | 4 +- .../ArbitratorRegistrationView.fxml | 2 +- .../ArbitratorRegistrationView.java | 28 +-- .../ArbitratorRegistrationViewModel.java | 26 +-- .../AltCoinAccountsDataModel.java | 26 +-- .../altcoinaccounts/AltCoinAccountsView.fxml | 2 +- .../altcoinaccounts/AltCoinAccountsView.java | 46 ++--- .../AltCoinAccountsViewModel.java | 8 +- .../ArbitratorListItem.java | 6 +- .../ArbitratorSelectionView.fxml | 2 +- .../ArbitratorSelectionView.java | 24 +-- .../ArbitratorSelectionViewModel.java | 20 +- .../account/content/backup/BackupView.fxml | 2 +- .../account/content/backup/BackupView.java | 37 ++-- .../fiataccounts/FiatAccountsDataModel.java | 26 +-- .../fiataccounts/FiatAccountsView.fxml | 2 +- .../fiataccounts/FiatAccountsView.java | 38 ++-- .../fiataccounts/FiatAccountsViewModel.java | 8 +- .../content/password/PasswordView.fxml | 2 +- .../content/password/PasswordView.java | 44 ++--- .../content/seedwords/SeedWordsView.fxml | 2 +- .../content/seedwords/SeedWordsView.java | 24 +-- .../account/settings/AccountSettingsView.fxml | 2 +- .../account/settings/AccountSettingsView.java | 28 +-- .../gui/main/dao/DaoView.fxml | 2 +- .../gui/main/dao/DaoView.java | 26 +-- .../CompensationRequestDisplay.java | 14 +- .../dao/compensation/CompensationView.fxml | 2 +- .../dao/compensation/CompensationView.java | 20 +- .../active/ActiveCompensationRequestView.fxml | 2 +- .../active/ActiveCompensationRequestView.java | 40 ++-- .../active/FundCompensationRequestWindow.java | 14 +- .../create/CreateCompensationRequestView.fxml | 2 +- .../create/CreateCompensationRequestView.java | 44 ++--- .../past/PastCompensationRequestView.fxml | 2 +- .../past/PastCompensationRequestView.java | 6 +- .../gui/main/dao/voting/VotingView.fxml | 2 +- .../gui/main/dao/voting/VotingView.java | 20 +- .../voting/dashboard/VotingDashboardView.fxml | 2 +- .../voting/dashboard/VotingDashboardView.java | 6 +- .../dao/voting/history/VotingHistoryView.fxml | 2 +- .../dao/voting/history/VotingHistoryView.java | 6 +- .../dao/voting/vote/CompensationViewItem.java | 22 +-- .../dao/voting/vote/ParameterViewItem.java | 12 +- .../gui/main/dao/voting/vote/VoteView.fxml | 2 +- .../gui/main/dao/voting/vote/VoteView.java | 44 ++--- .../gui/main/dao/wallet/BalanceUtil.java | 8 +- .../gui/main/dao/wallet/BsqWalletView.fxml | 2 +- .../gui/main/dao/wallet/BsqWalletView.java | 22 +-- .../wallet/dashboard/BsqDashboardView.fxml | 2 +- .../wallet/dashboard/BsqDashboardView.java | 24 ++- .../dao/wallet/receive/BsqReceiveView.fxml | 2 +- .../dao/wallet/receive/BsqReceiveView.java | 30 +-- .../gui/main/dao/wallet/send/BsqSendView.fxml | 2 +- .../gui/main/dao/wallet/send/BsqSendView.java | 38 ++-- .../dao/wallet/tx/BsqTransactionsView.fxml | 2 +- .../dao/wallet/tx/BsqTransactionsView.java | 6 +- .../gui/main/debug/DebugView.fxml | 4 +- .../gui/main/debug/DebugView.java | 44 ++--- .../gui/main/disputes/DisputesView.fxml | 2 +- .../gui/main/disputes/DisputesView.java | 36 ++-- .../arbitrator/ArbitratorDisputeView.fxml | 2 +- .../arbitrator/ArbitratorDisputeView.java | 24 +-- .../disputes/trader/TraderDisputeView.fxml | 2 +- .../disputes/trader/TraderDisputeView.java | 66 +++---- .../gui/main/funds/FundsView.fxml | 2 +- .../gui/main/funds/FundsView.java | 22 +-- .../main/funds/deposit/DepositListItem.java | 18 +- .../gui/main/funds/deposit/DepositView.fxml | 2 +- .../gui/main/funds/deposit/DepositView.java | 44 ++--- .../gui/main/funds/locked/LockedListItem.java | 14 +- .../gui/main/funds/locked/LockedView.fxml | 2 +- .../gui/main/funds/locked/LockedView.java | 36 ++-- .../main/funds/reserved/ReservedListItem.java | 14 +- .../gui/main/funds/reserved/ReservedView.fxml | 2 +- .../gui/main/funds/reserved/ReservedView.java | 36 ++-- .../transactions/TransactionsListItem.java | 22 +-- .../funds/transactions/TransactionsView.fxml | 2 +- .../funds/transactions/TransactionsView.java | 48 ++--- .../funds/withdrawal/WithdrawalListItem.java | 12 +- .../main/funds/withdrawal/WithdrawalView.fxml | 2 +- .../main/funds/withdrawal/WithdrawalView.java | 50 ++--- .../gui/main/market/MarketView.fxml | 10 +- .../gui/main/market/MarketView.java | 20 +- .../market/offerbook/OfferBookChartView.fxml | 2 +- .../market/offerbook/OfferBookChartView.java | 32 ++-- .../offerbook/OfferBookChartViewModel.java | 30 +-- .../main/market/offerbook/OfferListItem.java | 4 +- .../gui/main/market/spread/SpreadItem.java | 2 +- .../gui/main/market/spread/SpreadView.fxml | 2 +- .../gui/main/market/spread/SpreadView.java | 12 +- .../main/market/spread/SpreadViewModel.java | 18 +- .../main/market/trades/TradesChartsView.fxml | 2 +- .../main/market/trades/TradesChartsView.java | 26 +-- .../market/trades/TradesChartsViewModel.java | 36 ++-- .../main/market/trades/charts/CandleData.java | 2 +- .../market/trades/charts/price/Candle.java | 4 +- .../trades/charts/price/CandleStickChart.java | 4 +- .../trades/charts/price/CandleTooltip.java | 8 +- .../trades/charts/volume/VolumeBar.java | 6 +- .../trades/charts/volume/VolumeChart.java | 6 +- .../gui/main/offer/BuyOfferView.fxml | 2 +- .../gui/main/offer/BuyOfferView.java | 10 +- .../gui/main/offer/OfferView.java | 32 ++-- .../gui/main/offer/SellOfferView.fxml | 2 +- .../gui/main/offer/SellOfferView.java | 10 +- .../createoffer/CreateOfferDataModel.java | 56 +++--- .../offer/createoffer/CreateOfferView.fxml | 2 +- .../offer/createoffer/CreateOfferView.java | 66 +++---- .../createoffer/CreateOfferViewModel.java | 66 +++---- .../offer/createoffer/monetary/Altcoin.java | 2 +- .../monetary/AltcoinExchangeRate.java | 2 +- .../createoffer/monetary/MonetaryWrapper.java | 2 +- .../offer/createoffer/monetary/Price.java | 6 +- .../offer/createoffer/monetary/Volume.java | 4 +- .../gui/main/offer/offerbook/OfferBook.java | 10 +- .../offer/offerbook/OfferBookListItem.java | 4 +- .../main/offer/offerbook/OfferBookView.fxml | 2 +- .../main/offer/offerbook/OfferBookView.java | 52 ++--- .../offer/offerbook/OfferBookViewModel.java | 50 ++--- .../offer/takeoffer/TakeOfferDataModel.java | 48 ++--- .../main/offer/takeoffer/TakeOfferView.fxml | 2 +- .../main/offer/takeoffer/TakeOfferView.java | 84 ++++----- .../offer/takeoffer/TakeOfferViewModel.java | 46 ++--- .../gui/main/overlays/Overlay.java | 26 +-- .../editor/PeerInfoWithTagEditor.java | 18 +- .../overlays/notifications/Notification.java | 10 +- .../notifications/NotificationCenter.java | 28 +-- .../notifications/NotificationManager.java | 2 +- .../gui/main/overlays/popups/Popup.java | 4 +- .../main/overlays/popups/PopupManager.java | 2 +- .../windows/AddBitcoinNodesWindow.java | 16 +- .../main/overlays/windows/ContractWindow.java | 75 ++++---- .../windows/DisplayAlertMessageWindow.java | 17 +- .../windows/DisputeSummaryWindow.java | 38 ++-- .../overlays/windows/EmptyWalletWindow.java | 28 +-- .../overlays/windows/EnterPrivKeyWindow.java | 12 +- .../main/overlays/windows/FilterWindow.java | 21 ++- .../overlays/windows/OfferDetailsWindow.java | 44 ++--- .../main/overlays/windows/QRCodeWindow.java | 6 +- .../windows/SelectDepositTxWindow.java | 12 +- .../windows/SendAlertMessageWindow.java | 18 +- .../SendPrivateNotificationWindow.java | 26 +-- .../windows/ShowWalletDataWindow.java | 16 +- .../windows/SpendFromDepositTxWindow.java | 28 +-- .../gui/main/overlays/windows/TacWindow.java | 14 +- .../overlays/windows/TradeDetailsWindow.java | 28 +-- .../windows/WalletPasswordWindow.java | 26 +-- .../gui/main/portfolio/PortfolioView.fxml | 2 +- .../gui/main/portfolio/PortfolioView.java | 26 +-- .../closedtrades/ClosedTradableListItem.java | 4 +- .../closedtrades/ClosedTradesDataModel.java | 10 +- .../closedtrades/ClosedTradesView.fxml | 2 +- .../closedtrades/ClosedTradesView.java | 28 +-- .../closedtrades/ClosedTradesViewModel.java | 16 +- .../failedtrades/FailedTradesDataModel.java | 10 +- .../failedtrades/FailedTradesListItem.java | 4 +- .../failedtrades/FailedTradesView.fxml | 2 +- .../failedtrades/FailedTradesView.java | 12 +- .../failedtrades/FailedTradesViewModel.java | 10 +- .../openoffer/OpenOfferListItem.java | 6 +- .../openoffer/OpenOffersDataModel.java | 16 +- .../portfolio/openoffer/OpenOffersView.fxml | 2 +- .../portfolio/openoffer/OpenOffersView.java | 26 +-- .../openoffer/OpenOffersViewModel.java | 20 +- .../portfolio/pendingtrades/BuyerSubView.java | 10 +- .../pendingtrades/PendingTradesDataModel.java | 62 +++--- .../pendingtrades/PendingTradesListItem.java | 4 +- .../pendingtrades/PendingTradesView.fxml | 2 +- .../pendingtrades/PendingTradesView.java | 22 +-- .../pendingtrades/PendingTradesViewModel.java | 32 ++-- .../pendingtrades/SellerSubView.java | 10 +- .../portfolio/pendingtrades/TradeSubView.java | 23 ++- .../pendingtrades/steps/TradeStepView.java | 30 +-- .../pendingtrades/steps/TradeWizardItem.java | 4 +- .../steps/buyer/BuyerStep1View.java | 8 +- .../steps/buyer/BuyerStep2View.java | 40 ++-- .../steps/buyer/BuyerStep3View.java | 8 +- .../steps/buyer/BuyerStep4View.java | 15 +- .../steps/buyer/BuyerStep5View.java | 50 ++--- .../steps/seller/SellerStep1View.java | 8 +- .../steps/seller/SellerStep2View.java | 8 +- .../steps/seller/SellerStep3View.java | 34 ++-- .../steps/seller/SellerStep3bView.java | 8 +- .../steps/seller/SellerStep4View.java | 6 +- .../steps/seller/SellerStep5View.java | 8 +- .../gui/main/settings/SettingsView.fxml | 2 +- .../gui/main/settings/SettingsView.java | 20 +- .../gui/main/settings/about/AboutView.fxml | 2 +- .../gui/main/settings/about/AboutView.java | 20 +- .../settings/network/NetworkSettingsView.fxml | 6 +- .../settings/network/NetworkSettingsView.java | 32 ++-- .../settings/network/P2pNetworkListItem.java | 14 +- .../settings/preferences/PreferencesView.fxml | 2 +- .../settings/preferences/PreferencesView.java | 38 ++-- .../gui/util/BSFormatter.java | 16 +- .../gui/util/BsqFormatter.java | 2 +- .../{bitsquare => bisq}/gui/util/Colors.java | 2 +- .../gui/util/CurrencyListItem.java | 4 +- .../gui/util/FormBuilder.java | 10 +- .../gui/util/GUIProfiler.java | 2 +- .../{bitsquare => bisq}/gui/util/GUIUtil.java | 24 +-- .../gui/util/ImageUtil.java | 4 +- .../{bitsquare => bisq}/gui/util/Layout.java | 2 +- .../gui/util/Transitions.java | 6 +- .../util/validation/AccountNrValidator.java | 6 +- .../gui/util/validation/AliPayValidator.java | 2 +- .../validation/AltCoinAddressValidator.java | 10 +- .../gui/util/validation/BICValidator.java | 46 ++--- .../gui/util/validation/BankIdValidator.java | 6 +- .../gui/util/validation/BankValidator.java | 2 +- .../util/validation/BranchIdValidator.java | 6 +- .../util/validation/BtcAddressValidator.java | 6 +- .../gui/util/validation/BtcValidator.java | 6 +- .../validation/ChaseQuickPayValidator.java | 2 +- .../validation/ClearXchangeValidator.java | 2 +- .../gui/util/validation/EmailValidator.java | 4 +- .../gui/util/validation/FiatValidator.java | 4 +- .../gui/util/validation/IBANValidator.java | 96 ++++++++++ .../gui/util/validation/InputValidator.java | 4 +- .../validation/InteracETransferValidator.java | 4 +- .../gui/util/validation/NumberValidator.java | 4 +- .../gui/util/validation/OKPayValidator.java | 2 +- .../util/validation/OptionalBtcValidator.java | 4 +- .../validation/OptionalFiatValidator.java | 2 +- .../util/validation/PasswordValidator.java | 4 +- .../validation/PerfectMoneyValidator.java | 2 +- .../validation/SecurityDepositValidator.java | 8 +- .../gui/util/validation/SwishValidator.java | 2 +- .../USPostalMoneyOrderValidator.java | 2 +- .../altcoins/ByteballAddressValidator.java | 178 ++++++++++++++++++ .../gui/util/validation/params/IOPParams.java | 2 +- .../util/validation/params/PivxParams.java | 2 +- .../gui/util/validation/IBANValidator.java | 96 ---------- .../altcoins/ByteballAddressValidator.java | 178 ------------------ .../app/BitsquareEnvironmentTests.java | 4 +- .../fxml/FxmlViewLoaderTests$Malformed.fxml | 0 ...mlViewLoaderTests$MissingFxController.fxml | 0 ...LoaderTests$MissingFxmlViewAnnotation.fxml | 2 +- .../fxml/FxmlViewLoaderTests$WellFormed.fxml | 2 +- .../common/fxml/FxmlViewLoaderTests.java | 8 +- .../support/CachingViewLoaderTests.java | 8 +- .../gui/AwesomeFontDemo.java | 2 +- .../{bitsquare => bisq}/gui/BindingTest.java | 2 +- .../trades/TradesChartsViewModelTest.java | 8 +- .../offerbook/OfferBookViewModelTest.java | 24 +-- .../gui/util/BSFormatterTest.java | 2 +- .../AltCoinAddressValidatorTest.java | 4 +- .../gui/util/validation/BtcValidatorTest.java | 4 +- .../util/validation/FiatValidatorTest.java | 4 +- .../InteracETransferValidatorTest.java | 2 +- headless/pom.xml | 2 +- .../headless/Headless.java | 36 ++-- .../headless/HeadlessMain.java | 14 +- .../headless/HeadlessModule.java | 36 ++-- headless/src/main/resources/logback.xml | 4 +- .../java/io/bitsquare/monitor/Gateway.java | 4 +- .../java/io/bitsquare/monitor/Monitor.java | 34 ++-- .../io/bitsquare/monitor/MonitorMain.java | 12 +- .../io/bitsquare/monitor/MonitorModule.java | 34 ++-- monitor/src/main/resources/logback.xml | 4 +- .../BitsquareException.java | 2 +- .../app/AppOptionKeys.java | 2 +- .../app/BitsquareEnvironment.java | 22 +-- .../crypto/DecryptedMsgWithPubKey.java | 8 +- .../crypto/EncryptionService.java | 12 +- .../crypto/EncryptionServiceModule.java | 4 +- .../http/FakeDnsResolver.java | 2 +- .../{bitsquare => bisq}/http/HttpClient.java | 6 +- .../http/HttpException.java | 2 +- .../http/SocksConnectionSocketFactory.java | 2 +- .../http/SocksSSLConnectionSocketFactory.java | 2 +- .../messages/alert/Alert.java | 10 +- .../messages/alert/PrivateNotification.java | 10 +- .../alert/PrivateNotificationMessage.java | 10 +- .../messages/arbitration/Arbitrator.java | 10 +- .../messages/arbitration/Dispute.java | 14 +- .../DisputeCommunicationMessage.java | 10 +- .../messages/arbitration/DisputeList.java | 8 +- .../messages/arbitration/DisputeMessage.java | 8 +- .../messages/arbitration/DisputeResult.java | 6 +- .../arbitration/DisputeResultMessage.java | 8 +- .../arbitration/OpenNewDisputeMessage.java | 8 +- .../arbitration/PeerOpenedDisputeMessage.java | 8 +- .../PeerPublishedPayoutTxMessage.java | 8 +- .../arbitration/payload/Attachment.java | 6 +- .../availability/AvailabilityResult.java | 2 +- .../OfferAvailabilityRequest.java | 10 +- .../OfferAvailabilityResponse.java | 10 +- .../messages/availability/OfferMessage.java | 6 +- .../messages/btc/BitcoinNetwork.java | 2 +- .../messages/btc/BtcOptionKeys.java | 2 +- .../messages/btc/Restrictions.java | 2 +- .../messages/btc/UserAgent.java | 2 +- .../btc/data/RawTransactionInput.java | 6 +- .../btc/provider/HttpClientProvider.java | 4 +- .../btc/provider/ProvidersRepository.java | 6 +- .../messages/btc/provider/fee/FeeData.java | 2 +- .../btc/provider/fee/FeeProvider.java | 12 +- .../messages/btc/provider/fee/FeeRequest.java | 6 +- .../messages/btc/provider/fee/FeeService.java | 12 +- .../btc/provider/price/PriceProvider.java | 14 +- .../btc/provider/price/PriceRequest.java | 8 +- .../provider/price/PriceRequestException.java | 2 +- .../dao/blockchain/RpcOptionKeys.java | 2 +- .../payload/CompensationRequestPayload.java | 14 +- .../messages/filter/payload/Filter.java | 8 +- .../filter/payload/PaymentAccountFilter.java | 4 +- .../messages/locale/BankUtil.java | 4 +- .../messages/locale/Country.java | 6 +- .../messages/locale/CountryUtil.java | 4 +- .../messages/locale/CryptoCurrency.java | 8 +- .../messages/locale/CurrencyUtil.java | 4 +- .../messages/locale/FiatCurrency.java | 6 +- .../messages/locale/LanguageUtil.java | 4 +- .../messages/locale/LocaleUtil.java | 2 +- .../messages/locale/Region.java | 6 +- .../messages/locale/TradeCurrency.java | 6 +- .../messages/payment/PaymentMethod.java | 8 +- .../payload/AliPayAccountContractData.java | 4 +- .../payload/BankAccountContractData.java | 8 +- .../CashDepositAccountContractData.java | 8 +- .../ChaseQuickPayAccountContractData.java | 4 +- .../ClearXchangeAccountContractData.java | 4 +- ...ountryBasedPaymentAccountContractData.java | 4 +- .../CryptoCurrencyAccountContractData.java | 4 +- .../FasterPaymentsAccountContractData.java | 4 +- .../InteracETransferAccountContractData.java | 12 +- .../NationalBankAccountContractData.java | 4 +- .../payload/OKPayAccountContractData.java | 4 +- .../payload/PaymentAccountContractData.java | 6 +- .../PerfectMoneyAccountContractData.java | 4 +- .../payload/SameBankAccountContractData.java | 4 +- .../payload/SepaAccountContractData.java | 6 +- .../SpecificBanksAccountContractData.java | 4 +- .../payload/SwishAccountContractData.java | 4 +- ...USPostalMoneyOrderAccountContractData.java | 4 +- .../availability/OfferAvailabilityModel.java | 14 +- .../OfferAvailabilityProtocol.java | 28 +-- .../ProcessOfferAvailabilityResponse.java | 14 +- .../tasks/SendOfferAvailabilityRequest.java | 14 +- .../messages/protocol/trade/TradeMessage.java | 6 +- .../messages/provider/price/MarketPrice.java | 2 +- .../provider/price/PriceFeedService.java | 22 +-- .../MarketPriceNotAvailableException.java | 2 +- .../TradePriceOutOfToleranceException.java | 2 +- .../messages/trade/offer/payload/Offer.java | 46 ++--- .../messages/trade/payload/Contract.java | 16 +- .../messages/DepositTxPublishedMessage.java | 12 +- .../messages/FiatTransferStartedMessage.java | 12 +- .../messages/FinalizePayoutTxRequest.java | 12 +- .../trade/messages/PayDepositRequest.java | 18 +- .../messages/PayoutTxFinalizedMessage.java | 12 +- .../messages/PublishDepositTxRequest.java | 14 +- .../statistics/payload/TradeStatistics.java | 18 +- .../messages/user/BlockChainExplorer.java | 6 +- .../messages/user/Preferences.java | 26 +-- .../messages/util/Validator.java | 4 +- .../network/DnsLookupException.java | 2 +- .../network/DnsLookupTor.java | 2 +- .../network/NetworkOptionKeys.java | 4 +- .../network/Socks5DnsDiscovery.java | 8 +- .../network/Socks5MultiDiscovery.java | 22 +-- .../network/Socks5ProxyProvider.java | 2 +- .../network/Socks5SeedOnionDiscovery.java | 91 +++++---- .../p2p/BootstrapListener.java | 2 +- .../p2p/NetworkNotReadyException.java | 2 +- .../{bitsquare => bisq}/p2p/NodeAddress.java | 10 +- .../io/{bitsquare => bisq}/p2p/P2PModule.java | 12 +- .../{bitsquare => bisq}/p2p/P2PService.java | 68 +++---- .../p2p/P2PServiceListener.java | 4 +- .../io/{bitsquare => bisq}/p2p/Utils.java | 4 +- .../DecryptedDirectMessageListener.java | 6 +- .../messaging/DecryptedMailboxListener.java | 6 +- .../p2p/messaging/DirectMessage.java | 4 +- .../p2p/messaging/MailboxMessage.java | 4 +- .../PrefixedSealedAndSignedMessage.java | 10 +- .../messaging/SendDirectMessageListener.java | 2 +- .../messaging/SendMailboxMessageListener.java | 2 +- .../SupportedCapabilitiesMessage.java | 4 +- .../p2p/network/CloseConnectionReason.java | 2 +- .../p2p/network/Connection.java | 44 ++--- .../p2p/network/ConnectionListener.java | 2 +- .../p2p/network/InboundConnection.java | 2 +- .../p2p/network/LocalhostNetworkNode.java | 10 +- .../p2p/network/MessageListener.java | 4 +- .../p2p/network/NetworkNode.java | 12 +- .../p2p/network/OutboundConnection.java | 4 +- .../p2p/network/ProtoBufferUtilities.java | 94 ++++----- .../p2p/network/RuleViolation.java | 2 +- .../p2p/network/Server.java | 4 +- .../p2p/network/SetupListener.java | 2 +- .../p2p/network/Statistic.java | 6 +- .../p2p/network/TorNetworkNode.java | 14 +- .../network/messages/AnonymousMessage.java | 6 + .../messages/CloseConnectionMessage.java | 6 +- .../messages/SendersNodeAddressMessage.java | 8 + .../p2p/peers/BanList.java | 4 +- .../p2p/peers/BroadcastHandler.java | 18 +- .../p2p/peers/Broadcaster.java | 12 +- .../p2p/peers/PeerManager.java | 18 +- .../peers/getdata/GetDataRequestHandler.java | 30 +-- .../p2p/peers/getdata/RequestDataHandler.java | 42 ++--- .../p2p/peers/getdata/RequestDataManager.java | 22 +-- .../getdata/messages/GetDataRequest.java | 4 +- .../getdata/messages/GetDataResponse.java | 16 +- .../messages/GetUpdatedDataRequest.java | 20 +- .../messages/PreliminaryGetDataRequest.java | 12 +- .../p2p/peers/keepalive/KeepAliveHandler.java | 22 +-- .../p2p/peers/keepalive/KeepAliveManager.java | 18 +- .../keepalive/messages/KeepAliveMessage.java | 6 +- .../p2p/peers/keepalive/messages/Ping.java | 6 +- .../p2p/peers/keepalive/messages/Pong.java | 6 +- .../peerexchange/GetPeersRequestHandler.java | 20 +- .../p2p/peers/peerexchange/Peer.java | 10 +- .../peerexchange/PeerExchangeHandler.java | 26 +-- .../peerexchange/PeerExchangeManager.java | 23 ++- .../messages/GetPeersRequest.java | 16 +- .../messages/GetPeersResponse.java | 12 +- .../messages/PeerExchangeMessage.java | 6 +- .../p2p/seed/SeedNodesRepository.java | 6 +- .../p2p/storage/HashMapChangedListener.java | 4 +- .../p2p/storage/P2PDataStorage.java | 48 ++--- .../p2p/storage/messages/AddDataMessage.java | 12 +- .../storage/messages/BroadcastMessage.java | 6 +- .../storage/messages/RefreshTTLMessage.java | 6 +- .../storage/messages/RemoveDataMessage.java | 8 +- .../messages/RemoveMailboxDataMessage.java | 8 +- .../payload/CapabilityRequiringPayload.java | 4 +- .../p2p/storage/payload/ExpirablePayload.java | 4 +- .../payload/LazyProcessedStoragePayload.java | 2 +- .../payload/MailboxStoragePayload.java | 19 +- .../payload/PersistedStoragePayload.java | 2 +- .../payload/RequiresOwnerIsOnlinePayload.java | 6 +- .../p2p/storage/payload/StoragePayload.java | 11 +- .../ProtectedMailboxStorageEntry.java | 10 +- .../storageentry/ProtectedStorageEntry.java | 10 +- .../network/messages/AnonymousMessage.java | 6 - .../messages/SendersNodeAddressMessage.java | 8 - .../crypto/EncryptionServiceTests.java | 21 ++- .../messages/alert/AlertTest.java | 2 +- .../payload/OKPayAccountContractDataTest.java | 2 +- .../p2p/DummySeedNode.java | 20 +- .../p2p/PeerServiceTest.java | 4 +- .../io/{bitsquare => bisq}/p2p/TestUtils.java | 10 +- .../p2p/mocks/MockMailboxPayload.java | 10 +- .../p2p/mocks/MockPayload.java | 8 +- .../p2p/network/LocalhostNetworkNodeTest.java | 2 +- .../p2p/network/NetworkStressTest.java | 26 +-- .../p2p/network/TorNetworkNodeTest.java | 6 +- .../p2p/routing/PeerManagerTest.java | 12 +- .../p2p/storage/P2PDataStorageTest.java | 34 ++-- .../p2p/storage/ProtectedDataStorageTest.java | 26 +-- .../storage/messages/AddDataMessageTest.java | 22 +-- .../p2p/storage/mocks/MockData.java | 4 +- provider/pom.xml | 2 +- .../provider/ProviderMain.java | 12 +- .../provider/fee/FeeRequestService.java | 10 +- .../fee/providers/BtcFeesProvider.java | 8 +- .../provider/price/PriceData.java | 2 +- .../provider/price/PriceRequestService.java | 12 +- .../price/providers/BtcAverageProvider.java | 8 +- .../providers/CoinmarketcapProvider.java | 12 +- .../price/providers/PoloniexProvider.java | 12 +- seednode/pom.xml | 2 +- .../seednode/SeedNode.java | 36 ++-- .../seednode/SeedNodeMain.java | 18 +- .../seednode/SeedNodeModule.java | 36 ++-- seednode/src/main/resources/logback.xml | 4 +- statistics/pom.xml | 2 +- .../statistics/Statistics.java | 42 ++--- .../statistics/StatisticsMain.java | 18 +- .../statistics/StatisticsModule.java | 36 ++-- statistics/src/main/resources/logback.xml | 4 +- 806 files changed, 5217 insertions(+), 5201 deletions(-) rename common/src/main/java/io/{bitsquare => bisq}/app/AppModule.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/app/Capabilities.java (97%) rename common/src/main/java/io/{bitsquare => bisq}/app/DevEnv.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/app/Log.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/app/Version.java (97%) rename common/src/main/java/io/{bitsquare => bisq}/common/ByteArrayUtils.java (97%) rename common/src/main/java/io/{bitsquare => bisq}/common/Clock.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/common/CommonOptionKeys.java (76%) rename common/src/main/java/io/{bitsquare => bisq}/common/FrameRateTimer.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/common/MasterTimer.java (97%) rename common/src/main/java/io/{bitsquare => bisq}/common/Timer.java (87%) rename common/src/main/java/io/{bitsquare => bisq}/common/UserThread.java (99%) rename common/src/main/java/io/{bitsquare => bisq}/common/crypto/CryptoException.java (97%) rename common/src/main/java/io/{bitsquare => bisq}/common/crypto/DecryptedDataTuple.java (96%) rename common/src/main/java/io/{bitsquare => bisq}/common/crypto/Encryption.java (99%) rename common/src/main/java/io/{bitsquare => bisq}/common/crypto/Hash.java (96%) rename common/src/main/java/io/{bitsquare => bisq}/common/crypto/KeyRing.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/common/crypto/KeyStorage.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/common/crypto/PubKeyRing.java (91%) rename common/src/main/java/io/{bitsquare => bisq}/common/crypto/SealedAndSigned.java (96%) rename common/src/main/java/io/{bitsquare => bisq}/common/crypto/Sig.java (99%) rename common/src/main/java/io/{bitsquare => bisq}/common/crypto/Util.java (96%) rename common/src/main/java/io/{bitsquare => bisq}/common/handlers/ErrorMessageHandler.java (95%) rename common/src/main/java/io/{bitsquare => bisq}/common/handlers/ExceptionHandler.java (95%) rename common/src/main/java/io/{bitsquare => bisq}/common/handlers/FaultHandler.java (95%) rename common/src/main/java/io/{bitsquare => bisq}/common/handlers/ResultHandler.java (95%) rename common/src/main/java/io/{bitsquare => bisq}/common/persistance/Persistable.java (79%) rename common/src/main/java/io/{bitsquare => bisq}/common/taskrunner/InterceptTaskException.java (96%) rename common/src/main/java/io/{bitsquare => bisq}/common/taskrunner/Model.java (94%) rename common/src/main/java/io/{bitsquare => bisq}/common/taskrunner/Task.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/common/taskrunner/TaskRunner.java (95%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/DesktopUtil.java (99%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/JsonExclude.java (96%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/LimitedKeyStrengthException.java (96%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/MathUtils.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/Profiler.java (97%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/ProtoBufferUtils.java (81%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/RestartUtil.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/Tuple2.java (97%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/Tuple3.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/Tuple4.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/common/util/Utilities.java (99%) rename common/src/main/java/io/{bitsquare => bisq}/common/wire/Payload.java (74%) rename common/src/main/java/io/{bitsquare => bisq}/io/LookAheadObjectInputStream.java (99%) rename common/src/main/java/io/{bitsquare => bisq}/locale/CurrencyTuple.java (97%) rename common/src/main/java/io/{bitsquare => bisq}/locale/Res.java (99%) rename common/src/main/java/io/{bitsquare => bisq}/messages/Message.java (72%) rename common/src/main/java/io/{bitsquare => bisq}/messages/ToProtoBuffer.java (81%) rename common/src/main/java/io/{bitsquare => bisq}/storage/FileManager.java (98%) rename common/src/main/java/io/{bitsquare => bisq}/storage/FileUtil.java (99%) rename common/src/main/java/io/{bitsquare => bisq}/storage/PlainTextWrapper.java (94%) rename common/src/main/java/io/{bitsquare => bisq}/storage/ResourceNotFoundException.java (85%) rename common/src/main/java/io/{bitsquare => bisq}/storage/Storage.java (99%) rename common/src/test/java/io/{bitsquare => bisq}/common/crypto/EncryptionTest.java (93%) rename common/src/test/java/io/{bitsquare => bisq}/common/crypto/SigTest.java (96%) rename common/src/test/java/io/{bitsquare => bisq}/common/util/UtilitiesTest.java (98%) rename common/src/test/java/io/{bitsquare => bisq}/common/wire/proto/ProtoBufferTest.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/alert/AlertManager.java (93%) rename core/src/main/java/io/{bitsquare => bisq}/alert/AlertModule.java (93%) rename core/src/main/java/io/{bitsquare => bisq}/alert/PrivateNotificationManager.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/app/BitsquareExecutable.java (52%) rename core/src/main/java/io/{bitsquare => bisq}/arbitration/ArbitratorManager.java (94%) rename core/src/main/java/io/{bitsquare => bisq}/arbitration/ArbitratorModule.java (94%) rename core/src/main/java/io/{bitsquare => bisq}/arbitration/ArbitratorService.java (92%) rename core/src/main/java/io/{bitsquare => bisq}/arbitration/DisputeAlreadyOpenException.java (95%) rename core/src/main/java/io/{bitsquare => bisq}/arbitration/DisputeManager.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/arbitration/MessageDeliveryFailedException.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/AddressEntry.java (97%) rename core/src/main/java/io/{bitsquare => bisq}/btc/AddressEntryException.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/btc/AddressEntryList.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/BitcoinModule.java (81%) rename core/src/main/java/io/{bitsquare => bisq}/btc/InsufficientFundsException.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/ProxySocketFactory.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/btc/RegTestHost.java (97%) rename core/src/main/java/io/{bitsquare => bisq}/btc/SeedPeersSocks5Dns.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/btc/blockchain/GetTransactionRequest.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/btc/blockchain/providers/BlockTrailProvider.java (89%) rename core/src/main/java/io/{bitsquare => bisq}/btc/blockchain/providers/BlockchainTxProvider.java (64%) rename core/src/main/java/io/{bitsquare => bisq}/btc/blockchain/providers/BlockrIOProvider.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/btc/blockchain/providers/TradeBlockProvider.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/btc/data/InputsAndChangeOutput.java (94%) rename core/src/main/java/io/{bitsquare => bisq}/btc/data/PreparedDepositTxAndOffererInputs.java (92%) rename core/src/main/java/io/{bitsquare => bisq}/btc/exceptions/SigningException.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/exceptions/TransactionVerificationException.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/exceptions/WalletException.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/listeners/AddressConfidenceListener.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/listeners/BalanceListener.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/listeners/TxConfidenceListener.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/provider/squ/BsqUtxoFeedData.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/btc/provider/squ/BsqUtxoFeedProvider.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/provider/squ/BsqUtxoFeedRequest.java (92%) rename core/src/main/java/io/{bitsquare => bisq}/btc/provider/squ/BsqUtxoFeedService.java (92%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BitsquareDefaultCoinSelector.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BitsquareKeyChainFactory.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BitsquareKeyChainGroup.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BsqCoinSelector.java (97%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BsqDeterministicKeyChain.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BsqUtxoTransactionOutput.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BsqWallet.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BsqWalletService.java (95%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BtcCoinSelector.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BtcCompensationRequestFeeCoinSelector.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BtcDeterministicKeyChain.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/BtcWalletService.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/ChangeBelowDustException.java (97%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/TradeWalletService.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/WalletConfig.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/WalletService.java (97%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/WalletsManager.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/btc/wallet/WalletsSetup.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/crypto/ScryptUtil.java (94%) rename core/src/main/java/io/{bitsquare => bisq}/dao/DaoManager.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/dao/DaoModule.java (82%) rename core/src/main/java/io/{bitsquare => bisq}/dao/DaoPeriodService.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/dao/DaoService.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/BsqBlock.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/BsqBlockchainException.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/BsqBlockchainManager.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/BsqBlockchainRpcService.java (97%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/BsqBlockchainRpcServiceMain.java (95%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/BsqBlockchainService.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/BsqTransaction.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/BsqTxInput.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/BsqTxOutput.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/BsqUTXO.java (97%) rename core/src/main/java/io/{bitsquare => bisq}/dao/blockchain/UtxoListener.java (78%) rename core/src/main/java/io/{bitsquare => bisq}/dao/compensation/CompensationRequest.java (93%) rename core/src/main/java/io/{bitsquare => bisq}/dao/compensation/CompensationRequestManager.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/dao/tokens/TransactionParser.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/dao/tokens/Tx.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/dao/tokens/TxInput.java (97%) rename core/src/main/java/io/{bitsquare => bisq}/dao/tokens/TxOutput.java (97%) rename core/src/main/java/io/{bitsquare => bisq}/dao/tokens/TxService.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/dao/vote/CompensationRequestVoteItem.java (92%) rename core/src/main/java/io/{bitsquare => bisq}/dao/vote/CompensationRequestVoteItemCollection.java (95%) rename core/src/main/java/io/{bitsquare => bisq}/dao/vote/VoteItem.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/dao/vote/VoteItemsList.java (57%) rename core/src/main/java/io/{bitsquare => bisq}/dao/vote/VotingDefaultValues.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/dao/vote/VotingManager.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/dao/vote/VotingService.java (99%) rename core/src/main/java/io/{bitsquare => bisq}/dao/vote/VotingType.java (98%) rename core/src/main/java/io/{bitsquare => bisq}/filter/FilterManager.java (93%) rename core/src/main/java/io/{bitsquare => bisq}/filter/FilterModule.java (92%) rename core/src/main/java/io/{bitsquare => bisq}/payment/AliPayAccount.java (82%) rename core/src/main/java/io/{bitsquare => bisq}/payment/BankAccount.java (65%) rename core/src/main/java/io/{bitsquare => bisq}/payment/BankNameRestrictedBankAccount.java (70%) rename core/src/main/java/io/{bitsquare => bisq}/payment/CashDepositAccount.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/payment/ChaseQuickPayAccount.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/payment/ClearXchangeAccount.java (85%) rename core/src/main/java/io/{bitsquare => bisq}/payment/CountryBasedPaymentAccount.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/payment/CryptoCurrencyAccount.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/payment/FasterPaymentsAccount.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/payment/InteracETransferAccount.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/payment/NationalBankAccount.java (82%) rename core/src/main/java/io/{bitsquare => bisq}/payment/OKPayAccount.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/payment/PaymentAccount.java (95%) rename core/src/main/java/io/{bitsquare => bisq}/payment/PaymentAccountFactory.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/payment/PaymentAccountUtil.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/payment/PerfectMoneyAccount.java (83%) rename core/src/main/java/io/{bitsquare => bisq}/payment/SameBankAccount.java (82%) rename core/src/main/java/io/{bitsquare => bisq}/payment/SameCountryRestrictedBankAccount.java (77%) rename core/src/main/java/io/{bitsquare => bisq}/payment/SepaAccount.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/payment/SpecificBanksAccount.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/payment/SwishAccount.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/payment/USPostalMoneyOrderAccount.java (85%) rename core/src/main/java/io/{bitsquare => bisq}/trade/BuyerAsOffererTrade.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/trade/BuyerAsTakerTrade.java (89%) rename core/src/main/java/io/{bitsquare => bisq}/trade/BuyerTrade.java (88%) rename core/src/main/java/io/{bitsquare => bisq}/trade/OffererTrade.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/trade/SellerAsOffererTrade.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/trade/SellerAsTakerTrade.java (89%) rename core/src/main/java/io/{bitsquare => bisq}/trade/SellerTrade.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/trade/TakerTrade.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/trade/Tradable.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/trade/TradableList.java (95%) rename core/src/main/java/io/{bitsquare => bisq}/trade/Trade.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/trade/TradeManager.java (92%) rename core/src/main/java/io/{bitsquare => bisq}/trade/TradeModule.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/trade/closed/ClosedTradableManager.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/trade/failed/FailedTradesManager.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/trade/handlers/TradeResultHandler.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/trade/handlers/TransactionResultHandler.java (95%) rename core/src/main/java/io/{bitsquare => bisq}/trade/offer/OfferBookService.java (92%) rename core/src/main/java/io/{bitsquare => bisq}/trade/offer/OfferForJson.java (96%) rename core/src/main/java/io/{bitsquare => bisq}/trade/offer/OfferModule.java (94%) rename core/src/main/java/io/{bitsquare => bisq}/trade/offer/OpenOffer.java (92%) rename core/src/main/java/io/{bitsquare => bisq}/trade/offer/OpenOfferManager.java (93%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/placeoffer/PlaceOfferModel.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/placeoffer/PlaceOfferProtocol.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java (95%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/placeoffer/tasks/ValidateOffer.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/ArbitrationSelectionRule.java (93%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/BuyerAsOffererProtocol.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/BuyerAsTakerProtocol.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/BuyerProtocol.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/OffererProtocol.java (85%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/ProcessModel.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/SellerAsOffererProtocol.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/SellerAsTakerProtocol.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/SellerProtocol.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/TakerProtocol.java (94%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/TradeProtocol.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/TradeTaskRunner.java (81%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/TradingPeer.java (93%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/TradeTask.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/buyer/OffererCreatesAndSignsDepositTxAsBuyer.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/buyer/ProcessFinalizePayoutTxRequest.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java (89%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/buyer/TakerCreatesDepositTxInputsAsBuyer.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/buyer/TakerSignAndPublishDepositTxAsBuyer.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/offerer/CreateAndSignContract.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/offerer/LoadTakeOfferFeeTx.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/offerer/ProcessDepositTxPublishedMessage.java (85%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/offerer/ProcessPayDepositRequest.java (88%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/offerer/PublishTradeStatistics.java (85%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/offerer/SendPublishDepositTxRequest.java (89%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/offerer/SetupDepositBalanceListener.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/offerer/VerifyArbitrationSelection.java (85%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java (88%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/offerer/VerifyTakerAccount.java (89%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java (82%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/seller/ProcessPayoutTxFinalizedMessage.java (85%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java (88%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/seller/SignAndPublishDepositTxAsSeller.java (90%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/seller/SignPayoutTx.java (93%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/seller/TakerCreatesDepositTxInputsAsSeller.java (88%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/shared/BroadcastAfterLockTime.java (94%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/BroadcastTakeOfferFeeTx.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/CreateTakeOfferFeeTx.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/LoadCreateOfferFeeTx.java (87%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/ProcessPublishDepositTxRequest.java (86%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/PublishTradeStatistics.java (92%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/SelectArbitrator.java (84%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/SendDepositTxPublishedMessage.java (89%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/SendPayDepositRequest.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/VerifyAndSignContract.java (88%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/VerifyOfferFeePayment.java (88%) rename core/src/main/java/io/{bitsquare => bisq}/trade/protocol/trade/tasks/taker/VerifyOffererAccount.java (88%) rename core/src/main/java/io/{bitsquare => bisq}/trade/statistics/TradeStatisticsForJson.java (97%) rename core/src/main/java/io/{bitsquare => bisq}/trade/statistics/TradeStatisticsManager.java (91%) rename core/src/main/java/io/{bitsquare => bisq}/user/User.java (95%) rename core/src/main/java/io/{bitsquare => bisq}/util/joptsimple/EnumValueConverter.java (98%) rename core/src/test/java/io/{bitsquare => bisq}/btc/RestrictionsTest.java (96%) rename core/src/test/java/io/{bitsquare => bisq}/btc/blockchain/BlockchainTxserviceTest.java (96%) rename core/src/test/java/io/{bitsquare => bisq}/btc/pricefeed/MarketPriceFeedServiceTest.java (89%) rename core/src/test/java/io/{bitsquare => bisq}/btc/pricefeed/MarketPriceFeedTxserviceTest.java (95%) rename core/src/test/java/io/{bitsquare => bisq}/dao/blockchain/BsqBlockchainServiceTest.java (99%) rename core/src/test/java/io/{bitsquare => bisq}/dao/tokens/MockTxService.java (97%) rename core/src/test/java/io/{bitsquare => bisq}/dao/tokens/TransactionParserTest.java (99%) rename core/src/test/java/io/{bitsquare => bisq}/dao/vote/VoteManagerTest.java (99%) rename core/src/test/java/io/{bitsquare => bisq}/dao/vote/VotingDefaultValuesTest.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/app/BitsquareApp.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/app/BitsquareAppMain.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/app/BitsquareAppModule.java (80%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/CandleStickChart.css (100%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/GuiModule.java (77%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/Navigation.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/SystemTray.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/bitsquare.css (100%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/UITimer.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/ViewfxException.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/fxml/FxmlViewLoader.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/model/Activatable.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/model/ActivatableDataModel.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/model/ActivatableViewModel.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/model/ActivatableWithDataModel.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/model/DataModel.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/model/Model.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/model/ViewModel.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/model/WithDataModel.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/AbstractView.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/ActivatableView.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/ActivatableViewAndModel.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/CachingViewLoader.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/DefaultPathConvention.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/FxmlView.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/InitializableView.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/View.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/ViewFactory.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/ViewLoader.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/ViewPath.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/common/view/guice/InjectorViewFactory.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/AddressTextField.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/AddressWithIconAndDirection.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/BalanceTextField.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/BalanceWithConfirmationTextField.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/BusyAnimation.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/HyperlinkWithIcon.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/InfoDisplay.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/InputTextField.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/PasswordTextField.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/PeerInfoIcon.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/SearchComboBox.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/TableGroupHeadline.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/TextFieldWithCopyIcon.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/TitledGroupBg.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/TxIdTextField.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/indicator/TxConfidenceIndicator.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/indicator/behavior/StaticProgressIndicatorBehavior.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/indicator/skin/StaticProgressIndicatorSkin.java (99%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/AliPayForm.java (86%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/BankForm.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/CashDepositForm.java (85%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/ChaseQuickPayForm.java (72%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/ClearXchangeForm.java (73%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/CryptoCurrencyForm.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/FasterPaymentsForm.java (86%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/InteracETransferForm.java (72%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/NationalBankForm.java (84%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/OKPayForm.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/PaymentMethodForm.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/PerfectMoneyForm.java (86%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/SameBankForm.java (84%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/SepaForm.java (83%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/SpecificBankForm.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/SwishForm.java (87%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/components/paymentmethods/USPostalMoneyOrderForm.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/images.css (100%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/MainView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/MainView.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/MainViewModel.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/PriceFeedComboBoxItem.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/AccountView.fxml (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/AccountView.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/AccountViewModel.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/arbitratorselection/ArbitratorListItem.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/backup/BackupView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/backup/BackupView.java (83%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/fiataccounts/FiatAccountsView.fxml (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/fiataccounts/FiatAccountsView.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/password/PasswordView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/password/PasswordView.java (82%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/seedwords/SeedWordsView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/content/seedwords/SeedWordsView.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/settings/AccountSettingsView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/account/settings/AccountSettingsView.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/DaoView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/DaoView.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/compensation/CompensationRequestDisplay.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/compensation/CompensationView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/compensation/CompensationView.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/compensation/active/ActiveCompensationRequestView.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/compensation/active/FundCompensationRequestWindow.java (88%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/compensation/create/CreateCompensationRequestView.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/compensation/past/PastCompensationRequestView.fxml (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/compensation/past/PastCompensationRequestView.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/voting/VotingView.fxml (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/voting/VotingView.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/voting/dashboard/VotingDashboardView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/voting/dashboard/VotingDashboardView.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/voting/history/VotingHistoryView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/voting/history/VotingHistoryView.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/voting/vote/CompensationViewItem.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/voting/vote/ParameterViewItem.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/voting/vote/VoteView.fxml (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/voting/vote/VoteView.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/BalanceUtil.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/BsqWalletView.fxml (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/BsqWalletView.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/dashboard/BsqDashboardView.java (73%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/receive/BsqReceiveView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/receive/BsqReceiveView.java (88%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/send/BsqSendView.fxml (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/send/BsqSendView.java (88%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/tx/BsqTransactionsView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/dao/wallet/tx/BsqTransactionsView.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/debug/DebugView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/debug/DebugView.java (85%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/disputes/DisputesView.fxml (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/disputes/DisputesView.java (87%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/disputes/arbitrator/ArbitratorDisputeView.java (80%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/disputes/trader/TraderDisputeView.fxml (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/disputes/trader/TraderDisputeView.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/FundsView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/FundsView.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/deposit/DepositListItem.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/deposit/DepositView.fxml (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/deposit/DepositView.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/locked/LockedListItem.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/locked/LockedView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/locked/LockedView.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/reserved/ReservedListItem.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/reserved/ReservedView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/reserved/ReservedView.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/transactions/TransactionsListItem.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/transactions/TransactionsView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/transactions/TransactionsView.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/withdrawal/WithdrawalListItem.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/withdrawal/WithdrawalView.fxml (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/funds/withdrawal/WithdrawalView.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/MarketView.fxml (77%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/MarketView.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/offerbook/OfferBookChartView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/offerbook/OfferBookChartView.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/offerbook/OfferBookChartViewModel.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/offerbook/OfferListItem.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/spread/SpreadItem.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/spread/SpreadView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/spread/SpreadView.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/spread/SpreadViewModel.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/trades/TradesChartsView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/trades/TradesChartsView.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/trades/TradesChartsViewModel.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/trades/charts/CandleData.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/trades/charts/price/Candle.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/trades/charts/price/CandleStickChart.java (99%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/trades/charts/price/CandleTooltip.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/trades/charts/volume/VolumeBar.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/market/trades/charts/volume/VolumeChart.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/BuyOfferView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/BuyOfferView.java (81%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/OfferView.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/SellOfferView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/SellOfferView.java (81%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/createoffer/CreateOfferDataModel.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/createoffer/CreateOfferView.fxml (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/createoffer/CreateOfferView.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/createoffer/CreateOfferViewModel.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/createoffer/monetary/Altcoin.java (99%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/createoffer/monetary/AltcoinExchangeRate.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/createoffer/monetary/MonetaryWrapper.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/createoffer/monetary/Price.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/createoffer/monetary/Volume.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/offerbook/OfferBook.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/offerbook/OfferBookListItem.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/offerbook/OfferBookView.fxml (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/offerbook/OfferBookView.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/offerbook/OfferBookViewModel.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/takeoffer/TakeOfferDataModel.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/takeoffer/TakeOfferView.fxml (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/takeoffer/TakeOfferView.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/offer/takeoffer/TakeOfferViewModel.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/Overlay.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/editor/PeerInfoWithTagEditor.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/notifications/Notification.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/notifications/NotificationCenter.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/notifications/NotificationManager.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/popups/Popup.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/popups/PopupManager.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/AddBitcoinNodesWindow.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/ContractWindow.java (65%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/DisplayAlertMessageWindow.java (85%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/DisputeSummaryWindow.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/EmptyWalletWindow.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/EnterPrivKeyWindow.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/FilterWindow.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/OfferDetailsWindow.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/QRCodeWindow.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/SelectDepositTxWindow.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/SendAlertMessageWindow.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/SendPrivateNotificationWindow.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/ShowWalletDataWindow.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/SpendFromDepositTxWindow.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/TacWindow.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/TradeDetailsWindow.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/overlays/windows/WalletPasswordWindow.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/PortfolioView.fxml (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/PortfolioView.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/closedtrades/ClosedTradableListItem.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/closedtrades/ClosedTradesView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/closedtrades/ClosedTradesView.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/failedtrades/FailedTradesDataModel.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/failedtrades/FailedTradesListItem.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/failedtrades/FailedTradesView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/failedtrades/FailedTradesView.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/failedtrades/FailedTradesViewModel.java (92%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/openoffer/OpenOfferListItem.java (87%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/openoffer/OpenOffersDataModel.java (87%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/openoffer/OpenOffersView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/openoffer/OpenOffersView.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/openoffer/OpenOffersViewModel.java (86%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/BuyerSubView.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/PendingTradesListItem.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/PendingTradesView.fxml (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/PendingTradesView.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/SellerSubView.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/TradeSubView.java (86%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/TradeStepView.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java (91%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java (94%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3bView.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java (82%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/portfolio/pendingtrades/steps/seller/SellerStep5View.java (83%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/settings/SettingsView.fxml (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/settings/SettingsView.java (89%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/settings/about/AboutView.fxml (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/settings/about/AboutView.java (90%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/settings/network/NetworkSettingsView.fxml (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/settings/network/NetworkSettingsView.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/settings/network/P2pNetworkListItem.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/settings/preferences/PreferencesView.fxml (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/main/settings/preferences/PreferencesView.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/BSFormatter.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/BsqFormatter.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/Colors.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/CurrencyListItem.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/FormBuilder.java (99%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/GUIProfiler.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/GUIUtil.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/ImageUtil.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/Layout.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/Transitions.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/AccountNrValidator.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/AliPayValidator.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/AltCoinAddressValidator.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/BICValidator.java (59%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/BankIdValidator.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/BankValidator.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/BranchIdValidator.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/BtcAddressValidator.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/BtcValidator.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/ChaseQuickPayValidator.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/ClearXchangeValidator.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/EmailValidator.java (98%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/FiatValidator.java (96%) create mode 100644 gui/src/main/java/io/bisq/gui/util/validation/IBANValidator.java rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/InputValidator.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/InteracETransferValidator.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/NumberValidator.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/OKPayValidator.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/OptionalBtcValidator.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/OptionalFiatValidator.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/PasswordValidator.java (95%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/PerfectMoneyValidator.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/SecurityDepositValidator.java (93%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/SwishValidator.java (96%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/USPostalMoneyOrderValidator.java (96%) create mode 100644 gui/src/main/java/io/bisq/gui/util/validation/altcoins/ByteballAddressValidator.java rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/params/IOPParams.java (97%) rename gui/src/main/java/io/{bitsquare => bisq}/gui/util/validation/params/PivxParams.java (97%) delete mode 100644 gui/src/main/java/io/bitsquare/gui/util/validation/IBANValidator.java delete mode 100644 gui/src/main/java/io/bitsquare/gui/util/validation/altcoins/ByteballAddressValidator.java rename gui/src/test/java/io/{bitsquare => bisq}/app/BitsquareEnvironmentTests.java (97%) rename gui/src/test/java/io/{bitsquare => bisq}/common/fxml/FxmlViewLoaderTests$Malformed.fxml (100%) rename gui/src/test/java/io/{bitsquare => bisq}/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml (100%) rename gui/src/test/java/io/{bitsquare => bisq}/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml (87%) rename gui/src/test/java/io/{bitsquare => bisq}/common/fxml/FxmlViewLoaderTests$WellFormed.fxml (89%) rename gui/src/test/java/io/{bitsquare => bisq}/common/fxml/FxmlViewLoaderTests.java (95%) rename gui/src/test/java/io/{bitsquare => bisq}/common/support/CachingViewLoaderTests.java (89%) rename gui/src/test/java/io/{bitsquare => bisq}/gui/AwesomeFontDemo.java (98%) rename gui/src/test/java/io/{bitsquare => bisq}/gui/BindingTest.java (98%) rename gui/src/test/java/io/{bitsquare => bisq}/gui/main/market/trades/TradesChartsViewModelTest.java (92%) rename gui/src/test/java/io/{bitsquare => bisq}/gui/main/offer/offerbook/OfferBookViewModelTest.java (95%) rename gui/src/test/java/io/{bitsquare => bisq}/gui/util/BSFormatterTest.java (99%) rename gui/src/test/java/io/{bitsquare => bisq}/gui/util/validation/AltCoinAddressValidatorTest.java (99%) rename gui/src/test/java/io/{bitsquare => bisq}/gui/util/validation/BtcValidatorTest.java (96%) rename gui/src/test/java/io/{bitsquare => bisq}/gui/util/validation/FiatValidatorTest.java (96%) rename gui/src/test/java/io/{bitsquare => bisq}/gui/util/validation/InteracETransferValidatorTest.java (97%) rename headless/src/main/java/io/{bitsquare => bisq}/headless/Headless.java (86%) rename headless/src/main/java/io/{bitsquare => bisq}/headless/HeadlessMain.java (91%) rename headless/src/main/java/io/{bitsquare => bisq}/headless/HeadlessModule.java (80%) rename network/src/main/java/io/{bitsquare => bisq}/BitsquareException.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/app/AppOptionKeys.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/app/BitsquareEnvironment.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/crypto/DecryptedMsgWithPubKey.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/crypto/EncryptionService.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/crypto/EncryptionServiceModule.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/http/FakeDnsResolver.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/http/HttpClient.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/http/HttpException.java (82%) rename network/src/main/java/io/{bitsquare => bisq}/http/SocksConnectionSocketFactory.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/http/SocksSSLConnectionSocketFactory.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/messages/alert/Alert.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/alert/PrivateNotification.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/messages/alert/PrivateNotificationMessage.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/Arbitrator.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/Dispute.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/DisputeCommunicationMessage.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/DisputeList.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/DisputeMessage.java (87%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/DisputeResult.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/DisputeResultMessage.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/OpenNewDisputeMessage.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/PeerOpenedDisputeMessage.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/PeerPublishedPayoutTxMessage.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/messages/arbitration/payload/Attachment.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/messages/availability/AvailabilityResult.java (80%) rename network/src/main/java/io/{bitsquare => bisq}/messages/availability/OfferAvailabilityRequest.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/messages/availability/OfferAvailabilityResponse.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/messages/availability/OfferMessage.java (92%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/BitcoinNetwork.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/BtcOptionKeys.java (90%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/Restrictions.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/UserAgent.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/data/RawTransactionInput.java (95%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/provider/HttpClientProvider.java (86%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/provider/ProvidersRepository.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/provider/fee/FeeData.java (85%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/provider/fee/FeeProvider.java (83%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/provider/fee/FeeRequest.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/provider/fee/FeeService.java (95%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/provider/price/PriceProvider.java (84%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/provider/price/PriceRequest.java (88%) rename network/src/main/java/io/{bitsquare => bisq}/messages/btc/provider/price/PriceRequestException.java (73%) rename network/src/main/java/io/{bitsquare => bisq}/messages/dao/blockchain/RpcOptionKeys.java (87%) rename network/src/main/java/io/{bitsquare => bisq}/messages/dao/compensation/payload/CompensationRequestPayload.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/filter/payload/Filter.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/filter/payload/PaymentAccountFilter.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/messages/locale/BankUtil.java (99%) rename network/src/main/java/io/{bitsquare => bisq}/messages/locale/Country.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/messages/locale/CountryUtil.java (99%) rename network/src/main/java/io/{bitsquare => bisq}/messages/locale/CryptoCurrency.java (95%) rename network/src/main/java/io/{bitsquare => bisq}/messages/locale/CurrencyUtil.java (99%) rename network/src/main/java/io/{bitsquare => bisq}/messages/locale/FiatCurrency.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/messages/locale/LanguageUtil.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/locale/LocaleUtil.java (99%) rename network/src/main/java/io/{bitsquare => bisq}/messages/locale/Region.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/messages/locale/TradeCurrency.java (95%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/PaymentMethod.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/AliPayAccountContractData.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/BankAccountContractData.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/CashDepositAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/ChaseQuickPayAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/ClearXchangeAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/CountryBasedPaymentAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/CryptoCurrencyAccountContractData.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/FasterPaymentsAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/InteracETransferAccountContractData.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/NationalBankAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/OKPayAccountContractData.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/PaymentAccountContractData.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/PerfectMoneyAccountContractData.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/SameBankAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/SepaAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/SpecificBanksAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/SwishAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/payment/payload/USPostalMoneyOrderAccountContractData.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/protocol/availability/OfferAvailabilityModel.java (85%) rename network/src/main/java/io/{bitsquare => bisq}/messages/protocol/availability/OfferAvailabilityProtocol.java (86%) rename network/src/main/java/io/{bitsquare => bisq}/messages/protocol/availability/tasks/ProcessOfferAvailabilityResponse.java (83%) rename network/src/main/java/io/{bitsquare => bisq}/messages/protocol/availability/tasks/SendOfferAvailabilityRequest.java (83%) rename network/src/main/java/io/{bitsquare => bisq}/messages/protocol/trade/TradeMessage.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/messages/provider/price/MarketPrice.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/provider/price/PriceFeedService.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/exceptions/MarketPriceNotAvailableException.java (77%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/exceptions/TradePriceOutOfToleranceException.java (77%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/offer/payload/Offer.java (95%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/payload/Contract.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/protocol/trade/messages/DepositTxPublishedMessage.java (92%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/protocol/trade/messages/FiatTransferStartedMessage.java (92%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/protocol/trade/messages/FinalizePayoutTxRequest.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/protocol/trade/messages/PayDepositRequest.java (95%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/protocol/trade/messages/PayoutTxFinalizedMessage.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/protocol/trade/messages/PublishDepositTxRequest.java (92%) rename network/src/main/java/io/{bitsquare => bisq}/messages/trade/statistics/payload/TradeStatistics.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/messages/user/BlockChainExplorer.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/messages/user/Preferences.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/messages/util/Validator.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/network/DnsLookupException.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/network/DnsLookupTor.java (99%) rename network/src/main/java/io/{bitsquare => bisq}/network/NetworkOptionKeys.java (95%) rename network/src/main/java/io/{bitsquare => bisq}/network/Socks5DnsDiscovery.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/network/Socks5MultiDiscovery.java (81%) rename network/src/main/java/io/{bitsquare => bisq}/network/Socks5ProxyProvider.java (99%) rename network/src/main/java/io/{bitsquare => bisq}/network/Socks5SeedOnionDiscovery.java (66%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/BootstrapListener.java (95%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/NetworkNotReadyException.java (88%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/NodeAddress.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/P2PModule.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/P2PService.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/P2PServiceListener.java (73%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/Utils.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/messaging/DecryptedDirectMessageListener.java (55%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/messaging/DecryptedMailboxListener.java (56%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/messaging/DirectMessage.java (90%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/messaging/MailboxMessage.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/messaging/PrefixedSealedAndSignedMessage.java (92%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/messaging/SendDirectMessageListener.java (71%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/messaging/SendMailboxMessageListener.java (79%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/messaging/SupportedCapabilitiesMessage.java (72%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/CloseConnectionReason.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/Connection.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/ConnectionListener.java (86%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/InboundConnection.java (88%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/LocalhostNetworkNode.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/MessageListener.java (57%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/NetworkNode.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/OutboundConnection.java (81%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/ProtoBufferUtilities.java (92%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/RuleViolation.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/Server.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/SetupListener.java (84%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/Statistic.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/TorNetworkNode.java (97%) create mode 100644 network/src/main/java/io/bisq/p2p/network/messages/AnonymousMessage.java rename network/src/main/java/io/{bitsquare => bisq}/p2p/network/messages/CloseConnectionMessage.java (92%) create mode 100644 network/src/main/java/io/bisq/p2p/network/messages/SendersNodeAddressMessage.java rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/BanList.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/BroadcastHandler.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/Broadcaster.java (90%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/PeerManager.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/getdata/GetDataRequestHandler.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/getdata/RequestDataHandler.java (92%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/getdata/RequestDataManager.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/getdata/messages/GetDataRequest.java (60%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/getdata/messages/GetDataResponse.java (85%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/getdata/messages/GetUpdatedDataRequest.java (74%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java (88%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/keepalive/KeepAliveHandler.java (92%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/keepalive/KeepAliveManager.java (95%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/keepalive/messages/KeepAliveMessage.java (77%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/keepalive/messages/Ping.java (87%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/keepalive/messages/Pong.java (85%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/peerexchange/GetPeersRequestHandler.java (92%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/peerexchange/Peer.java (89%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/peerexchange/PeerExchangeHandler.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/peerexchange/PeerExchangeManager.java (96%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/peerexchange/messages/GetPeersRequest.java (88%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/peerexchange/messages/GetPeersResponse.java (85%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/peers/peerexchange/messages/PeerExchangeMessage.java (79%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/seed/SeedNodesRepository.java (98%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/HashMapChangedListener.java (58%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/P2PDataStorage.java (97%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/messages/AddDataMessage.java (85%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/messages/BroadcastMessage.java (80%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/messages/RefreshTTLMessage.java (94%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/messages/RemoveDataMessage.java (88%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/messages/RemoveMailboxDataMessage.java (89%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/payload/CapabilityRequiringPayload.java (86%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/payload/ExpirablePayload.java (76%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/payload/LazyProcessedStoragePayload.java (83%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/payload/MailboxStoragePayload.java (91%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/payload/PersistedStoragePayload.java (79%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/payload/RequiresOwnerIsOnlinePayload.java (79%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/payload/StoragePayload.java (66%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/storageentry/ProtectedMailboxStorageEntry.java (93%) rename network/src/main/java/io/{bitsquare => bisq}/p2p/storage/storageentry/ProtectedStorageEntry.java (95%) delete mode 100644 network/src/main/java/io/bitsquare/p2p/network/messages/AnonymousMessage.java delete mode 100644 network/src/main/java/io/bitsquare/p2p/network/messages/SendersNodeAddressMessage.java rename network/src/test/java/io/{bitsquare => bisq}/crypto/EncryptionServiceTests.java (90%) rename network/src/test/java/io/{bitsquare => bisq}/messages/alert/AlertTest.java (97%) rename network/src/test/java/io/{bitsquare => bisq}/messages/payment/payload/OKPayAccountContractDataTest.java (95%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/DummySeedNode.java (96%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/PeerServiceTest.java (99%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/TestUtils.java (96%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/mocks/MockMailboxPayload.java (88%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/mocks/MockPayload.java (87%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/network/LocalhostNetworkNodeTest.java (98%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/network/NetworkStressTest.java (98%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/network/TorNetworkNodeTest.java (98%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/routing/PeerManagerTest.java (98%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/storage/P2PDataStorageTest.java (92%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/storage/ProtectedDataStorageTest.java (93%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/storage/messages/AddDataMessageTest.java (77%) rename network/src/test/java/io/{bitsquare => bisq}/p2p/storage/mocks/MockData.java (92%) rename provider/src/main/java/io/{bitsquare => bisq}/provider/ProviderMain.java (92%) rename provider/src/main/java/io/{bitsquare => bisq}/provider/fee/FeeRequestService.java (93%) rename provider/src/main/java/io/{bitsquare => bisq}/provider/fee/providers/BtcFeesProvider.java (88%) rename provider/src/main/java/io/{bitsquare => bisq}/provider/price/PriceData.java (96%) rename provider/src/main/java/io/{bitsquare => bisq}/provider/price/PriceRequestService.java (96%) rename provider/src/main/java/io/{bitsquare => bisq}/provider/price/providers/BtcAverageProvider.java (95%) rename provider/src/main/java/io/{bitsquare => bisq}/provider/price/providers/CoinmarketcapProvider.java (84%) rename provider/src/main/java/io/{bitsquare => bisq}/provider/price/providers/PoloniexProvider.java (89%) rename seednode/src/main/java/io/{bitsquare => bisq}/seednode/SeedNode.java (85%) rename seednode/src/main/java/io/{bitsquare => bisq}/seednode/SeedNodeMain.java (94%) rename seednode/src/main/java/io/{bitsquare => bisq}/seednode/SeedNodeModule.java (80%) rename statistics/src/main/java/io/{bitsquare => bisq}/statistics/Statistics.java (84%) rename statistics/src/main/java/io/{bitsquare => bisq}/statistics/StatisticsMain.java (94%) rename statistics/src/main/java/io/{bitsquare => bisq}/statistics/StatisticsModule.java (80%) diff --git a/common/src/main/java/io/bitsquare/app/AppModule.java b/common/src/main/java/io/bisq/app/AppModule.java similarity index 98% rename from common/src/main/java/io/bitsquare/app/AppModule.java rename to common/src/main/java/io/bisq/app/AppModule.java index c8166dc313..2becce9d6e 100644 --- a/common/src/main/java/io/bitsquare/app/AppModule.java +++ b/common/src/main/java/io/bisq/app/AppModule.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.app; +package io.bisq.app; import com.google.common.base.Preconditions; import com.google.inject.AbstractModule; diff --git a/common/src/main/java/io/bitsquare/app/Capabilities.java b/common/src/main/java/io/bisq/app/Capabilities.java similarity index 97% rename from common/src/main/java/io/bitsquare/app/Capabilities.java rename to common/src/main/java/io/bisq/app/Capabilities.java index 2967789af5..6c044ccd85 100644 --- a/common/src/main/java/io/bitsquare/app/Capabilities.java +++ b/common/src/main/java/io/bisq/app/Capabilities.java @@ -1,4 +1,4 @@ -package io.bitsquare.app; +package io.bisq.app; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/app/DevEnv.java b/common/src/main/java/io/bisq/app/DevEnv.java similarity index 98% rename from common/src/main/java/io/bitsquare/app/DevEnv.java rename to common/src/main/java/io/bisq/app/DevEnv.java index a379652493..ae9c3c395c 100644 --- a/common/src/main/java/io/bitsquare/app/DevEnv.java +++ b/common/src/main/java/io/bisq/app/DevEnv.java @@ -1,4 +1,4 @@ -package io.bitsquare.app; +package io.bisq.app; public class DevEnv { // Was used for P2P network stress test to adjust several setting for the tests (e.g. use lower btc fees for offers,..) diff --git a/common/src/main/java/io/bitsquare/app/Log.java b/common/src/main/java/io/bisq/app/Log.java similarity index 98% rename from common/src/main/java/io/bitsquare/app/Log.java rename to common/src/main/java/io/bisq/app/Log.java index 43e815bd97..eb1004d2d2 100644 --- a/common/src/main/java/io/bitsquare/app/Log.java +++ b/common/src/main/java/io/bisq/app/Log.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.app; +package io.bisq.app; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; @@ -25,7 +25,7 @@ import ch.qos.logback.core.rolling.FixedWindowRollingPolicy; import ch.qos.logback.core.rolling.RollingFileAppender; import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy; import ch.qos.logback.core.util.FileSize; -import io.bitsquare.common.util.Profiler; +import io.bisq.common.util.Profiler; import org.slf4j.LoggerFactory; import java.text.SimpleDateFormat; diff --git a/common/src/main/java/io/bitsquare/app/Version.java b/common/src/main/java/io/bisq/app/Version.java similarity index 97% rename from common/src/main/java/io/bitsquare/app/Version.java rename to common/src/main/java/io/bisq/app/Version.java index a6bcd0cd3a..1b5b0f66dd 100644 --- a/common/src/main/java/io/bitsquare/app/Version.java +++ b/common/src/main/java/io/bisq/app/Version.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.app; +package io.bisq.app; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,7 +26,7 @@ public class Version { // The application versions // VERSION = 0.5.0.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update // Therefore all sub versions start again with 1 - public static final String VERSION = "0.5.0.0"; + public static final String VERSION = "0.5.0.0"; // The version no. for the objects sent over the network. A change will break the serialization of old objects. // If objects are used for both network and database the network version is applied. diff --git a/common/src/main/java/io/bitsquare/common/ByteArrayUtils.java b/common/src/main/java/io/bisq/common/ByteArrayUtils.java similarity index 97% rename from common/src/main/java/io/bitsquare/common/ByteArrayUtils.java rename to common/src/main/java/io/bisq/common/ByteArrayUtils.java index 1189f231b8..d3393c5bae 100644 --- a/common/src/main/java/io/bitsquare/common/ByteArrayUtils.java +++ b/common/src/main/java/io/bisq/common/ByteArrayUtils.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.common; +package io.bisq.common; -import io.bitsquare.io.LookAheadObjectInputStream; +import io.bisq.io.LookAheadObjectInputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/common/Clock.java b/common/src/main/java/io/bisq/common/Clock.java similarity index 98% rename from common/src/main/java/io/bitsquare/common/Clock.java rename to common/src/main/java/io/bisq/common/Clock.java index e178952a7e..f25d215c2c 100644 --- a/common/src/main/java/io/bitsquare/common/Clock.java +++ b/common/src/main/java/io/bisq/common/Clock.java @@ -1,4 +1,4 @@ -package io.bitsquare.common; +package io.bisq.common; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/common/CommonOptionKeys.java b/common/src/main/java/io/bisq/common/CommonOptionKeys.java similarity index 76% rename from common/src/main/java/io/bitsquare/common/CommonOptionKeys.java rename to common/src/main/java/io/bisq/common/CommonOptionKeys.java index d20f191be0..e373fdd78f 100644 --- a/common/src/main/java/io/bitsquare/common/CommonOptionKeys.java +++ b/common/src/main/java/io/bisq/common/CommonOptionKeys.java @@ -1,4 +1,4 @@ -package io.bitsquare.common; +package io.bisq.common; public class CommonOptionKeys { public static final String LOG_LEVEL_KEY = "logLevel"; diff --git a/common/src/main/java/io/bitsquare/common/FrameRateTimer.java b/common/src/main/java/io/bisq/common/FrameRateTimer.java similarity index 98% rename from common/src/main/java/io/bitsquare/common/FrameRateTimer.java rename to common/src/main/java/io/bisq/common/FrameRateTimer.java index 6de4425a17..97d1af21f1 100644 --- a/common/src/main/java/io/bitsquare/common/FrameRateTimer.java +++ b/common/src/main/java/io/bisq/common/FrameRateTimer.java @@ -1,4 +1,4 @@ -package io.bitsquare.common; +package io.bisq.common; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/common/MasterTimer.java b/common/src/main/java/io/bisq/common/MasterTimer.java similarity index 97% rename from common/src/main/java/io/bitsquare/common/MasterTimer.java rename to common/src/main/java/io/bisq/common/MasterTimer.java index 2fc0ed1d6d..5a8fbd8f52 100644 --- a/common/src/main/java/io/bitsquare/common/MasterTimer.java +++ b/common/src/main/java/io/bisq/common/MasterTimer.java @@ -1,4 +1,4 @@ -package io.bitsquare.common; +package io.bisq.common; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/common/Timer.java b/common/src/main/java/io/bisq/common/Timer.java similarity index 87% rename from common/src/main/java/io/bitsquare/common/Timer.java rename to common/src/main/java/io/bisq/common/Timer.java index cab1c499e3..0ebacbae25 100644 --- a/common/src/main/java/io/bitsquare/common/Timer.java +++ b/common/src/main/java/io/bisq/common/Timer.java @@ -1,4 +1,4 @@ -package io.bitsquare.common; +package io.bisq.common; import java.time.Duration; diff --git a/common/src/main/java/io/bitsquare/common/UserThread.java b/common/src/main/java/io/bisq/common/UserThread.java similarity index 99% rename from common/src/main/java/io/bitsquare/common/UserThread.java rename to common/src/main/java/io/bisq/common/UserThread.java index ae4e017c49..7f3b33769b 100644 --- a/common/src/main/java/io/bitsquare/common/UserThread.java +++ b/common/src/main/java/io/bisq/common/UserThread.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common; +package io.bisq.common; import com.google.common.util.concurrent.MoreExecutors; import org.slf4j.Logger; diff --git a/common/src/main/java/io/bitsquare/common/crypto/CryptoException.java b/common/src/main/java/io/bisq/common/crypto/CryptoException.java similarity index 97% rename from common/src/main/java/io/bitsquare/common/crypto/CryptoException.java rename to common/src/main/java/io/bisq/common/crypto/CryptoException.java index dfa652c8ab..4fc1fed75e 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/CryptoException.java +++ b/common/src/main/java/io/bisq/common/crypto/CryptoException.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.crypto; +package io.bisq.common.crypto; public class CryptoException extends Exception { diff --git a/common/src/main/java/io/bitsquare/common/crypto/DecryptedDataTuple.java b/common/src/main/java/io/bisq/common/crypto/DecryptedDataTuple.java similarity index 96% rename from common/src/main/java/io/bitsquare/common/crypto/DecryptedDataTuple.java rename to common/src/main/java/io/bisq/common/crypto/DecryptedDataTuple.java index 1665523792..fa587ecca0 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/DecryptedDataTuple.java +++ b/common/src/main/java/io/bisq/common/crypto/DecryptedDataTuple.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.crypto; +package io.bisq.common.crypto; -import io.bitsquare.messages.Message; +import io.bisq.messages.Message; import java.security.PublicKey; diff --git a/common/src/main/java/io/bitsquare/common/crypto/Encryption.java b/common/src/main/java/io/bisq/common/crypto/Encryption.java similarity index 99% rename from common/src/main/java/io/bitsquare/common/crypto/Encryption.java rename to common/src/main/java/io/bisq/common/crypto/Encryption.java index 63f1ed5392..157cc06b67 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/Encryption.java +++ b/common/src/main/java/io/bisq/common/crypto/Encryption.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.crypto; +package io.bisq.common.crypto; -import io.bitsquare.messages.Message; +import io.bisq.messages.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.util.encoders.Hex; diff --git a/common/src/main/java/io/bitsquare/common/crypto/Hash.java b/common/src/main/java/io/bisq/common/crypto/Hash.java similarity index 96% rename from common/src/main/java/io/bitsquare/common/crypto/Hash.java rename to common/src/main/java/io/bisq/common/crypto/Hash.java index ee7b59e158..64ef6b42ba 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/Hash.java +++ b/common/src/main/java/io/bisq/common/crypto/Hash.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.crypto; +package io.bisq.common.crypto; import com.google.common.base.Charsets; -import io.bitsquare.messages.ToProtoBuffer; +import io.bisq.messages.ToProtoBuffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.util.encoders.Hex; diff --git a/common/src/main/java/io/bitsquare/common/crypto/KeyRing.java b/common/src/main/java/io/bisq/common/crypto/KeyRing.java similarity index 98% rename from common/src/main/java/io/bitsquare/common/crypto/KeyRing.java rename to common/src/main/java/io/bisq/common/crypto/KeyRing.java index 6cc87570ef..614a66f50e 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/KeyRing.java +++ b/common/src/main/java/io/bisq/common/crypto/KeyRing.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.crypto; +package io.bisq.common.crypto; import javax.inject.Inject; import java.security.KeyPair; diff --git a/common/src/main/java/io/bitsquare/common/crypto/KeyStorage.java b/common/src/main/java/io/bisq/common/crypto/KeyStorage.java similarity index 98% rename from common/src/main/java/io/bitsquare/common/crypto/KeyStorage.java rename to common/src/main/java/io/bisq/common/crypto/KeyStorage.java index 9faa4fe5ef..311f522f92 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/KeyStorage.java +++ b/common/src/main/java/io/bisq/common/crypto/KeyStorage.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.crypto; +package io.bisq.common.crypto; import com.google.inject.Inject; -import io.bitsquare.storage.FileUtil; +import io.bisq.storage.FileUtil; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java b/common/src/main/java/io/bisq/common/crypto/PubKeyRing.java similarity index 91% rename from common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java rename to common/src/main/java/io/bisq/common/crypto/PubKeyRing.java index 864058dedc..e5bb6277c1 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java +++ b/common/src/main/java/io/bisq/common/crypto/PubKeyRing.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.crypto; +package io.bisq.common.crypto; import com.google.protobuf.ByteString; -import io.bitsquare.app.Version; -import io.bitsquare.common.wire.Payload; +import io.bisq.app.Version; +import io.bisq.common.wire.Payload; import io.bitsquare.common.wire.proto.Messages; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,8 +72,8 @@ public final class PubKeyRing implements Payload { private void init() { try { - signaturePubKey = KeyFactory.getInstance(Sig.KEY_ALGO, "BC").generatePublic(new X509EncodedKeySpec(signaturePubKeyBytes)); - encryptionPubKey = KeyFactory.getInstance(Encryption.ASYM_KEY_ALGO, "BC").generatePublic(new X509EncodedKeySpec(encryptionPubKeyBytes)); + signaturePubKey = KeyFactory.getInstance(Sig.KEY_ALGO, "BC").generatePublic(new X509EncodedKeySpec(signaturePubKeyBytes)); + encryptionPubKey = KeyFactory.getInstance(Encryption.ASYM_KEY_ALGO, "BC").generatePublic(new X509EncodedKeySpec(encryptionPubKeyBytes)); } catch (InvalidKeySpecException | NoSuchAlgorithmException | NoSuchProviderException e) { e.printStackTrace(); log.error(e.getMessage()); diff --git a/common/src/main/java/io/bitsquare/common/crypto/SealedAndSigned.java b/common/src/main/java/io/bisq/common/crypto/SealedAndSigned.java similarity index 96% rename from common/src/main/java/io/bitsquare/common/crypto/SealedAndSigned.java rename to common/src/main/java/io/bisq/common/crypto/SealedAndSigned.java index 48b4dfc537..10d0ebfd86 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/SealedAndSigned.java +++ b/common/src/main/java/io/bisq/common/crypto/SealedAndSigned.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.crypto; +package io.bisq.common.crypto; import com.google.protobuf.ByteString; -import io.bitsquare.app.Version; -import io.bitsquare.common.wire.Payload; +import io.bisq.app.Version; +import io.bisq.common.wire.Payload; import io.bitsquare.common.wire.proto.Messages; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,7 +69,7 @@ public final class SealedAndSigned implements Payload { * We have the bytes, now recreate the sigPublicKey. This happens when receiving this class over the wire, * because the public key is transient. */ - static PublicKey init(byte[] sigPublicKeyBytes) { + static PublicKey init(byte[] sigPublicKeyBytes) { PublicKey publicKey = null; try { publicKey = KeyFactory.getInstance(Sig.KEY_ALGO, "BC") diff --git a/common/src/main/java/io/bitsquare/common/crypto/Sig.java b/common/src/main/java/io/bisq/common/crypto/Sig.java similarity index 99% rename from common/src/main/java/io/bitsquare/common/crypto/Sig.java rename to common/src/main/java/io/bisq/common/crypto/Sig.java index 2f9b25de00..73baec11ab 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/Sig.java +++ b/common/src/main/java/io/bisq/common/crypto/Sig.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.crypto; +package io.bisq.common.crypto; import com.google.common.base.Charsets; import org.bouncycastle.util.encoders.Base64; diff --git a/common/src/main/java/io/bitsquare/common/crypto/Util.java b/common/src/main/java/io/bisq/common/crypto/Util.java similarity index 96% rename from common/src/main/java/io/bitsquare/common/crypto/Util.java rename to common/src/main/java/io/bisq/common/crypto/Util.java index ae738e4411..e2193a41a8 100644 --- a/common/src/main/java/io/bitsquare/common/crypto/Util.java +++ b/common/src/main/java/io/bisq/common/crypto/Util.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.crypto; +package io.bisq.common.crypto; import java.security.PublicKey; import java.security.spec.X509EncodedKeySpec; diff --git a/common/src/main/java/io/bitsquare/common/handlers/ErrorMessageHandler.java b/common/src/main/java/io/bisq/common/handlers/ErrorMessageHandler.java similarity index 95% rename from common/src/main/java/io/bitsquare/common/handlers/ErrorMessageHandler.java rename to common/src/main/java/io/bisq/common/handlers/ErrorMessageHandler.java index 8762adf681..2b18a9f34c 100644 --- a/common/src/main/java/io/bitsquare/common/handlers/ErrorMessageHandler.java +++ b/common/src/main/java/io/bisq/common/handlers/ErrorMessageHandler.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.handlers; +package io.bisq.common.handlers; /** * For reporting error message only (UI) diff --git a/common/src/main/java/io/bitsquare/common/handlers/ExceptionHandler.java b/common/src/main/java/io/bisq/common/handlers/ExceptionHandler.java similarity index 95% rename from common/src/main/java/io/bitsquare/common/handlers/ExceptionHandler.java rename to common/src/main/java/io/bisq/common/handlers/ExceptionHandler.java index fae9aa3489..77b7a35dd6 100644 --- a/common/src/main/java/io/bitsquare/common/handlers/ExceptionHandler.java +++ b/common/src/main/java/io/bisq/common/handlers/ExceptionHandler.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.handlers; +package io.bisq.common.handlers; /** * For reporting throwable objects only diff --git a/common/src/main/java/io/bitsquare/common/handlers/FaultHandler.java b/common/src/main/java/io/bisq/common/handlers/FaultHandler.java similarity index 95% rename from common/src/main/java/io/bitsquare/common/handlers/FaultHandler.java rename to common/src/main/java/io/bisq/common/handlers/FaultHandler.java index 484a15dc61..9fd3f7174a 100644 --- a/common/src/main/java/io/bitsquare/common/handlers/FaultHandler.java +++ b/common/src/main/java/io/bisq/common/handlers/FaultHandler.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.handlers; +package io.bisq.common.handlers; /** * For reporting a description message and throwable diff --git a/common/src/main/java/io/bitsquare/common/handlers/ResultHandler.java b/common/src/main/java/io/bisq/common/handlers/ResultHandler.java similarity index 95% rename from common/src/main/java/io/bitsquare/common/handlers/ResultHandler.java rename to common/src/main/java/io/bisq/common/handlers/ResultHandler.java index 31da0043e3..13fd49bbc9 100644 --- a/common/src/main/java/io/bitsquare/common/handlers/ResultHandler.java +++ b/common/src/main/java/io/bisq/common/handlers/ResultHandler.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.handlers; +package io.bisq.common.handlers; public interface ResultHandler { void handleResult(); diff --git a/common/src/main/java/io/bitsquare/common/persistance/Persistable.java b/common/src/main/java/io/bisq/common/persistance/Persistable.java similarity index 79% rename from common/src/main/java/io/bitsquare/common/persistance/Persistable.java rename to common/src/main/java/io/bisq/common/persistance/Persistable.java index 4d9876a7f6..b9d0373e74 100644 --- a/common/src/main/java/io/bitsquare/common/persistance/Persistable.java +++ b/common/src/main/java/io/bisq/common/persistance/Persistable.java @@ -1,4 +1,4 @@ -package io.bitsquare.common.persistance; +package io.bisq.common.persistance; import java.io.Serializable; diff --git a/common/src/main/java/io/bitsquare/common/taskrunner/InterceptTaskException.java b/common/src/main/java/io/bisq/common/taskrunner/InterceptTaskException.java similarity index 96% rename from common/src/main/java/io/bitsquare/common/taskrunner/InterceptTaskException.java rename to common/src/main/java/io/bisq/common/taskrunner/InterceptTaskException.java index 764a3c3d10..0eab62d773 100644 --- a/common/src/main/java/io/bitsquare/common/taskrunner/InterceptTaskException.java +++ b/common/src/main/java/io/bisq/common/taskrunner/InterceptTaskException.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.taskrunner; +package io.bisq.common.taskrunner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/common/taskrunner/Model.java b/common/src/main/java/io/bisq/common/taskrunner/Model.java similarity index 94% rename from common/src/main/java/io/bitsquare/common/taskrunner/Model.java rename to common/src/main/java/io/bisq/common/taskrunner/Model.java index 6a7675214e..41ad0d4532 100644 --- a/common/src/main/java/io/bitsquare/common/taskrunner/Model.java +++ b/common/src/main/java/io/bisq/common/taskrunner/Model.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.taskrunner; +package io.bisq.common.taskrunner; public interface Model { void persist(); diff --git a/common/src/main/java/io/bitsquare/common/taskrunner/Task.java b/common/src/main/java/io/bisq/common/taskrunner/Task.java similarity index 98% rename from common/src/main/java/io/bitsquare/common/taskrunner/Task.java rename to common/src/main/java/io/bisq/common/taskrunner/Task.java index f56da650b1..a420d0c2ac 100644 --- a/common/src/main/java/io/bitsquare/common/taskrunner/Task.java +++ b/common/src/main/java/io/bisq/common/taskrunner/Task.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.taskrunner; +package io.bisq.common.taskrunner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java b/common/src/main/java/io/bisq/common/taskrunner/TaskRunner.java similarity index 95% rename from common/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java rename to common/src/main/java/io/bisq/common/taskrunner/TaskRunner.java index 7148061b26..0868629478 100644 --- a/common/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java +++ b/common/src/main/java/io/bisq/common/taskrunner/TaskRunner.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.taskrunner; +package io.bisq.common.taskrunner; -import io.bitsquare.common.handlers.ErrorMessageHandler; -import io.bitsquare.common.handlers.ResultHandler; +import io.bisq.common.handlers.ErrorMessageHandler; +import io.bisq.common.handlers.ResultHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/common/util/DesktopUtil.java b/common/src/main/java/io/bisq/common/util/DesktopUtil.java similarity index 99% rename from common/src/main/java/io/bitsquare/common/util/DesktopUtil.java rename to common/src/main/java/io/bisq/common/util/DesktopUtil.java index f56c201b2f..1c78131f69 100644 --- a/common/src/main/java/io/bitsquare/common/util/DesktopUtil.java +++ b/common/src/main/java/io/bisq/common/util/DesktopUtil.java @@ -1,4 +1,4 @@ -package io.bitsquare.common.util; +package io.bisq.common.util; import java.awt.*; import java.io.File; diff --git a/common/src/main/java/io/bitsquare/common/util/JsonExclude.java b/common/src/main/java/io/bisq/common/util/JsonExclude.java similarity index 96% rename from common/src/main/java/io/bitsquare/common/util/JsonExclude.java rename to common/src/main/java/io/bisq/common/util/JsonExclude.java index 079b849d92..b25953876b 100644 --- a/common/src/main/java/io/bitsquare/common/util/JsonExclude.java +++ b/common/src/main/java/io/bisq/common/util/JsonExclude.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.util; +package io.bisq.common.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/src/main/java/io/bitsquare/common/util/LimitedKeyStrengthException.java b/common/src/main/java/io/bisq/common/util/LimitedKeyStrengthException.java similarity index 96% rename from common/src/main/java/io/bitsquare/common/util/LimitedKeyStrengthException.java rename to common/src/main/java/io/bisq/common/util/LimitedKeyStrengthException.java index fc685c18b7..b5424d637e 100644 --- a/common/src/main/java/io/bitsquare/common/util/LimitedKeyStrengthException.java +++ b/common/src/main/java/io/bisq/common/util/LimitedKeyStrengthException.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.util; +package io.bisq.common.util; public class LimitedKeyStrengthException extends Exception { public LimitedKeyStrengthException() { diff --git a/common/src/main/java/io/bitsquare/common/util/MathUtils.java b/common/src/main/java/io/bisq/common/util/MathUtils.java similarity index 98% rename from common/src/main/java/io/bitsquare/common/util/MathUtils.java rename to common/src/main/java/io/bisq/common/util/MathUtils.java index 254649ba16..9ee2cc6f06 100644 --- a/common/src/main/java/io/bitsquare/common/util/MathUtils.java +++ b/common/src/main/java/io/bisq/common/util/MathUtils.java @@ -1,4 +1,4 @@ -package io.bitsquare.common.util; +package io.bisq.common.util; import com.google.common.math.DoubleMath; import org.slf4j.Logger; diff --git a/common/src/main/java/io/bitsquare/common/util/Profiler.java b/common/src/main/java/io/bisq/common/util/Profiler.java similarity index 97% rename from common/src/main/java/io/bitsquare/common/util/Profiler.java rename to common/src/main/java/io/bisq/common/util/Profiler.java index 070394cefe..36dd6a2b60 100644 --- a/common/src/main/java/io/bitsquare/common/util/Profiler.java +++ b/common/src/main/java/io/bisq/common/util/Profiler.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.util; +package io.bisq.common.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/common/util/ProtoBufferUtils.java b/common/src/main/java/io/bisq/common/util/ProtoBufferUtils.java similarity index 81% rename from common/src/main/java/io/bitsquare/common/util/ProtoBufferUtils.java rename to common/src/main/java/io/bisq/common/util/ProtoBufferUtils.java index d936ca8cd5..e2e9341ca5 100644 --- a/common/src/main/java/io/bitsquare/common/util/ProtoBufferUtils.java +++ b/common/src/main/java/io/bisq/common/util/ProtoBufferUtils.java @@ -1,6 +1,6 @@ -package io.bitsquare.common.util; +package io.bisq.common.util; -import io.bitsquare.app.Version; +import io.bisq.app.Version; import io.bitsquare.common.wire.proto.Messages; /** diff --git a/common/src/main/java/io/bitsquare/common/util/RestartUtil.java b/common/src/main/java/io/bisq/common/util/RestartUtil.java similarity index 98% rename from common/src/main/java/io/bitsquare/common/util/RestartUtil.java rename to common/src/main/java/io/bisq/common/util/RestartUtil.java index f62d85b4fa..effe5d6c7a 100644 --- a/common/src/main/java/io/bitsquare/common/util/RestartUtil.java +++ b/common/src/main/java/io/bisq/common/util/RestartUtil.java @@ -1,4 +1,4 @@ -package io.bitsquare.common.util; +package io.bisq.common.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/common/util/Tuple2.java b/common/src/main/java/io/bisq/common/util/Tuple2.java similarity index 97% rename from common/src/main/java/io/bitsquare/common/util/Tuple2.java rename to common/src/main/java/io/bisq/common/util/Tuple2.java index 9695ccbe64..4c645a48f7 100644 --- a/common/src/main/java/io/bitsquare/common/util/Tuple2.java +++ b/common/src/main/java/io/bisq/common/util/Tuple2.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.util; +package io.bisq.common.util; import java.io.Serializable; diff --git a/common/src/main/java/io/bitsquare/common/util/Tuple3.java b/common/src/main/java/io/bisq/common/util/Tuple3.java similarity index 98% rename from common/src/main/java/io/bitsquare/common/util/Tuple3.java rename to common/src/main/java/io/bisq/common/util/Tuple3.java index 492a59f453..30d2fb2406 100644 --- a/common/src/main/java/io/bitsquare/common/util/Tuple3.java +++ b/common/src/main/java/io/bisq/common/util/Tuple3.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.util; +package io.bisq.common.util; import java.io.Serializable; diff --git a/common/src/main/java/io/bitsquare/common/util/Tuple4.java b/common/src/main/java/io/bisq/common/util/Tuple4.java similarity index 98% rename from common/src/main/java/io/bitsquare/common/util/Tuple4.java rename to common/src/main/java/io/bisq/common/util/Tuple4.java index dd29afbed1..75a0ff1076 100644 --- a/common/src/main/java/io/bitsquare/common/util/Tuple4.java +++ b/common/src/main/java/io/bisq/common/util/Tuple4.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.util; +package io.bisq.common.util; import java.io.Serializable; diff --git a/common/src/main/java/io/bitsquare/common/util/Utilities.java b/common/src/main/java/io/bisq/common/util/Utilities.java similarity index 99% rename from common/src/main/java/io/bitsquare/common/util/Utilities.java rename to common/src/main/java/io/bisq/common/util/Utilities.java index 63d65d41b6..cded3ee75b 100644 --- a/common/src/main/java/io/bitsquare/common/util/Utilities.java +++ b/common/src/main/java/io/bisq/common/util/Utilities.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.util; +package io.bisq.common.util; import com.google.common.base.Charsets; import com.google.common.io.CharStreams; @@ -23,7 +23,7 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.gson.*; -import io.bitsquare.io.LookAheadObjectInputStream; +import io.bisq.io.LookAheadObjectInputStream; import javafx.scene.input.Clipboard; import javafx.scene.input.ClipboardContent; import org.apache.commons.lang3.RandomStringUtils; @@ -452,7 +452,7 @@ public class Utilities { } public static String toTruncatedString(Object message, int maxLength) { - if(Objects.nonNull(message)) { + if (Objects.nonNull(message)) { return StringUtils.abbreviate(message.toString(), maxLength).replace("\n", ""); } return "NULL"; diff --git a/common/src/main/java/io/bitsquare/common/wire/Payload.java b/common/src/main/java/io/bisq/common/wire/Payload.java similarity index 74% rename from common/src/main/java/io/bitsquare/common/wire/Payload.java rename to common/src/main/java/io/bisq/common/wire/Payload.java index 2103c15357..7b18966b67 100644 --- a/common/src/main/java/io/bitsquare/common/wire/Payload.java +++ b/common/src/main/java/io/bisq/common/wire/Payload.java @@ -1,7 +1,7 @@ -package io.bitsquare.common.wire; +package io.bisq.common.wire; import com.google.protobuf.Message; -import io.bitsquare.messages.ToProtoBuffer; +import io.bisq.messages.ToProtoBuffer; import java.io.Serializable; diff --git a/common/src/main/java/io/bitsquare/io/LookAheadObjectInputStream.java b/common/src/main/java/io/bisq/io/LookAheadObjectInputStream.java similarity index 99% rename from common/src/main/java/io/bitsquare/io/LookAheadObjectInputStream.java rename to common/src/main/java/io/bisq/io/LookAheadObjectInputStream.java index c8d72e9005..98bed7d19a 100644 --- a/common/src/main/java/io/bitsquare/io/LookAheadObjectInputStream.java +++ b/common/src/main/java/io/bisq/io/LookAheadObjectInputStream.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with bisq. If not, see . */ -package io.bitsquare.io; +package io.bisq.io; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/locale/CurrencyTuple.java b/common/src/main/java/io/bisq/locale/CurrencyTuple.java similarity index 97% rename from common/src/main/java/io/bitsquare/locale/CurrencyTuple.java rename to common/src/main/java/io/bisq/locale/CurrencyTuple.java index 702463f384..f9700e9927 100644 --- a/common/src/main/java/io/bitsquare/locale/CurrencyTuple.java +++ b/common/src/main/java/io/bisq/locale/CurrencyTuple.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.locale; +package io.bisq.locale; import java.io.Serializable; diff --git a/common/src/main/java/io/bitsquare/locale/Res.java b/common/src/main/java/io/bisq/locale/Res.java similarity index 99% rename from common/src/main/java/io/bitsquare/locale/Res.java rename to common/src/main/java/io/bisq/locale/Res.java index b6838f0808..477be0510b 100644 --- a/common/src/main/java/io/bitsquare/locale/Res.java +++ b/common/src/main/java/io/bisq/locale/Res.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.locale; +package io.bisq.locale; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; diff --git a/common/src/main/java/io/bitsquare/messages/Message.java b/common/src/main/java/io/bisq/messages/Message.java similarity index 72% rename from common/src/main/java/io/bitsquare/messages/Message.java rename to common/src/main/java/io/bisq/messages/Message.java index 24fe5978d7..842215c18d 100644 --- a/common/src/main/java/io/bitsquare/messages/Message.java +++ b/common/src/main/java/io/bisq/messages/Message.java @@ -1,4 +1,4 @@ -package io.bitsquare.messages; +package io.bisq.messages; import io.bitsquare.common.wire.proto.Messages; @@ -7,5 +7,5 @@ import java.io.Serializable; public interface Message extends Serializable, ToProtoBuffer { int getMessageVersion(); - Messages.Envelope toProtoBuf(); + Messages.Envelope toProtoBuf(); } diff --git a/common/src/main/java/io/bitsquare/messages/ToProtoBuffer.java b/common/src/main/java/io/bisq/messages/ToProtoBuffer.java similarity index 81% rename from common/src/main/java/io/bitsquare/messages/ToProtoBuffer.java rename to common/src/main/java/io/bisq/messages/ToProtoBuffer.java index b3949b318f..ddbd58de62 100644 --- a/common/src/main/java/io/bitsquare/messages/ToProtoBuffer.java +++ b/common/src/main/java/io/bisq/messages/ToProtoBuffer.java @@ -1,4 +1,4 @@ -package io.bitsquare.messages; +package io.bisq.messages; import com.google.protobuf.Message; diff --git a/common/src/main/java/io/bitsquare/storage/FileManager.java b/common/src/main/java/io/bisq/storage/FileManager.java similarity index 98% rename from common/src/main/java/io/bitsquare/storage/FileManager.java rename to common/src/main/java/io/bisq/storage/FileManager.java index 4b09e81920..9c60f1a894 100644 --- a/common/src/main/java/io/bitsquare/storage/FileManager.java +++ b/common/src/main/java/io/bisq/storage/FileManager.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.storage; +package io.bisq.storage; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.io.LookAheadObjectInputStream; +import io.bisq.common.UserThread; +import io.bisq.common.util.Utilities; +import io.bisq.io.LookAheadObjectInputStream; import org.bitcoinj.core.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/bitsquare/storage/FileUtil.java b/common/src/main/java/io/bisq/storage/FileUtil.java similarity index 99% rename from common/src/main/java/io/bitsquare/storage/FileUtil.java rename to common/src/main/java/io/bisq/storage/FileUtil.java index 822e18598f..279386e9ee 100644 --- a/common/src/main/java/io/bitsquare/storage/FileUtil.java +++ b/common/src/main/java/io/bisq/storage/FileUtil.java @@ -1,4 +1,4 @@ -package io.bitsquare.storage; +package io.bisq.storage; import com.google.common.io.Files; import org.slf4j.Logger; diff --git a/common/src/main/java/io/bitsquare/storage/PlainTextWrapper.java b/common/src/main/java/io/bisq/storage/PlainTextWrapper.java similarity index 94% rename from common/src/main/java/io/bitsquare/storage/PlainTextWrapper.java rename to common/src/main/java/io/bisq/storage/PlainTextWrapper.java index c5414ffa1d..7f0c3d6721 100644 --- a/common/src/main/java/io/bitsquare/storage/PlainTextWrapper.java +++ b/common/src/main/java/io/bisq/storage/PlainTextWrapper.java @@ -1,4 +1,4 @@ -package io.bitsquare.storage; +package io.bisq.storage; import java.io.Serializable; diff --git a/common/src/main/java/io/bitsquare/storage/ResourceNotFoundException.java b/common/src/main/java/io/bisq/storage/ResourceNotFoundException.java similarity index 85% rename from common/src/main/java/io/bitsquare/storage/ResourceNotFoundException.java rename to common/src/main/java/io/bisq/storage/ResourceNotFoundException.java index 6b77fef71d..6efe8f2889 100644 --- a/common/src/main/java/io/bitsquare/storage/ResourceNotFoundException.java +++ b/common/src/main/java/io/bisq/storage/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package io.bitsquare.storage; +package io.bisq.storage; public class ResourceNotFoundException extends Exception { public ResourceNotFoundException(String path) { diff --git a/common/src/main/java/io/bitsquare/storage/Storage.java b/common/src/main/java/io/bisq/storage/Storage.java similarity index 99% rename from common/src/main/java/io/bitsquare/storage/Storage.java rename to common/src/main/java/io/bisq/storage/Storage.java index 25170a836a..cfb7f1cd9c 100644 --- a/common/src/main/java/io/bitsquare/storage/Storage.java +++ b/common/src/main/java/io/bisq/storage/Storage.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.storage; +package io.bisq.storage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/resources/logback.xml b/common/src/main/resources/logback.xml index de468733bc..f3a78f6641 100644 --- a/common/src/main/resources/logback.xml +++ b/common/src/main/resources/logback.xml @@ -10,8 +10,8 @@ - - + + - \ No newline at end of file diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.java b/gui/src/main/java/io/bisq/gui/main/MainView.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/MainView.java rename to gui/src/main/java/io/bisq/gui/main/MainView.java index 9e3b7aa2c2..d196ef777d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/gui/src/main/java/io/bisq/gui/main/MainView.java @@ -15,34 +15,34 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main; +package io.bisq.gui.main; -import io.bitsquare.BitsquareException; -import io.bitsquare.app.AppOptionKeys; -import io.bitsquare.app.BitsquareEnvironment; -import io.bitsquare.app.DevEnv; -import io.bitsquare.app.Version; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.components.BusyAnimation; -import io.bitsquare.gui.main.account.AccountView; -import io.bitsquare.gui.main.dao.DaoView; -import io.bitsquare.gui.main.disputes.DisputesView; -import io.bitsquare.gui.main.funds.FundsView; -import io.bitsquare.gui.main.market.MarketView; -import io.bitsquare.gui.main.offer.BuyOfferView; -import io.bitsquare.gui.main.offer.SellOfferView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.portfolio.PortfolioView; -import io.bitsquare.gui.main.settings.SettingsView; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.gui.util.Transitions; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.provider.price.PriceFeedService; +import io.bisq.BitsquareException; +import io.bisq.app.AppOptionKeys; +import io.bisq.app.BitsquareEnvironment; +import io.bisq.app.DevEnv; +import io.bisq.app.Version; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Tuple3; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.*; +import io.bisq.gui.components.BusyAnimation; +import io.bisq.gui.main.account.AccountView; +import io.bisq.gui.main.dao.DaoView; +import io.bisq.gui.main.disputes.DisputesView; +import io.bisq.gui.main.funds.FundsView; +import io.bisq.gui.main.market.MarketView; +import io.bisq.gui.main.offer.BuyOfferView; +import io.bisq.gui.main.offer.SellOfferView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.portfolio.PortfolioView; +import io.bisq.gui.main.settings.SettingsView; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.gui.util.Transitions; +import io.bisq.locale.Res; +import io.bisq.messages.provider.price.PriceFeedService; import javafx.beans.value.ChangeListener; import javafx.geometry.Insets; import javafx.geometry.Pos; diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bisq/gui/main/MainViewModel.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java rename to gui/src/main/java/io/bisq/gui/main/MainViewModel.java index dd4c9727f3..872cc16168 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/MainViewModel.java @@ -15,62 +15,62 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main; +package io.bisq.gui.main; import com.google.inject.Inject; -import io.bitsquare.alert.AlertManager; -import io.bitsquare.alert.PrivateNotificationManager; -import io.bitsquare.app.DevEnv; -import io.bitsquare.app.Log; -import io.bitsquare.app.Version; -import io.bitsquare.arbitration.ArbitratorManager; -import io.bitsquare.arbitration.DisputeManager; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.btc.wallet.WalletsManager; -import io.bitsquare.btc.wallet.WalletsSetup; -import io.bitsquare.common.Clock; -import io.bitsquare.common.Timer; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.crypto.*; -import io.bitsquare.crypto.EncryptionService; -import io.bitsquare.dao.DaoManager; -import io.bitsquare.dao.blockchain.BsqBlockchainException; -import io.bitsquare.filter.FilterManager; -import io.bitsquare.gui.common.model.ViewModel; -import io.bitsquare.gui.components.BalanceWithConfirmationTextField; -import io.bitsquare.gui.components.TxIdTextField; -import io.bitsquare.gui.main.overlays.notifications.NotificationCenter; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.DisplayAlertMessageWindow; -import io.bitsquare.gui.main.overlays.windows.TacWindow; -import io.bitsquare.gui.main.overlays.windows.WalletPasswordWindow; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.alert.Alert; -import io.bitsquare.messages.alert.PrivateNotification; -import io.bitsquare.messages.arbitration.Dispute; -import io.bitsquare.messages.btc.provider.fee.FeeService; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.provider.price.MarketPrice; -import io.bitsquare.messages.provider.price.PriceFeedService; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.p2p.P2PServiceListener; -import io.bitsquare.p2p.network.CloseConnectionReason; -import io.bitsquare.p2p.network.Connection; -import io.bitsquare.p2p.network.ConnectionListener; -import io.bitsquare.p2p.peers.keepalive.messages.Ping; -import io.bitsquare.payment.CryptoCurrencyAccount; -import io.bitsquare.payment.OKPayAccount; -import io.bitsquare.payment.PaymentAccount; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.TradeManager; -import io.bitsquare.trade.offer.OpenOffer; -import io.bitsquare.trade.offer.OpenOfferManager; -import io.bitsquare.user.User; +import io.bisq.alert.AlertManager; +import io.bisq.alert.PrivateNotificationManager; +import io.bisq.app.DevEnv; +import io.bisq.app.Log; +import io.bisq.app.Version; +import io.bisq.arbitration.ArbitratorManager; +import io.bisq.arbitration.DisputeManager; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.btc.wallet.WalletsManager; +import io.bisq.btc.wallet.WalletsSetup; +import io.bisq.common.Clock; +import io.bisq.common.Timer; +import io.bisq.common.UserThread; +import io.bisq.common.crypto.*; +import io.bisq.crypto.EncryptionService; +import io.bisq.dao.DaoManager; +import io.bisq.dao.blockchain.BsqBlockchainException; +import io.bisq.filter.FilterManager; +import io.bisq.gui.common.model.ViewModel; +import io.bisq.gui.components.BalanceWithConfirmationTextField; +import io.bisq.gui.components.TxIdTextField; +import io.bisq.gui.main.overlays.notifications.NotificationCenter; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.DisplayAlertMessageWindow; +import io.bisq.gui.main.overlays.windows.TacWindow; +import io.bisq.gui.main.overlays.windows.WalletPasswordWindow; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; +import io.bisq.messages.alert.Alert; +import io.bisq.messages.alert.PrivateNotification; +import io.bisq.messages.arbitration.Dispute; +import io.bisq.messages.btc.provider.fee.FeeService; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.provider.price.MarketPrice; +import io.bisq.messages.provider.price.PriceFeedService; +import io.bisq.messages.user.Preferences; +import io.bisq.p2p.P2PService; +import io.bisq.p2p.P2PServiceListener; +import io.bisq.p2p.network.CloseConnectionReason; +import io.bisq.p2p.network.Connection; +import io.bisq.p2p.network.ConnectionListener; +import io.bisq.p2p.peers.keepalive.messages.Ping; +import io.bisq.payment.CryptoCurrencyAccount; +import io.bisq.payment.OKPayAccount; +import io.bisq.payment.PaymentAccount; +import io.bisq.trade.Trade; +import io.bisq.trade.TradeManager; +import io.bisq.trade.offer.OpenOffer; +import io.bisq.trade.offer.OpenOfferManager; +import io.bisq.user.User; import javafx.beans.property.*; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; @@ -179,10 +179,10 @@ public class MainViewModel implements ViewModel { ArbitratorManager arbitratorManager, P2PService p2PService, TradeManager tradeManager, OpenOfferManager openOfferManager, DisputeManager disputeManager, Preferences preferences, User user, AlertManager alertManager, PrivateNotificationManager privateNotificationManager, - FilterManager filterManager, WalletPasswordWindow walletPasswordWindow, + FilterManager filterManager, WalletPasswordWindow walletPasswordWindow, NotificationCenter notificationCenter, TacWindow tacWindow, Clock clock, FeeService feeService, DaoManager daoManager, - KeyRing keyRing, + KeyRing keyRing, BSFormatter formatter) { this.walletsManager = walletsManager; this.walletsSetup = walletsSetup; @@ -565,7 +565,7 @@ public class MainViewModel implements ViewModel { Thread.currentThread().setName("checkCryptoThread"); log.trace("Run crypto test"); // just use any simple dummy msg - io.bitsquare.p2p.peers.keepalive.messages.Ping payload = new Ping(1, 1); + Ping payload = new Ping(1, 1); SealedAndSigned sealedAndSigned = Encryption.encryptHybridWithSignature(payload, keyRing.getSignatureKeyPair(), keyRing.getPubKeyRing().getEncryptionPubKey()); DecryptedDataTuple tuple = EncryptionService.decryptHybridWithSignature(sealedAndSigned, keyRing.getEncryptionKeyPair().getPrivate()); diff --git a/gui/src/main/java/io/bitsquare/gui/main/PriceFeedComboBoxItem.java b/gui/src/main/java/io/bisq/gui/main/PriceFeedComboBoxItem.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/PriceFeedComboBoxItem.java rename to gui/src/main/java/io/bisq/gui/main/PriceFeedComboBoxItem.java index 1ecb1ef3ed..19d5737e48 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/PriceFeedComboBoxItem.java +++ b/gui/src/main/java/io/bisq/gui/main/PriceFeedComboBoxItem.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.main; +package io.bisq.gui.main; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml b/gui/src/main/java/io/bisq/gui/main/account/AccountView.fxml similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml rename to gui/src/main/java/io/bisq/gui/main/account/AccountView.fxml index 367caea417..902cd112d1 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/account/AccountView.fxml @@ -20,7 +20,7 @@ -. */ -package io.bitsquare.gui.main.account; +package io.bisq.gui.main.account; -import io.bitsquare.app.DevEnv; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.account.arbitratorregistration.ArbitratorRegistrationView; -import io.bitsquare.gui.main.account.content.fiataccounts.FiatAccountsView; -import io.bitsquare.gui.main.account.settings.AccountSettingsView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; +import io.bisq.app.DevEnv; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.account.arbitratorregistration.ArbitratorRegistrationView; +import io.bisq.gui.main.account.content.fiataccounts.FiatAccountsView; +import io.bisq.gui.main.account.settings.AccountSettingsView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; import javafx.beans.value.ChangeListener; import javafx.event.EventHandler; import javafx.fxml.FXML; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java b/gui/src/main/java/io/bisq/gui/main/account/AccountViewModel.java similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java rename to gui/src/main/java/io/bisq/gui/main/account/AccountViewModel.java index c0d1091603..6b0d340663 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/account/AccountViewModel.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.account; +package io.bisq.gui.main.account; import com.google.inject.Inject; -import io.bitsquare.gui.common.model.ViewModel; +import io.bisq.gui.common.model.ViewModel; class AccountViewModel implements ViewModel { diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml b/gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml rename to gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml index a7cd7ff3cf..0285c369f6 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml @@ -18,7 +18,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java b/gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java rename to gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java index e4f477367b..66a8570098 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java +++ b/gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java @@ -15,21 +15,21 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.account.arbitratorregistration; +package io.bisq.gui.main.account.arbitratorregistration; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.EnterPrivKeyWindow; -import io.bitsquare.gui.util.FormBuilder; -import io.bitsquare.gui.util.ImageUtil; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.arbitration.Arbitrator; -import io.bitsquare.messages.locale.LanguageUtil; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.EnterPrivKeyWindow; +import io.bisq.gui.util.FormBuilder; +import io.bisq.gui.util.ImageUtil; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.arbitration.Arbitrator; +import io.bisq.messages.locale.LanguageUtil; import javafx.beans.value.ChangeListener; import javafx.collections.ListChangeListener; import javafx.geometry.HPos; @@ -43,7 +43,7 @@ import javafx.util.StringConverter; import javax.inject.Inject; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; @FxmlView public class ArbitratorRegistrationView extends ActivatableViewAndModel { diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java b/gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java rename to gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java index 148ccde177..0747bc19ee 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java @@ -15,21 +15,21 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.account.arbitratorregistration; +package io.bisq.gui.main.account.arbitratorregistration; import com.google.inject.Inject; -import io.bitsquare.arbitration.ArbitratorManager; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.common.handlers.ErrorMessageHandler; -import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.gui.common.model.ActivatableViewModel; -import io.bitsquare.messages.arbitration.Arbitrator; -import io.bitsquare.messages.locale.LanguageUtil; -import io.bitsquare.p2p.NodeAddress; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.user.User; +import io.bisq.arbitration.ArbitratorManager; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.common.crypto.KeyRing; +import io.bisq.common.handlers.ErrorMessageHandler; +import io.bisq.common.handlers.ResultHandler; +import io.bisq.gui.common.model.ActivatableViewModel; +import io.bisq.messages.arbitration.Arbitrator; +import io.bisq.messages.locale.LanguageUtil; +import io.bisq.p2p.NodeAddress; +import io.bisq.p2p.P2PService; +import io.bisq.user.User; import javafx.beans.property.*; import javafx.collections.FXCollections; import javafx.collections.MapChangeListener; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java b/gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java rename to gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java index a72b5d5ac7..b8993cf4c4 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java @@ -15,21 +15,21 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.account.content.altcoinaccounts; +package io.bisq.gui.main.account.content.altcoinaccounts; import com.google.inject.Inject; -import io.bitsquare.gui.common.model.ActivatableDataModel; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.messages.locale.CryptoCurrency; -import io.bitsquare.messages.locale.FiatCurrency; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.payment.CryptoCurrencyAccount; -import io.bitsquare.payment.PaymentAccount; -import io.bitsquare.trade.TradeManager; -import io.bitsquare.trade.offer.OpenOfferManager; -import io.bitsquare.user.User; +import io.bisq.gui.common.model.ActivatableDataModel; +import io.bisq.gui.util.GUIUtil; +import io.bisq.messages.locale.CryptoCurrency; +import io.bisq.messages.locale.FiatCurrency; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.user.Preferences; +import io.bisq.payment.CryptoCurrencyAccount; +import io.bisq.payment.PaymentAccount; +import io.bisq.trade.TradeManager; +import io.bisq.trade.offer.OpenOfferManager; +import io.bisq.user.User; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.collections.SetChangeListener; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml b/gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml rename to gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml index 4d12f8b893..8644e30bb9 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml @@ -19,7 +19,7 @@ -. */ -package io.bitsquare.gui.main.account.content.altcoinaccounts; +package io.bisq.gui.main.account.content.altcoinaccounts; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.components.paymentmethods.CryptoCurrencyForm; -import io.bitsquare.gui.components.paymentmethods.PaymentMethodForm; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.FormBuilder; -import io.bitsquare.gui.util.ImageUtil; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.gui.util.validation.AltCoinAddressValidator; -import io.bitsquare.gui.util.validation.InputValidator; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.CryptoCurrency; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.payment.PaymentAccount; -import io.bitsquare.payment.PaymentAccountFactory; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Tuple3; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.components.paymentmethods.CryptoCurrencyForm; +import io.bisq.gui.components.paymentmethods.PaymentMethodForm; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.FormBuilder; +import io.bisq.gui.util.ImageUtil; +import io.bisq.gui.util.Layout; +import io.bisq.gui.util.validation.AltCoinAddressValidator; +import io.bisq.gui.util.validation.InputValidator; +import io.bisq.locale.Res; +import io.bisq.messages.locale.CryptoCurrency; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.payment.PaymentAccount; +import io.bisq.payment.PaymentAccountFactory; import javafx.beans.value.ChangeListener; import javafx.geometry.VPos; import javafx.scene.control.Button; @@ -52,7 +52,7 @@ import javafx.util.Callback; import javax.inject.Inject; import java.util.concurrent.TimeUnit; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; @FxmlView public class AltCoinAccountsView extends ActivatableViewAndModel { diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java b/gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java rename to gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java index 0b9f014d4a..6360331e61 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java @@ -15,12 +15,12 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.account.content.altcoinaccounts; +package io.bisq.gui.main.account.content.altcoinaccounts; import com.google.inject.Inject; -import io.bitsquare.gui.common.model.ActivatableWithDataModel; -import io.bitsquare.gui.common.model.ViewModel; -import io.bitsquare.payment.PaymentAccount; +import io.bisq.gui.common.model.ActivatableWithDataModel; +import io.bisq.gui.common.model.ViewModel; +import io.bisq.payment.PaymentAccount; import javafx.collections.ObservableList; class AltCoinAccountsViewModel extends ActivatableWithDataModel implements ViewModel { diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorListItem.java b/gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorListItem.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorListItem.java rename to gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorListItem.java index fecd8550eb..09391ef4f6 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorListItem.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.account.content.arbitratorselection; +package io.bisq.gui.main.account.content.arbitratorselection; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.messages.arbitration.Arbitrator; +import io.bisq.gui.util.BSFormatter; +import io.bisq.messages.arbitration.Arbitrator; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml b/gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml rename to gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml index 88a4da0d8d..1acd8812ca 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml @@ -18,7 +18,7 @@ --> -. */ -package io.bitsquare.gui.main.account.content.arbitratorselection; +package io.bisq.gui.main.account.content.arbitratorselection; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.TableGroupHeadline; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.ImageUtil; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.LanguageUtil; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.TableGroupHeadline; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.ImageUtil; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.locale.LanguageUtil; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.value.ChangeListener; @@ -43,7 +43,7 @@ import javafx.util.StringConverter; import javax.inject.Inject; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; @FxmlView public class ArbitratorSelectionView extends ActivatableViewAndModel { diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java b/gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java rename to gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java index 0112e50b1e..829be3c77f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java @@ -15,18 +15,18 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.account.content.arbitratorselection; +package io.bisq.gui.main.account.content.arbitratorselection; import com.google.inject.Inject; -import io.bitsquare.arbitration.ArbitratorManager; -import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.gui.common.model.ActivatableDataModel; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.messages.arbitration.Arbitrator; -import io.bitsquare.messages.locale.LanguageUtil; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.p2p.NodeAddress; -import io.bitsquare.user.User; +import io.bisq.arbitration.ArbitratorManager; +import io.bisq.common.crypto.KeyRing; +import io.bisq.gui.common.model.ActivatableDataModel; +import io.bisq.gui.util.BSFormatter; +import io.bisq.messages.arbitration.Arbitrator; +import io.bisq.messages.locale.LanguageUtil; +import io.bisq.messages.user.Preferences; +import io.bisq.p2p.NodeAddress; +import io.bisq.user.User; import javafx.collections.FXCollections; import javafx.collections.MapChangeListener; import javafx.collections.ObservableList; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.fxml b/gui/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.fxml rename to gui/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.fxml index bab7a5fc04..997e37ed63 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.fxml @@ -18,7 +18,7 @@ --> -. */ -package io.bitsquare.gui.main.account.content.backup; +package io.bisq.gui.main.account.content.backup; -import io.bitsquare.app.AppOptionKeys; -import io.bitsquare.app.BitsquareEnvironment; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; +import io.bisq.app.AppOptionKeys; +import io.bisq.app.BitsquareEnvironment; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Utilities; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.FormBuilder; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; import javafx.beans.value.ChangeListener; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -45,8 +46,6 @@ import java.nio.file.Paths; import java.text.SimpleDateFormat; import java.util.Date; -import static io.bitsquare.gui.util.FormBuilder.*; - @FxmlView public class BackupView extends ActivatableView { private final File dataDir; @@ -74,8 +73,8 @@ public class BackupView extends ActivatableView { @Override public void initialize() { - addTitledGroupBg(root, gridRow, 1, Res.get("account.backup.title")); - Tuple2 tuple = addLabelInputTextField(root, gridRow, Res.get("account.backup.location"), Layout.FIRST_ROW_DISTANCE); + FormBuilder.addTitledGroupBg(root, gridRow, 1, Res.get("account.backup.title")); + Tuple2 tuple = FormBuilder.addLabelInputTextField(root, gridRow, Res.get("account.backup.location"), Layout.FIRST_ROW_DISTANCE); backUpLocationTextField = tuple.second; String backupDirectory = preferences.getBackupDirectory(); if (backupDirectory != null) @@ -86,13 +85,13 @@ public class BackupView extends ActivatableView { applyBackupDirectory(backUpLocationTextField.getText()); }; - Tuple2 tuple2 = add2ButtonsAfterGroup(root, ++gridRow, Res.get("account.backup.backupNow"), Res.get("account.backup.openAppDir")); + Tuple2 tuple2 = FormBuilder.add2ButtonsAfterGroup(root, ++gridRow, Res.get("account.backup.backupNow"), Res.get("account.backup.openAppDir")); selectBackupDir = tuple2.first; backupNow = tuple2.second; updateButtons(); - addTitledGroupBg(root, ++gridRow, 1, Res.get("account.backup.selectLocation"), Layout.GROUP_DISTANCE); - openDataDir = addLabelButton(root, gridRow, Res.get("account.backup.appDir"), Res.get("account.backup.openDirectory"), Layout.FIRST_ROW_AND_GROUP_DISTANCE).second; + FormBuilder.addTitledGroupBg(root, ++gridRow, 1, Res.get("account.backup.selectLocation"), Layout.GROUP_DISTANCE); + openDataDir = FormBuilder.addLabelButton(root, gridRow, Res.get("account.backup.appDir"), Res.get("account.backup.openDirectory"), Layout.FIRST_ROW_AND_GROUP_DISTANCE).second; openDataDir.setDefaultButton(false); } diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java b/gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java rename to gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java index b46eb3575f..6312dfc333 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java @@ -15,21 +15,21 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.account.content.fiataccounts; +package io.bisq.gui.main.account.content.fiataccounts; import com.google.inject.Inject; -import io.bitsquare.gui.common.model.ActivatableDataModel; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.messages.locale.CryptoCurrency; -import io.bitsquare.messages.locale.FiatCurrency; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.payment.CryptoCurrencyAccount; -import io.bitsquare.payment.PaymentAccount; -import io.bitsquare.trade.TradeManager; -import io.bitsquare.trade.offer.OpenOfferManager; -import io.bitsquare.user.User; +import io.bisq.gui.common.model.ActivatableDataModel; +import io.bisq.gui.util.GUIUtil; +import io.bisq.messages.locale.CryptoCurrency; +import io.bisq.messages.locale.FiatCurrency; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.user.Preferences; +import io.bisq.payment.CryptoCurrencyAccount; +import io.bisq.payment.PaymentAccount; +import io.bisq.trade.TradeManager; +import io.bisq.trade.offer.OpenOfferManager; +import io.bisq.user.User; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.collections.SetChangeListener; diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsView.fxml b/gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.fxml similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsView.fxml rename to gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.fxml index 714b941957..ac9623103c 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.fxml @@ -19,7 +19,7 @@ -. */ -package io.bitsquare.gui.main.account.content.fiataccounts; +package io.bisq.gui.main.account.content.fiataccounts; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.components.paymentmethods.*; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.FormBuilder; -import io.bitsquare.gui.util.ImageUtil; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.gui.util.validation.*; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.payment.PaymentAccount; -import io.bitsquare.payment.PaymentAccountFactory; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Tuple3; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.components.paymentmethods.*; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.FormBuilder; +import io.bisq.gui.util.ImageUtil; +import io.bisq.gui.util.Layout; +import io.bisq.gui.util.validation.*; +import io.bisq.locale.Res; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.payment.PaymentAccount; +import io.bisq.payment.PaymentAccountFactory; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; import javafx.geometry.VPos; @@ -50,7 +50,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; @FxmlView public class FiatAccountsView extends ActivatableViewAndModel { diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java b/gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java rename to gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java index 1f403e8438..d9e7938b9f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java @@ -15,12 +15,12 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.account.content.fiataccounts; +package io.bisq.gui.main.account.content.fiataccounts; import com.google.inject.Inject; -import io.bitsquare.gui.common.model.ActivatableWithDataModel; -import io.bitsquare.gui.common.model.ViewModel; -import io.bitsquare.payment.PaymentAccount; +import io.bisq.gui.common.model.ActivatableWithDataModel; +import io.bisq.gui.common.model.ViewModel; +import io.bisq.payment.PaymentAccount; import javafx.collections.ObservableList; class FiatAccountsViewModel extends ActivatableWithDataModel implements ViewModel { diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml b/gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml rename to gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.fxml index eb4d7ac1cc..d62e52e918 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.fxml @@ -18,7 +18,7 @@ --> -. */ -package io.bitsquare.gui.main.account.content.password; +package io.bisq.gui.main.account.content.password; -import io.bitsquare.btc.wallet.WalletsManager; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.crypto.ScryptUtil; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.BusyAnimation; -import io.bitsquare.gui.components.PasswordTextField; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.gui.util.validation.InputValidator; -import io.bitsquare.gui.util.validation.PasswordValidator; -import io.bitsquare.locale.Res; +import io.bisq.btc.wallet.WalletsManager; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Tuple3; +import io.bisq.crypto.ScryptUtil; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.BusyAnimation; +import io.bisq.gui.components.PasswordTextField; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.FormBuilder; +import io.bisq.gui.util.Layout; +import io.bisq.gui.util.validation.InputValidator; +import io.bisq.gui.util.validation.PasswordValidator; +import io.bisq.locale.Res; import javafx.beans.value.ChangeListener; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -40,7 +41,6 @@ import org.bitcoinj.crypto.KeyCrypterScrypt; import javax.inject.Inject; import static com.google.inject.internal.util.$Preconditions.checkArgument; -import static io.bitsquare.gui.util.FormBuilder.*; @FxmlView public class PasswordView extends ActivatableView { @@ -70,18 +70,18 @@ public class PasswordView extends ActivatableView { @Override public void initialize() { - headline = addTitledGroupBg(root, gridRow, 2, ""); - passwordField = addLabelPasswordTextField(root, gridRow, Res.get("password.enterPassword"), Layout.FIRST_ROW_DISTANCE).second; + headline = FormBuilder.addTitledGroupBg(root, gridRow, 2, ""); + passwordField = FormBuilder.addLabelPasswordTextField(root, gridRow, Res.get("password.enterPassword"), Layout.FIRST_ROW_DISTANCE).second; passwordField.setValidator(passwordValidator); passwordFieldChangeListener = (observable, oldValue, newValue) -> validatePasswords(); - Tuple2 tuple2 = addLabelPasswordTextField(root, ++gridRow, Res.get("password.confirmPassword")); + Tuple2 tuple2 = FormBuilder.addLabelPasswordTextField(root, ++gridRow, Res.get("password.confirmPassword")); repeatedPasswordLabel = tuple2.first; repeatedPasswordField = tuple2.second; repeatedPasswordField.setValidator(passwordValidator); repeatedPasswordFieldChangeListener = (observable, oldValue, newValue) -> validatePasswords(); - Tuple3 tuple = addButtonBusyAnimationLabel(root, ++gridRow, "", 15); + Tuple3 tuple = FormBuilder.addButtonBusyAnimationLabel(root, ++gridRow, "", 15); pwButton = tuple.first; BusyAnimation busyAnimation = tuple.second; Label deriveStatusLabel = tuple.third; @@ -131,8 +131,8 @@ public class PasswordView extends ActivatableView { }); }); - addTitledGroupBg(root, ++gridRow, 1, Res.get("shared.information"), Layout.GROUP_DISTANCE); - addMultilineLabel(root, gridRow, Res.get("account.password.info"), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + FormBuilder.addTitledGroupBg(root, ++gridRow, 1, Res.get("shared.information"), Layout.GROUP_DISTANCE); + FormBuilder.addMultilineLabel(root, gridRow, Res.get("account.password.info"), Layout.FIRST_ROW_AND_GROUP_DISTANCE); } diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml b/gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml rename to gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.fxml index 283b8b5679..04953141aa 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.fxml @@ -18,7 +18,7 @@ --> -. */ -package io.bitsquare.gui.main.account.content.seedwords; +package io.bisq.gui.main.account.content.seedwords; import com.google.common.base.Joiner; import com.google.common.base.Splitter; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.btc.wallet.WalletsManager; -import io.bitsquare.common.UserThread; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.WalletPasswordWindow; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.btc.wallet.WalletsManager; +import io.bisq.common.UserThread; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.WalletPasswordWindow; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ChangeListener; @@ -48,7 +48,7 @@ import java.time.ZoneId; import java.time.ZoneOffset; import java.util.List; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; import static javafx.beans.binding.Bindings.createBooleanBinding; @FxmlView diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml b/gui/src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml rename to gui/src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.fxml index b1c3953f54..2c7b013c7e 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.fxml @@ -21,7 +21,7 @@ + fx:controller="io.bisq.gui.main.account.settings.AccountSettingsView"> . */ -package io.bitsquare.gui.main.account.settings; +package io.bisq.gui.main.account.settings; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.account.AccountView; -import io.bitsquare.gui.main.account.content.altcoinaccounts.AltCoinAccountsView; -import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView; -import io.bitsquare.gui.main.account.content.backup.BackupView; -import io.bitsquare.gui.main.account.content.fiataccounts.FiatAccountsView; -import io.bitsquare.gui.main.account.content.password.PasswordView; -import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView; -import io.bitsquare.gui.util.Colors; -import io.bitsquare.locale.Res; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.account.AccountView; +import io.bisq.gui.main.account.content.altcoinaccounts.AltCoinAccountsView; +import io.bisq.gui.main.account.content.arbitratorselection.ArbitratorSelectionView; +import io.bisq.gui.main.account.content.backup.BackupView; +import io.bisq.gui.main.account.content.fiataccounts.FiatAccountsView; +import io.bisq.gui.main.account.content.password.PasswordView; +import io.bisq.gui.main.account.content.seedwords.SeedWordsView; +import io.bisq.gui.util.Colors; +import io.bisq.locale.Res; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.geometry.Insets; @@ -84,7 +84,7 @@ public class AccountSettingsView extends ActivatableViewAndModel { password = new MenuItem(navigation, toggleGroup, Res.get("account.menu.password"), PasswordView.class, AwesomeIcon.UNLOCK_ALT); seedWords = new MenuItem(navigation, toggleGroup, Res.get("account.menu.seedWords"), SeedWordsView.class, AwesomeIcon.KEY); backup = new MenuItem(navigation, toggleGroup, Res.get("account.menu.backup"), BackupView.class, AwesomeIcon.CLOUD_DOWNLOAD); - + leftVBox.getChildren().addAll(paymentAccount, altCoinsAccountView, arbitratorSelection, password, seedWords, backup); } diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/DaoView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/DaoView.fxml index 3eb33ed98e..e1c8e8ea84 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/DaoView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java b/gui/src/main/java/io/bisq/gui/main/dao/DaoView.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java rename to gui/src/main/java/io/bisq/gui/main/dao/DaoView.java index ee35cceb52..dea216641d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java +++ b/gui/src/main/java/io/bisq/gui/main/dao/DaoView.java @@ -15,19 +15,19 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.dao; +package io.bisq.gui.main.dao; -import io.bitsquare.btc.wallet.BsqWalletService; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.Activatable; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.dao.compensation.CompensationView; -import io.bitsquare.gui.main.dao.voting.VotingView; -import io.bitsquare.gui.main.dao.wallet.BsqWalletView; -import io.bitsquare.gui.main.dao.wallet.dashboard.BsqDashboardView; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; +import io.bisq.btc.wallet.BsqWalletService; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.Activatable; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.dao.compensation.CompensationView; +import io.bisq.gui.main.dao.voting.VotingView; +import io.bisq.gui.main.dao.wallet.BsqWalletView; +import io.bisq.gui.main.dao.wallet.dashboard.BsqDashboardView; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.scene.control.Tab; @@ -65,7 +65,7 @@ public class DaoView extends ActivatableViewAndModel { bsqWalletTab.setText(Res.get("dao.tab.bsqWallet")); compensationTab.setText(Res.get("dao.tab.compensation")); votingTab.setText(Res.get("dao.tab.voting")); - + navigationListener = viewPath -> { if (viewPath.size() == 3 && viewPath.indexOf(DaoView.class) == 1) { if (compensationTab == null && viewPath.get(2).equals(CompensationView.class)) diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/CompensationRequestDisplay.java b/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestDisplay.java similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/dao/compensation/CompensationRequestDisplay.java rename to gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestDisplay.java index 00b17793cc..046df90826 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/CompensationRequestDisplay.java +++ b/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestDisplay.java @@ -15,20 +15,20 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.dao.compensation; +package io.bisq.gui.main.dao.compensation; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.dao.compensation.payload.CompensationRequestPayload; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.dao.compensation.payload.CompensationRequestPayload; import javafx.scene.layout.GridPane; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Random; -import static io.bitsquare.gui.util.FormBuilder.addLabelInputTextField; -import static io.bitsquare.gui.util.FormBuilder.addTitledGroupBg; +import static io.bisq.gui.util.FormBuilder.addLabelInputTextField; +import static io.bisq.gui.util.FormBuilder.addTitledGroupBg; public class CompensationRequestDisplay { private static final Logger log = LoggerFactory.getLogger(CompensationRequestDisplay.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/CompensationView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/dao/compensation/CompensationView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.fxml index 9f5ed54e54..912aa008fa 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/CompensationView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.fxml @@ -19,7 +19,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/CompensationView.java b/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/dao/compensation/CompensationView.java rename to gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.java index 531dc6d0c0..f256db1425 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/CompensationView.java +++ b/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.java @@ -15,19 +15,19 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.dao.compensation; +package io.bisq.gui.main.dao.compensation; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.dao.DaoView; -import io.bitsquare.gui.main.dao.compensation.active.ActiveCompensationRequestView; -import io.bitsquare.gui.main.dao.compensation.create.CreateCompensationRequestView; -import io.bitsquare.gui.main.dao.compensation.past.PastCompensationRequestView; -import io.bitsquare.gui.util.Colors; -import io.bitsquare.locale.Res; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.dao.DaoView; +import io.bisq.gui.main.dao.compensation.active.ActiveCompensationRequestView; +import io.bisq.gui.main.dao.compensation.create.CreateCompensationRequestView; +import io.bisq.gui.main.dao.compensation.past.PastCompensationRequestView; +import io.bisq.gui.util.Colors; +import io.bisq.locale.Res; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.geometry.Insets; diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml index 6099f2dd86..a4a8f5676d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml @@ -20,7 +20,7 @@ -. */ -package io.bitsquare.gui.main.dao.compensation.active; +package io.bisq.gui.main.dao.compensation.active; import com.google.common.util.concurrent.FutureCallback; -import io.bitsquare.common.UserThread; -import io.bitsquare.dao.compensation.CompensationRequest; -import io.bitsquare.dao.compensation.CompensationRequestManager; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.components.TableGroupHeadline; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.dao.DaoView; -import io.bitsquare.gui.main.dao.compensation.CompensationRequestDisplay; -import io.bitsquare.gui.main.dao.voting.VotingView; -import io.bitsquare.gui.main.dao.voting.vote.VoteView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; +import io.bisq.common.UserThread; +import io.bisq.dao.compensation.CompensationRequest; +import io.bisq.dao.compensation.CompensationRequestManager; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.components.TableGroupHeadline; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.dao.DaoView; +import io.bisq.gui.main.dao.compensation.CompensationRequestDisplay; +import io.bisq.gui.main.dao.voting.VotingView; +import io.bisq.gui.main.dao.voting.vote.VoteView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.transformation.SortedList; import javafx.geometry.HPos; @@ -54,8 +54,8 @@ import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import static com.google.common.base.Preconditions.checkArgument; -import static io.bitsquare.gui.util.FormBuilder.addButtonAfterGroup; -import static io.bitsquare.gui.util.FormBuilder.addLabel; +import static io.bisq.gui.util.FormBuilder.addButtonAfterGroup; +import static io.bisq.gui.util.FormBuilder.addLabel; @FxmlView public class ActiveCompensationRequestView extends ActivatableView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/active/FundCompensationRequestWindow.java b/gui/src/main/java/io/bisq/gui/main/dao/compensation/active/FundCompensationRequestWindow.java similarity index 88% rename from gui/src/main/java/io/bitsquare/gui/main/dao/compensation/active/FundCompensationRequestWindow.java rename to gui/src/main/java/io/bisq/gui/main/dao/compensation/active/FundCompensationRequestWindow.java index 18c6b2115f..ce30137cb6 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/active/FundCompensationRequestWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/dao/compensation/active/FundCompensationRequestWindow.java @@ -15,12 +15,12 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.dao.compensation.active; +package io.bisq.gui.main.dao.compensation.active; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.dao.compensation.payload.CompensationRequestPayload; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.locale.Res; +import io.bisq.messages.dao.compensation.payload.CompensationRequestPayload; import javafx.scene.Scene; import javafx.scene.control.TextField; import javafx.scene.input.KeyCode; @@ -29,8 +29,8 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import static io.bitsquare.gui.util.FormBuilder.addLabelInputTextField; -import static io.bitsquare.gui.util.FormBuilder.addLabelTextField; +import static io.bisq.gui.util.FormBuilder.addLabelInputTextField; +import static io.bisq.gui.util.FormBuilder.addLabelTextField; public class FundCompensationRequestWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(FundCompensationRequestWindow.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml index 16096c0f51..4dfc1fb3ed 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml @@ -18,7 +18,7 @@ --> -. */ -package io.bitsquare.gui.main.dao.compensation.create; +package io.bisq.gui.main.dao.compensation.create; import com.google.common.util.concurrent.FutureCallback; -import io.bitsquare.app.Version; -import io.bitsquare.btc.InsufficientFundsException; -import io.bitsquare.btc.exceptions.TransactionVerificationException; -import io.bitsquare.btc.exceptions.WalletException; -import io.bitsquare.btc.wallet.BsqWalletService; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.btc.wallet.ChangeBelowDustException; -import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.dao.compensation.CompensationRequestManager; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.main.dao.compensation.CompensationRequestDisplay; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.btc.provider.fee.FeeService; -import io.bitsquare.messages.dao.compensation.payload.CompensationRequestPayload; -import io.bitsquare.p2p.NodeAddress; -import io.bitsquare.p2p.P2PService; +import io.bisq.app.Version; +import io.bisq.btc.InsufficientFundsException; +import io.bisq.btc.exceptions.TransactionVerificationException; +import io.bisq.btc.exceptions.WalletException; +import io.bisq.btc.wallet.BsqWalletService; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.btc.wallet.ChangeBelowDustException; +import io.bisq.common.crypto.KeyRing; +import io.bisq.common.util.Utilities; +import io.bisq.dao.compensation.CompensationRequestManager; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.main.dao.compensation.CompensationRequestDisplay; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; +import io.bisq.messages.btc.provider.fee.FeeService; +import io.bisq.messages.dao.compensation.payload.CompensationRequestPayload; +import io.bisq.p2p.NodeAddress; +import io.bisq.p2p.P2PService; import javafx.scene.control.Button; import javafx.scene.layout.GridPane; import org.apache.commons.lang3.StringUtils; @@ -55,7 +55,7 @@ import java.util.UUID; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static io.bitsquare.gui.util.FormBuilder.addButtonAfterGroup; +import static io.bisq.gui.util.FormBuilder.addButtonAfterGroup; @FxmlView public class CreateCompensationRequestView extends ActivatableView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/past/PastCompensationRequestView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.fxml similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/dao/compensation/past/PastCompensationRequestView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.fxml index c8ccbfccb4..07710a477f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/compensation/past/PastCompensationRequestView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.fxml @@ -19,7 +19,7 @@ -. */ -package io.bitsquare.gui.main.dao.compensation.past; +package io.bisq.gui.main.dao.compensation.past; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; import javafx.scene.layout.GridPane; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/VotingView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/voting/VotingView.fxml similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/dao/voting/VotingView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/voting/VotingView.fxml index e8e463c72a..6b5f4f4c5c 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/VotingView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/voting/VotingView.fxml @@ -19,7 +19,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/VotingView.java b/gui/src/main/java/io/bisq/gui/main/dao/voting/VotingView.java similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/dao/voting/VotingView.java rename to gui/src/main/java/io/bisq/gui/main/dao/voting/VotingView.java index 7580a9efb5..decffec5e3 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/VotingView.java +++ b/gui/src/main/java/io/bisq/gui/main/dao/voting/VotingView.java @@ -15,19 +15,19 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.dao.voting; +package io.bisq.gui.main.dao.voting; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.dao.DaoView; -import io.bitsquare.gui.main.dao.voting.dashboard.VotingDashboardView; -import io.bitsquare.gui.main.dao.voting.history.VotingHistoryView; -import io.bitsquare.gui.main.dao.voting.vote.VoteView; -import io.bitsquare.gui.util.Colors; -import io.bitsquare.locale.Res; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.dao.DaoView; +import io.bisq.gui.main.dao.voting.dashboard.VotingDashboardView; +import io.bisq.gui.main.dao.voting.history.VotingHistoryView; +import io.bisq.gui.main.dao.voting.vote.VoteView; +import io.bisq.gui.util.Colors; +import io.bisq.locale.Res; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.geometry.Insets; diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/dashboard/VotingDashboardView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/dao/voting/dashboard/VotingDashboardView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml index 37aa5958e0..8cd776e908 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/dashboard/VotingDashboardView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml @@ -18,7 +18,7 @@ --> -. */ -package io.bitsquare.gui.main.dao.voting.dashboard; +package io.bisq.gui.main.dao.voting.dashboard; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; import javafx.scene.layout.GridPane; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/history/VotingHistoryView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/dao/voting/history/VotingHistoryView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.fxml index 20e4dd1b4f..ff3972aaea 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/history/VotingHistoryView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.fxml @@ -19,7 +19,7 @@ -. */ -package io.bitsquare.gui.main.dao.voting.history; +package io.bisq.gui.main.dao.voting.history; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; import javafx.scene.layout.GridPane; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/CompensationViewItem.java b/gui/src/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/CompensationViewItem.java rename to gui/src/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java index 8bf88a2de8..8cab4a8820 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/CompensationViewItem.java +++ b/gui/src/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java @@ -15,17 +15,17 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.dao.voting.vote; +package io.bisq.gui.main.dao.voting.vote; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.dao.compensation.CompensationRequest; -import io.bitsquare.dao.vote.CompensationRequestVoteItem; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.dao.compensation.CompensationRequestDisplay; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.dao.compensation.payload.CompensationRequestPayload; +import io.bisq.dao.compensation.CompensationRequest; +import io.bisq.dao.vote.CompensationRequestVoteItem; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.dao.compensation.CompensationRequestDisplay; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.dao.compensation.payload.CompensationRequestPayload; import javafx.beans.property.DoubleProperty; import javafx.geometry.HPos; import javafx.geometry.Insets; @@ -115,8 +115,8 @@ public class CompensationViewItem { Scene scene = new Scene(anchorPane); scene.getStylesheets().setAll( - "/io/bitsquare/gui/bitsquare.css", - "/io/bitsquare/gui/images.css"); + "/io/bisq/gui/bitsquare.css", + "/io/bisq/gui/images.css"); Stage stage = new Stage(); stage.setTitle(Res.get("dao.voting.item.stage.title", compensationRequestPayload.getShortId())); stage.setScene(scene); diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/ParameterViewItem.java b/gui/src/main/java/io/bisq/gui/main/dao/voting/vote/ParameterViewItem.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/ParameterViewItem.java rename to gui/src/main/java/io/bisq/gui/main/dao/voting/vote/ParameterViewItem.java index 256aa3a4d8..780614c8de 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/ParameterViewItem.java +++ b/gui/src/main/java/io/bisq/gui/main/dao/voting/vote/ParameterViewItem.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.dao.voting.vote; +package io.bisq.gui.main.dao.voting.vote; -import io.bitsquare.common.UserThread; -import io.bitsquare.dao.vote.VoteItem; -import io.bitsquare.dao.vote.VotingDefaultValues; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.locale.Res; +import io.bisq.common.UserThread; +import io.bisq.dao.vote.VoteItem; +import io.bisq.dao.vote.VotingDefaultValues; +import io.bisq.gui.components.InputTextField; +import io.bisq.locale.Res; import javafx.beans.property.DoubleProperty; import javafx.beans.value.ChangeListener; import javafx.geometry.Insets; diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/VoteView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.fxml similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/VoteView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.fxml index c09e5f18f3..f660bc6dc0 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/VoteView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.fxml @@ -19,7 +19,7 @@ -. */ -package io.bitsquare.gui.main.dao.voting.vote; +package io.bisq.gui.main.dao.voting.vote; import com.google.common.util.concurrent.FutureCallback; -import io.bitsquare.btc.InsufficientFundsException; -import io.bitsquare.btc.exceptions.TransactionVerificationException; -import io.bitsquare.btc.exceptions.WalletException; -import io.bitsquare.btc.wallet.BsqWalletService; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.btc.wallet.ChangeBelowDustException; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.dao.compensation.CompensationRequest; -import io.bitsquare.dao.compensation.CompensationRequestManager; -import io.bitsquare.dao.vote.*; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.BsqFormatter; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.btc.provider.fee.FeeService; +import io.bisq.btc.InsufficientFundsException; +import io.bisq.btc.exceptions.TransactionVerificationException; +import io.bisq.btc.exceptions.WalletException; +import io.bisq.btc.wallet.BsqWalletService; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.btc.wallet.ChangeBelowDustException; +import io.bisq.common.UserThread; +import io.bisq.common.util.Utilities; +import io.bisq.dao.compensation.CompensationRequest; +import io.bisq.dao.compensation.CompensationRequestManager; +import io.bisq.dao.vote.*; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.BsqFormatter; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.btc.provider.fee.FeeService; import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.value.ChangeListener; @@ -61,7 +61,7 @@ import java.io.IOException; import java.util.List; import static com.google.common.base.Preconditions.checkNotNull; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; import static javafx.beans.binding.Bindings.createBooleanBinding; @FxmlView diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/BalanceUtil.java b/gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/dao/wallet/BalanceUtil.java rename to gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java index 5dfc3e6ef8..e03cbda229 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/BalanceUtil.java +++ b/gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.dao.wallet; +package io.bisq.gui.main.dao.wallet; -import io.bitsquare.btc.wallet.BsqWalletService; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BsqFormatter; +import io.bisq.btc.wallet.BsqWalletService; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BsqFormatter; import javafx.scene.control.TextField; import org.bitcoinj.core.*; import org.bitcoinj.script.Script; diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/BsqWalletView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.fxml similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/dao/wallet/BsqWalletView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.fxml index 88dc98c049..6a36168960 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/BsqWalletView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.fxml @@ -19,7 +19,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/BsqWalletView.java b/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/dao/wallet/BsqWalletView.java rename to gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java index 65a52de917..34e064cd6b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/BsqWalletView.java +++ b/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java @@ -15,20 +15,20 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.dao.wallet; +package io.bisq.gui.main.dao.wallet; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.dao.DaoView; -import io.bitsquare.gui.main.dao.wallet.dashboard.BsqDashboardView; -import io.bitsquare.gui.main.dao.wallet.receive.BsqReceiveView; -import io.bitsquare.gui.main.dao.wallet.send.BsqSendView; -import io.bitsquare.gui.main.dao.wallet.tx.BsqTransactionsView; -import io.bitsquare.gui.util.Colors; -import io.bitsquare.locale.Res; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.dao.DaoView; +import io.bisq.gui.main.dao.wallet.dashboard.BsqDashboardView; +import io.bisq.gui.main.dao.wallet.receive.BsqReceiveView; +import io.bisq.gui.main.dao.wallet.send.BsqSendView; +import io.bisq.gui.main.dao.wallet.tx.BsqTransactionsView; +import io.bisq.gui.util.Colors; +import io.bisq.locale.Res; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.geometry.Insets; diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml index 38001e9e64..59ee8c0a64 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml @@ -18,7 +18,7 @@ --> -. */ -package io.bitsquare.gui.main.dao.wallet.dashboard; +package io.bisq.gui.main.dao.wallet.dashboard; -import io.bitsquare.btc.wallet.BsqWalletService; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.main.dao.wallet.BalanceUtil; -import io.bitsquare.gui.util.BsqFormatter; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; +import io.bisq.btc.wallet.BsqWalletService; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.main.dao.wallet.BalanceUtil; +import io.bisq.gui.util.BsqFormatter; +import io.bisq.gui.util.FormBuilder; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; import javax.inject.Inject; -import static io.bitsquare.gui.util.FormBuilder.addLabelTextField; -import static io.bitsquare.gui.util.FormBuilder.addTitledGroupBg; - @FxmlView public class BsqDashboardView extends ActivatableView { @@ -57,8 +55,8 @@ public class BsqDashboardView extends ActivatableView { @Override public void initialize() { - addTitledGroupBg(root, gridRow, 1, Res.get("shared.balance")); - balanceTextField = addLabelTextField(root, gridRow, Res.get("shared.bsqBalance"), Layout.FIRST_ROW_DISTANCE).second; + FormBuilder.addTitledGroupBg(root, gridRow, 1, Res.get("shared.balance")); + balanceTextField = FormBuilder.addLabelTextField(root, gridRow, Res.get("shared.bsqBalance"), Layout.FIRST_ROW_DISTANCE).second; balanceUtil.setBalanceTextField(balanceTextField); balanceUtil.initialize(); } diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/receive/BsqReceiveView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/dao/wallet/receive/BsqReceiveView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.fxml index 14cbef9fe4..8fe9a16012 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/receive/BsqReceiveView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.fxml @@ -19,7 +19,7 @@ -. */ -package io.bitsquare.gui.main.dao.wallet.receive; +package io.bisq.gui.main.dao.wallet.receive; -import io.bitsquare.app.DevEnv; -import io.bitsquare.btc.wallet.BsqWalletService; -import io.bitsquare.common.UserThread; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.AddressTextField; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.dao.wallet.BalanceUtil; -import io.bitsquare.gui.main.overlays.windows.QRCodeWindow; -import io.bitsquare.gui.util.BsqFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; +import io.bisq.app.DevEnv; +import io.bisq.btc.wallet.BsqWalletService; +import io.bisq.common.UserThread; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.AddressTextField; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.dao.wallet.BalanceUtil; +import io.bisq.gui.main.overlays.windows.QRCodeWindow; +import io.bisq.gui.util.BsqFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; import javafx.geometry.Insets; import javafx.scene.control.TextField; import javafx.scene.control.Tooltip; @@ -47,7 +47,7 @@ import javax.inject.Inject; import java.io.ByteArrayInputStream; import java.util.concurrent.TimeUnit; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; @FxmlView public class BsqReceiveView extends ActivatableView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.fxml similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.fxml index 8087391886..8f563b5b3d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.fxml @@ -19,7 +19,7 @@ -. */ -package io.bitsquare.gui.main.dao.wallet.send; +package io.bisq.gui.main.dao.wallet.send; import com.google.common.util.concurrent.FutureCallback; -import io.bitsquare.app.DevEnv; -import io.bitsquare.btc.InsufficientFundsException; -import io.bitsquare.btc.exceptions.TransactionVerificationException; -import io.bitsquare.btc.exceptions.WalletException; -import io.bitsquare.btc.wallet.BsqWalletService; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.dao.wallet.BalanceUtil; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.BsqFormatter; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.btc.provider.fee.FeeService; +import io.bisq.app.DevEnv; +import io.bisq.btc.InsufficientFundsException; +import io.bisq.btc.exceptions.TransactionVerificationException; +import io.bisq.btc.exceptions.WalletException; +import io.bisq.btc.wallet.BsqWalletService; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.common.util.Utilities; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.dao.wallet.BalanceUtil; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.BsqFormatter; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.btc.provider.fee.FeeService; import javafx.scene.control.Button; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; @@ -47,7 +47,7 @@ import org.jetbrains.annotations.NotNull; import javax.annotation.Nullable; import javax.inject.Inject; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; @FxmlView public class BsqSendView extends ActivatableView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/tx/BsqTransactionsView.fxml b/gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTransactionsView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/dao/wallet/tx/BsqTransactionsView.fxml rename to gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTransactionsView.fxml index 45e857c6f6..a5e9d3b29b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/dao/wallet/tx/BsqTransactionsView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTransactionsView.fxml @@ -18,7 +18,7 @@ --> -. */ -package io.bitsquare.gui.main.dao.wallet.tx; +package io.bisq.gui.main.dao.wallet.tx; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; import javafx.scene.layout.GridPane; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml b/gui/src/main/java/io/bisq/gui/main/debug/DebugView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml rename to gui/src/main/java/io/bisq/gui/main/debug/DebugView.fxml index c0ef7a7d42..0bcf21e330 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/debug/DebugView.fxml @@ -17,12 +17,12 @@ ~ along with bisq. If not, see . --> - + -. */ -package io.bitsquare.gui.main.debug; +package io.bisq.gui.main.debug; -import io.bitsquare.common.taskrunner.Task; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.common.view.InitializableView; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.messages.protocol.availability.OfferAvailabilityProtocol; -import io.bitsquare.messages.protocol.availability.tasks.ProcessOfferAvailabilityResponse; -import io.bitsquare.messages.protocol.availability.tasks.SendOfferAvailabilityRequest; -import io.bitsquare.trade.protocol.placeoffer.PlaceOfferProtocol; -import io.bitsquare.trade.protocol.placeoffer.tasks.AddOfferToRemoteOfferBook; -import io.bitsquare.trade.protocol.placeoffer.tasks.BroadcastCreateOfferFeeTx; -import io.bitsquare.trade.protocol.placeoffer.tasks.CreateOfferFeeTx; -import io.bitsquare.trade.protocol.placeoffer.tasks.ValidateOffer; -import io.bitsquare.trade.protocol.trade.BuyerAsOffererProtocol; -import io.bitsquare.trade.protocol.trade.BuyerAsTakerProtocol; -import io.bitsquare.trade.protocol.trade.SellerAsOffererProtocol; -import io.bitsquare.trade.protocol.trade.SellerAsTakerProtocol; -import io.bitsquare.trade.protocol.trade.tasks.buyer.*; -import io.bitsquare.trade.protocol.trade.tasks.offerer.*; -import io.bitsquare.trade.protocol.trade.tasks.seller.*; -import io.bitsquare.trade.protocol.trade.tasks.shared.BroadcastAfterLockTime; -import io.bitsquare.trade.protocol.trade.tasks.taker.*; +import io.bisq.common.taskrunner.Task; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.common.view.InitializableView; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.messages.protocol.availability.OfferAvailabilityProtocol; +import io.bisq.messages.protocol.availability.tasks.ProcessOfferAvailabilityResponse; +import io.bisq.messages.protocol.availability.tasks.SendOfferAvailabilityRequest; +import io.bisq.trade.protocol.placeoffer.PlaceOfferProtocol; +import io.bisq.trade.protocol.placeoffer.tasks.AddOfferToRemoteOfferBook; +import io.bisq.trade.protocol.placeoffer.tasks.BroadcastCreateOfferFeeTx; +import io.bisq.trade.protocol.placeoffer.tasks.CreateOfferFeeTx; +import io.bisq.trade.protocol.placeoffer.tasks.ValidateOffer; +import io.bisq.trade.protocol.trade.BuyerAsOffererProtocol; +import io.bisq.trade.protocol.trade.BuyerAsTakerProtocol; +import io.bisq.trade.protocol.trade.SellerAsOffererProtocol; +import io.bisq.trade.protocol.trade.SellerAsTakerProtocol; +import io.bisq.trade.protocol.trade.tasks.buyer.*; +import io.bisq.trade.protocol.trade.tasks.offerer.*; +import io.bisq.trade.protocol.trade.tasks.seller.*; +import io.bisq.trade.protocol.trade.tasks.shared.BroadcastAfterLockTime; +import io.bisq.trade.protocol.trade.tasks.taker.*; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.fxml b/gui/src/main/java/io/bisq/gui/main/disputes/DisputesView.fxml similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.fxml rename to gui/src/main/java/io/bisq/gui/main/disputes/DisputesView.fxml index e6b2c9cb7a..7c25f8d18b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/disputes/DisputesView.fxml @@ -21,7 +21,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.java b/gui/src/main/java/io/bisq/gui/main/disputes/DisputesView.java similarity index 87% rename from gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.java rename to gui/src/main/java/io/bisq/gui/main/disputes/DisputesView.java index 6dbbff4337..4550ab0269 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.java +++ b/gui/src/main/java/io/bisq/gui/main/disputes/DisputesView.java @@ -15,25 +15,25 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.disputes; +package io.bisq.gui.main.disputes; -import io.bitsquare.app.DevEnv; -import io.bitsquare.arbitration.ArbitratorManager; -import io.bitsquare.arbitration.DisputeManager; -import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.Activatable; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.disputes.arbitrator.ArbitratorDisputeView; -import io.bitsquare.gui.main.disputes.trader.TraderDisputeView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.portfolio.PortfolioView; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.arbitration.Arbitrator; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.p2p.NodeAddress; +import io.bisq.app.DevEnv; +import io.bisq.arbitration.ArbitratorManager; +import io.bisq.arbitration.DisputeManager; +import io.bisq.common.crypto.KeyRing; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.Activatable; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.disputes.arbitrator.ArbitratorDisputeView; +import io.bisq.gui.main.disputes.trader.TraderDisputeView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.portfolio.PortfolioView; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesView; +import io.bisq.locale.Res; +import io.bisq.messages.arbitration.Arbitrator; +import io.bisq.messages.user.Preferences; +import io.bisq.p2p.NodeAddress; import javafx.beans.value.ChangeListener; import javafx.collections.MapChangeListener; import javafx.fxml.FXML; diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml b/gui/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml rename to gui/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml index 7f52a994dd..22f9315ab7 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java b/gui/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java similarity index 80% rename from gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java rename to gui/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java index b4b6eb4832..903522d60d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java +++ b/gui/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java @@ -15,19 +15,19 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.disputes.arbitrator; +package io.bisq.gui.main.disputes.arbitrator; -import io.bitsquare.alert.PrivateNotificationManager; -import io.bitsquare.arbitration.DisputeManager; -import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.main.disputes.trader.TraderDisputeView; -import io.bitsquare.gui.main.overlays.windows.ContractWindow; -import io.bitsquare.gui.main.overlays.windows.DisputeSummaryWindow; -import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.trade.TradeManager; +import io.bisq.alert.PrivateNotificationManager; +import io.bisq.arbitration.DisputeManager; +import io.bisq.common.crypto.KeyRing; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.main.disputes.trader.TraderDisputeView; +import io.bisq.gui.main.overlays.windows.ContractWindow; +import io.bisq.gui.main.overlays.windows.DisputeSummaryWindow; +import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; +import io.bisq.gui.util.BSFormatter; +import io.bisq.p2p.P2PService; +import io.bisq.trade.TradeManager; import javafx.stage.Stage; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.fxml b/gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.fxml similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.fxml rename to gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.fxml index cc38361eab..be8c945282 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java b/gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java rename to gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java index f02edbebd5..6d50874566 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java +++ b/gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java @@ -15,44 +15,44 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.disputes.trader; +package io.bisq.gui.main.disputes.trader; import com.google.common.collect.Lists; import com.google.common.io.ByteStreams; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.alert.PrivateNotificationManager; -import io.bitsquare.app.Version; -import io.bitsquare.arbitration.DisputeManager; -import io.bitsquare.common.Timer; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.common.crypto.PubKeyRing; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.BusyAnimation; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.components.TableGroupHeadline; -import io.bitsquare.gui.main.disputes.arbitrator.ArbitratorDisputeView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.ContractWindow; -import io.bitsquare.gui.main.overlays.windows.DisputeSummaryWindow; -import io.bitsquare.gui.main.overlays.windows.SendPrivateNotificationWindow; -import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.arbitration.Dispute; -import io.bitsquare.messages.arbitration.DisputeCommunicationMessage; -import io.bitsquare.messages.arbitration.payload.Attachment; -import io.bitsquare.messages.trade.payload.Contract; -import io.bitsquare.p2p.NodeAddress; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.p2p.network.Connection; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.TradeManager; +import io.bisq.alert.PrivateNotificationManager; +import io.bisq.app.Version; +import io.bisq.arbitration.DisputeManager; +import io.bisq.common.Timer; +import io.bisq.common.UserThread; +import io.bisq.common.crypto.KeyRing; +import io.bisq.common.crypto.PubKeyRing; +import io.bisq.common.util.Utilities; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.BusyAnimation; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.components.TableGroupHeadline; +import io.bisq.gui.main.disputes.arbitrator.ArbitratorDisputeView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.ContractWindow; +import io.bisq.gui.main.overlays.windows.DisputeSummaryWindow; +import io.bisq.gui.main.overlays.windows.SendPrivateNotificationWindow; +import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.locale.Res; +import io.bisq.messages.arbitration.Dispute; +import io.bisq.messages.arbitration.DisputeCommunicationMessage; +import io.bisq.messages.arbitration.payload.Attachment; +import io.bisq.messages.trade.payload.Contract; +import io.bisq.p2p.NodeAddress; +import io.bisq.p2p.P2PService; +import io.bisq.p2p.network.Connection; +import io.bisq.trade.Trade; +import io.bisq.trade.TradeManager; import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.value.ChangeListener; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml b/gui/src/main/java/io/bisq/gui/main/funds/FundsView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml rename to gui/src/main/java/io/bisq/gui/main/funds/FundsView.fxml index d26cd28a7d..46fc1fa897 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/funds/FundsView.fxml @@ -18,7 +18,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/gui/src/main/java/io/bisq/gui/main/funds/FundsView.java similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java rename to gui/src/main/java/io/bisq/gui/main/funds/FundsView.java index 3522f225c7..e7d8752827 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/FundsView.java @@ -15,18 +15,18 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds; +package io.bisq.gui.main.funds; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.Activatable; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.funds.deposit.DepositView; -import io.bitsquare.gui.main.funds.locked.LockedView; -import io.bitsquare.gui.main.funds.reserved.ReservedView; -import io.bitsquare.gui.main.funds.transactions.TransactionsView; -import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView; -import io.bitsquare.locale.Res; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.Activatable; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.funds.deposit.DepositView; +import io.bisq.gui.main.funds.locked.LockedView; +import io.bisq.gui.main.funds.reserved.ReservedView; +import io.bisq.gui.main.funds.transactions.TransactionsView; +import io.bisq.gui.main.funds.withdrawal.WithdrawalView; +import io.bisq.locale.Res; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.scene.control.Tab; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositListItem.java b/gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositListItem.java similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositListItem.java rename to gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositListItem.java index 7b23276201..9abe477124 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositListItem.java @@ -15,16 +15,16 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds.deposit; +package io.bisq.gui.main.funds.deposit; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.listeners.TxConfidenceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.gui.components.indicator.TxConfidenceIndicator; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.locale.Res; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.listeners.TxConfidenceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.gui.components.indicator.TxConfidenceIndicator; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.locale.Res; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.scene.control.Tooltip; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.fxml b/gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.fxml similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.fxml rename to gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.fxml index 8fab573c79..f1e828905c 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.java b/gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.java rename to gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.java index be809cb117..b32673c44e 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.java @@ -15,29 +15,29 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds.deposit; +package io.bisq.gui.main.funds.deposit; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.app.DevEnv; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.AddressTextField; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.QRCodeWindow; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.btc.provider.fee.FeeService; -import io.bitsquare.messages.user.Preferences; +import io.bisq.app.DevEnv; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.AddressTextField; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.QRCodeWindow; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.btc.provider.fee.FeeService; +import io.bisq.messages.user.Preferences; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; @@ -65,7 +65,7 @@ import javax.inject.Inject; import java.io.ByteArrayInputStream; import java.util.concurrent.TimeUnit; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; @FxmlView public class DepositView extends ActivatableView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedListItem.java b/gui/src/main/java/io/bisq/gui/main/funds/locked/LockedListItem.java similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedListItem.java rename to gui/src/main/java/io/bisq/gui/main/funds/locked/LockedListItem.java index 4cd5af4ab2..f61b97acae 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/locked/LockedListItem.java @@ -15,14 +15,14 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds.locked; +package io.bisq.gui.main.funds.locked; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.trade.Tradable; -import io.bitsquare.trade.Trade; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.gui.util.BSFormatter; +import io.bisq.trade.Tradable; +import io.bisq.trade.Trade; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.scene.control.Label; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedView.fxml b/gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedView.fxml rename to gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.fxml index 4120704601..bb4510dcd6 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedView.java b/gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedView.java rename to gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.java index a7cb03bc05..6405462b73 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedView.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.java @@ -15,26 +15,26 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds.locked; +package io.bisq.gui.main.funds.locked; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow; -import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.trade.Tradable; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.TradeManager; -import io.bitsquare.trade.offer.OpenOffer; -import io.bitsquare.trade.offer.OpenOfferManager; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; +import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; +import io.bisq.trade.Tradable; +import io.bisq.trade.Trade; +import io.bisq.trade.TradeManager; +import io.bisq.trade.offer.OpenOffer; +import io.bisq.trade.offer.OpenOfferManager; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java b/gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedListItem.java similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java rename to gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedListItem.java index d3b7c0dba3..18ea93c17a 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedListItem.java @@ -15,14 +15,14 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds.reserved; +package io.bisq.gui.main.funds.reserved; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.trade.Tradable; -import io.bitsquare.trade.offer.OpenOffer; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.gui.util.BSFormatter; +import io.bisq.trade.Tradable; +import io.bisq.trade.offer.OpenOffer; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.scene.control.Label; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml b/gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml rename to gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.fxml index 96153bb6cf..c1b0d794d2 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java b/gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java rename to gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.java index 9a98c93bac..1feaa78f1f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.java @@ -15,26 +15,26 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds.reserved; +package io.bisq.gui.main.funds.reserved; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow; -import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.trade.Tradable; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.TradeManager; -import io.bitsquare.trade.offer.OpenOffer; -import io.bitsquare.trade.offer.OpenOfferManager; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; +import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; +import io.bisq.trade.Tradable; +import io.bisq.trade.Trade; +import io.bisq.trade.TradeManager; +import io.bisq.trade.offer.OpenOffer; +import io.bisq.trade.offer.OpenOfferManager; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java b/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsListItem.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java rename to gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsListItem.java index 7dd76eaa3b..3987b80bb8 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsListItem.java @@ -15,18 +15,18 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds.transactions; +package io.bisq.gui.main.funds.transactions; -import io.bitsquare.btc.listeners.TxConfidenceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.gui.components.indicator.TxConfidenceIndicator; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.trade.Tradable; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.offer.OpenOffer; +import io.bisq.btc.listeners.TxConfidenceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.gui.components.indicator.TxConfidenceIndicator; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.locale.Res; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.trade.Tradable; +import io.bisq.trade.Trade; +import io.bisq.trade.offer.OpenOffer; import javafx.scene.control.Tooltip; import org.bitcoinj.core.*; import org.slf4j.Logger; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml b/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml rename to gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.fxml index 17f1561f20..09613b112d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java rename to gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java index bb94527af6..a9b7a8f55a 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java @@ -15,33 +15,33 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds.transactions; +package io.bisq.gui.main.funds.transactions; import com.googlecode.jcsv.writer.CSVEntryConverter; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.arbitration.DisputeManager; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Tuple4; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.AddressWithIconAndDirection; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow; -import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.trade.Tradable; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.TradeManager; -import io.bitsquare.trade.closed.ClosedTradableManager; -import io.bitsquare.trade.failed.FailedTradesManager; -import io.bitsquare.trade.offer.OpenOffer; -import io.bitsquare.trade.offer.OpenOfferManager; +import io.bisq.arbitration.DisputeManager; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Tuple4; +import io.bisq.common.util.Utilities; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.AddressWithIconAndDirection; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; +import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; +import io.bisq.trade.Tradable; +import io.bisq.trade.Trade; +import io.bisq.trade.TradeManager; +import io.bisq.trade.closed.ClosedTradableManager; +import io.bisq.trade.failed.FailedTradesManager; +import io.bisq.trade.offer.OpenOffer; +import io.bisq.trade.offer.OpenOfferManager; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java b/gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalListItem.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java rename to gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalListItem.java index 8bb623fd66..8f626e2e2a 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalListItem.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds.withdrawal; +package io.bisq.gui.main.funds.withdrawal; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; import javafx.scene.control.Label; import org.bitcoinj.core.Address; import org.bitcoinj.core.Coin; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml b/gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.fxml similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml rename to gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.fxml index 61effccca6..7dd48cafee 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java rename to gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java index 403fb3f488..a195108c0d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java +++ b/gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java @@ -15,34 +15,34 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.funds.withdrawal; +package io.bisq.gui.main.funds.withdrawal; import com.google.common.util.concurrent.FutureCallback; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.app.DevEnv; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.AddressEntryException; -import io.bitsquare.btc.InsufficientFundsException; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.MathUtils; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.WalletPasswordWindow; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.gui.util.validation.BtcAddressValidator; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.btc.provider.fee.FeeService; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.trade.Tradable; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.TradeManager; -import io.bitsquare.trade.closed.ClosedTradableManager; -import io.bitsquare.trade.failed.FailedTradesManager; +import io.bisq.app.DevEnv; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.AddressEntryException; +import io.bisq.btc.InsufficientFundsException; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.common.UserThread; +import io.bisq.common.util.MathUtils; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.WalletPasswordWindow; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.gui.util.validation.BtcAddressValidator; +import io.bisq.locale.Res; +import io.bisq.messages.btc.provider.fee.FeeService; +import io.bisq.messages.user.Preferences; +import io.bisq.trade.Tradable; +import io.bisq.trade.Trade; +import io.bisq.trade.TradeManager; +import io.bisq.trade.closed.ClosedTradableManager; +import io.bisq.trade.failed.FailedTradesManager; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.SimpleObjectProperty; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml b/gui/src/main/java/io/bisq/gui/main/market/MarketView.fxml similarity index 77% rename from gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml rename to gui/src/main/java/io/bisq/gui/main/market/MarketView.fxml index edc4c13c03..e7860391f7 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/market/MarketView.fxml @@ -19,7 +19,7 @@ - @@ -27,16 +27,16 @@ + AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" + AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/> + AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" + AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/> diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java b/gui/src/main/java/io/bisq/gui/main/market/MarketView.java similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java rename to gui/src/main/java/io/bisq/gui/main/market/MarketView.java index 0824dce62a..6466870b42 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java +++ b/gui/src/main/java/io/bisq/gui/main/market/MarketView.java @@ -15,16 +15,16 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.market; +package io.bisq.gui.main.market; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.Activatable; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.market.offerbook.OfferBookChartView; -import io.bitsquare.gui.main.market.spread.SpreadView; -import io.bitsquare.gui.main.market.trades.TradesChartsView; -import io.bitsquare.locale.Res; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.Activatable; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.market.offerbook.OfferBookChartView; +import io.bisq.gui.main.market.spread.SpreadView; +import io.bisq.gui.main.market.trades.TradesChartsView; +import io.bisq.locale.Res; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.scene.control.ScrollPane; @@ -53,7 +53,7 @@ public class MarketView extends ActivatableViewAndModel { offerBookTab.setText(Res.get("market.tabs.offerBook")); spreadTab.setText(Res.get("market.tabs.spread")); tradesTab.setText(Res.get("market.tabs.trades")); - + navigationListener = viewPath -> { if (viewPath.size() == 3 && viewPath.indexOf(MarketView.class) == 1) loadView(viewPath.tip()); diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.fxml b/gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.fxml rename to gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.fxml index 5ce30ec35d..1e2d69cef2 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.fxml @@ -20,7 +20,7 @@ -. */ -package io.bitsquare.gui.main.market.offerbook; +package io.bisq.gui.main.market.offerbook; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple4; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.offer.BuyOfferView; -import io.bitsquare.gui.main.offer.SellOfferView; -import io.bitsquare.gui.main.offer.offerbook.OfferBookListItem; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.CurrencyListItem; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.trade.offer.payload.Offer; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple4; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.offer.BuyOfferView; +import io.bisq.gui.main.offer.SellOfferView; +import io.bisq.gui.main.offer.offerbook.OfferBookListItem; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.CurrencyListItem; +import io.bisq.gui.util.GUIUtil; +import io.bisq.locale.Res; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.trade.offer.payload.Offer; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java b/gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java rename to gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java index 6af25107b8..4f6c6f5345 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java @@ -15,24 +15,24 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.market.offerbook; +package io.bisq.gui.main.market.offerbook; import com.google.common.math.LongMath; import com.google.inject.Inject; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.ActivatableViewModel; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.offer.offerbook.OfferBook; -import io.bitsquare.gui.main.offer.offerbook.OfferBookListItem; -import io.bitsquare.gui.main.settings.SettingsView; -import io.bitsquare.gui.main.settings.preferences.PreferencesView; -import io.bitsquare.gui.util.CurrencyListItem; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.provider.price.PriceFeedService; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.ActivatableViewModel; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.offer.offerbook.OfferBook; +import io.bisq.gui.main.offer.offerbook.OfferBookListItem; +import io.bisq.gui.main.settings.SettingsView; +import io.bisq.gui.main.settings.preferences.PreferencesView; +import io.bisq.gui.util.CurrencyListItem; +import io.bisq.gui.util.GUIUtil; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.provider.price.PriceFeedService; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ChangeListener; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferListItem.java b/gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferListItem.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferListItem.java rename to gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferListItem.java index 299efb4d3f..60f5f7681b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferListItem.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.market.offerbook; +package io.bisq.gui.main.market.offerbook; -import io.bitsquare.messages.trade.offer.payload.Offer; +import io.bisq.messages.trade.offer.payload.Offer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadItem.java b/gui/src/main/java/io/bisq/gui/main/market/spread/SpreadItem.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadItem.java rename to gui/src/main/java/io/bisq/gui/main/market/spread/SpreadItem.java index f0b55ec272..aa4e9c7724 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadItem.java +++ b/gui/src/main/java/io/bisq/gui/main/market/spread/SpreadItem.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.main.market.spread; +package io.bisq.gui.main.market.spread; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.fxml b/gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.fxml rename to gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.fxml index 5d93c1003c..86b7f408d4 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.fxml @@ -20,7 +20,7 @@ -. */ -package io.bitsquare.gui.main.market.spread; +package io.bisq.gui.main.market.spread; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.CurrencyUtil; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; +import io.bisq.messages.locale.CurrencyUtil; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.ListChangeListener; import javafx.collections.transformation.SortedList; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java b/gui/src/main/java/io/bisq/gui/main/market/spread/SpreadViewModel.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java rename to gui/src/main/java/io/bisq/gui/main/market/spread/SpreadViewModel.java index e16bf06190..e4c819747b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/market/spread/SpreadViewModel.java @@ -15,17 +15,17 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.market.spread; +package io.bisq.gui.main.market.spread; import com.google.inject.Inject; -import io.bitsquare.gui.common.model.ActivatableViewModel; -import io.bitsquare.gui.main.offer.offerbook.OfferBook; -import io.bitsquare.gui.main.offer.offerbook.OfferBookListItem; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.provider.price.MarketPrice; -import io.bitsquare.messages.provider.price.PriceFeedService; -import io.bitsquare.messages.trade.offer.payload.Offer; +import io.bisq.gui.common.model.ActivatableViewModel; +import io.bisq.gui.main.offer.offerbook.OfferBook; +import io.bisq.gui.main.offer.offerbook.OfferBookListItem; +import io.bisq.gui.util.BSFormatter; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.provider.price.MarketPrice; +import io.bisq.messages.provider.price.PriceFeedService; +import io.bisq.messages.trade.offer.payload.Offer; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.fxml b/gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.fxml rename to gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.fxml index eb2dee0466..7e54bbed96 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.fxml @@ -20,7 +20,7 @@ -. */ -package io.bitsquare.gui.main.market.trades; +package io.bisq.gui.main.market.trades; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.MathUtils; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.main.market.trades.charts.price.CandleStickChart; -import io.bitsquare.gui.main.market.trades.charts.volume.VolumeChart; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.CurrencyListItem; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.trade.statistics.payload.TradeStatistics; +import io.bisq.common.UserThread; +import io.bisq.common.util.MathUtils; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.main.market.trades.charts.price.CandleStickChart; +import io.bisq.gui.main.market.trades.charts.volume.VolumeChart; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.CurrencyListItem; +import io.bisq.gui.util.GUIUtil; +import io.bisq.locale.Res; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.trade.statistics.payload.TradeStatistics; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModel.java b/gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModel.java rename to gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java index e1e4b37ef0..6755d5ebb8 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java @@ -15,27 +15,27 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.market.trades; +package io.bisq.gui.main.market.trades; import com.google.common.annotations.VisibleForTesting; import com.google.inject.Inject; -import io.bitsquare.common.util.MathUtils; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.ActivatableViewModel; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.market.trades.charts.CandleData; -import io.bitsquare.gui.main.settings.SettingsView; -import io.bitsquare.gui.main.settings.preferences.PreferencesView; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.CurrencyListItem; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.messages.locale.CryptoCurrency; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.provider.price.PriceFeedService; -import io.bitsquare.messages.trade.statistics.payload.TradeStatistics; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.trade.statistics.TradeStatisticsManager; +import io.bisq.common.util.MathUtils; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.ActivatableViewModel; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.market.trades.charts.CandleData; +import io.bisq.gui.main.settings.SettingsView; +import io.bisq.gui.main.settings.preferences.PreferencesView; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.CurrencyListItem; +import io.bisq.gui.util.GUIUtil; +import io.bisq.messages.locale.CryptoCurrency; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.provider.price.PriceFeedService; +import io.bisq.messages.trade.statistics.payload.TradeStatistics; +import io.bisq.messages.user.Preferences; +import io.bisq.trade.statistics.TradeStatisticsManager; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/CandleData.java b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/CandleData.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/CandleData.java rename to gui/src/main/java/io/bisq/gui/main/market/trades/charts/CandleData.java index 45768c777f..ec025c1d32 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/CandleData.java +++ b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/CandleData.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.market.trades.charts; +package io.bisq.gui.main.market.trades.charts; public class CandleData { public final long tick; // Is the time tick in the chosen time interval diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/Candle.java b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/Candle.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/Candle.java rename to gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/Candle.java index 163ad30c1c..27fd7992f1 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/Candle.java +++ b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/Candle.java @@ -29,9 +29,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.bitsquare.gui.main.market.trades.charts.price; +package io.bisq.gui.main.market.trades.charts.price; -import io.bitsquare.gui.main.market.trades.charts.CandleData; +import io.bisq.gui.main.market.trades.charts.CandleData; import javafx.scene.Group; import javafx.scene.control.Tooltip; import javafx.scene.layout.Region; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleStickChart.java b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleStickChart.java similarity index 99% rename from gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleStickChart.java rename to gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleStickChart.java index c5c9e6a7b3..2191620ad2 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleStickChart.java +++ b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleStickChart.java @@ -29,9 +29,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.bitsquare.gui.main.market.trades.charts.price; +package io.bisq.gui.main.market.trades.charts.price; -import io.bitsquare.gui.main.market.trades.charts.CandleData; +import io.bisq.gui.main.market.trades.charts.CandleData; import javafx.animation.FadeTransition; import javafx.event.ActionEvent; import javafx.scene.Node; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleTooltip.java b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleTooltip.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleTooltip.java rename to gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleTooltip.java index 0ca4a6ee4c..a58b00dc45 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/price/CandleTooltip.java +++ b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleTooltip.java @@ -29,11 +29,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.bitsquare.gui.main.market.trades.charts.price; +package io.bisq.gui.main.market.trades.charts.price; -import io.bitsquare.gui.main.market.trades.charts.CandleData; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; +import io.bisq.gui.main.market.trades.charts.CandleData; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; import javafx.geometry.HPos; import javafx.scene.control.Label; import javafx.scene.layout.ColumnConstraints; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeBar.java b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeBar.java similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeBar.java rename to gui/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeBar.java index 8a1ad70dec..44aca05d66 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeBar.java +++ b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeBar.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Affero General Public License * along with bisq. If not, see . */ -package io.bitsquare.gui.main.market.trades.charts.volume; +package io.bisq.gui.main.market.trades.charts.volume; -import io.bitsquare.gui.main.market.trades.charts.CandleData; -import io.bitsquare.locale.Res; +import io.bisq.gui.main.market.trades.charts.CandleData; +import io.bisq.locale.Res; import javafx.scene.Group; import javafx.scene.control.Tooltip; import javafx.scene.layout.Region; diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeChart.java b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeChart.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeChart.java rename to gui/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeChart.java index b2c0efa28e..4fe636269d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/market/trades/charts/volume/VolumeChart.java +++ b/gui/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeChart.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU Affero General Public License * along with bisq. If not, see . */ -package io.bitsquare.gui.main.market.trades.charts.volume; +package io.bisq.gui.main.market.trades.charts.volume; -import io.bitsquare.gui.main.market.trades.charts.CandleData; -import io.bitsquare.gui.main.market.trades.charts.price.CandleStickChart; +import io.bisq.gui.main.market.trades.charts.CandleData; +import io.bisq.gui.main.market.trades.charts.price.CandleStickChart; import javafx.animation.FadeTransition; import javafx.event.ActionEvent; import javafx.scene.Node; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml b/gui/src/main/java/io/bisq/gui/main/offer/BuyOfferView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml rename to gui/src/main/java/io/bisq/gui/main/offer/BuyOfferView.fxml index bdc465725e..6e86087311 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/offer/BuyOfferView.fxml @@ -19,7 +19,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java b/gui/src/main/java/io/bisq/gui/main/offer/BuyOfferView.java similarity index 81% rename from gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java rename to gui/src/main/java/io/bisq/gui/main/offer/BuyOfferView.java index b74d459563..0d01ddff0e 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/BuyOfferView.java @@ -15,12 +15,12 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer; +package io.bisq.gui.main.offer; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.common.view.ViewLoader; -import io.bitsquare.messages.user.Preferences; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.common.view.ViewLoader; +import io.bisq.messages.user.Preferences; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java b/gui/src/main/java/io/bisq/gui/main/offer/OfferView.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java rename to gui/src/main/java/io/bisq/gui/main/offer/OfferView.java index a43ee8f5ee..d9bc72eea8 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/OfferView.java @@ -15,23 +15,23 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer; +package io.bisq.gui.main.offer; -import io.bitsquare.common.UserThread; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.ActivatableView; -import io.bitsquare.gui.common.view.View; -import io.bitsquare.gui.common.view.ViewLoader; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.offer.createoffer.CreateOfferView; -import io.bitsquare.gui.main.offer.offerbook.OfferBookView; -import io.bitsquare.gui.main.offer.takeoffer.TakeOfferView; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; +import io.bisq.common.UserThread; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.ActivatableView; +import io.bisq.gui.common.view.View; +import io.bisq.gui.common.view.ViewLoader; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.offer.createoffer.CreateOfferView; +import io.bisq.gui.main.offer.offerbook.OfferBookView; +import io.bisq.gui.main.offer.takeoffer.TakeOfferView; +import io.bisq.locale.Res; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; import javafx.beans.value.ChangeListener; import javafx.collections.ListChangeListener; import javafx.scene.control.Tab; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml b/gui/src/main/java/io/bisq/gui/main/offer/SellOfferView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml rename to gui/src/main/java/io/bisq/gui/main/offer/SellOfferView.fxml index 377fbe0370..088f40cac5 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/offer/SellOfferView.fxml @@ -19,7 +19,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java b/gui/src/main/java/io/bisq/gui/main/offer/SellOfferView.java similarity index 81% rename from gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java rename to gui/src/main/java/io/bisq/gui/main/offer/SellOfferView.java index 1bc9a38581..a42822a1c1 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/SellOfferView.java @@ -15,12 +15,12 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer; +package io.bisq.gui.main.offer; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.common.view.ViewLoader; -import io.bitsquare.messages.user.Preferences; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.common.view.ViewLoader; +import io.bisq.messages.user.Preferences; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java rename to gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java index 867a067141..5e5ffc7b7e 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java @@ -15,36 +15,36 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer.createoffer; +package io.bisq.gui.main.offer.createoffer; import com.google.inject.Inject; -import io.bitsquare.app.DevEnv; -import io.bitsquare.app.Version; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.common.model.ActivatableDataModel; -import io.bitsquare.gui.main.offer.createoffer.monetary.Price; -import io.bitsquare.gui.main.offer.createoffer.monetary.Volume; -import io.bitsquare.gui.main.overlays.notifications.Notification; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.arbitration.Arbitrator; -import io.bitsquare.messages.btc.Restrictions; -import io.bitsquare.messages.btc.provider.fee.FeeService; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.payment.payload.BankAccountContractData; -import io.bitsquare.messages.provider.price.PriceFeedService; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.payment.*; -import io.bitsquare.trade.handlers.TransactionResultHandler; -import io.bitsquare.trade.offer.OpenOfferManager; -import io.bitsquare.user.User; +import io.bisq.app.DevEnv; +import io.bisq.app.Version; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.common.crypto.KeyRing; +import io.bisq.common.util.Utilities; +import io.bisq.gui.common.model.ActivatableDataModel; +import io.bisq.gui.main.offer.createoffer.monetary.Price; +import io.bisq.gui.main.offer.createoffer.monetary.Volume; +import io.bisq.gui.main.overlays.notifications.Notification; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; +import io.bisq.messages.arbitration.Arbitrator; +import io.bisq.messages.btc.Restrictions; +import io.bisq.messages.btc.provider.fee.FeeService; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.payment.payload.BankAccountContractData; +import io.bisq.messages.provider.price.PriceFeedService; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; +import io.bisq.p2p.P2PService; +import io.bisq.payment.*; +import io.bisq.trade.handlers.TransactionResultHandler; +import io.bisq.trade.offer.OpenOfferManager; +import io.bisq.user.User; import javafx.beans.property.*; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.fxml similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml rename to gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.fxml index da9d15759f..b0eb56e044 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.fxml @@ -18,6 +18,6 @@ --> - diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java rename to gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java index fa252d650a..e264b1fa61 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java @@ -15,41 +15,41 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer.createoffer; +package io.bisq.gui.main.offer.createoffer; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.app.DevEnv; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.account.AccountView; -import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView; -import io.bitsquare.gui.main.account.content.fiataccounts.FiatAccountsView; -import io.bitsquare.gui.main.account.settings.AccountSettingsView; -import io.bitsquare.gui.main.funds.FundsView; -import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView; -import io.bitsquare.gui.main.offer.OfferView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow; -import io.bitsquare.gui.main.overlays.windows.QRCodeWindow; -import io.bitsquare.gui.main.portfolio.PortfolioView; -import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.FormBuilder; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.payment.PaymentAccount; +import io.bisq.app.DevEnv; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Tuple3; +import io.bisq.common.util.Utilities; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.account.AccountView; +import io.bisq.gui.main.account.content.arbitratorselection.ArbitratorSelectionView; +import io.bisq.gui.main.account.content.fiataccounts.FiatAccountsView; +import io.bisq.gui.main.account.settings.AccountSettingsView; +import io.bisq.gui.main.funds.FundsView; +import io.bisq.gui.main.funds.withdrawal.WithdrawalView; +import io.bisq.gui.main.offer.OfferView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; +import io.bisq.gui.main.overlays.windows.QRCodeWindow; +import io.bisq.gui.main.portfolio.PortfolioView; +import io.bisq.gui.main.portfolio.openoffer.OpenOffersView; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.FormBuilder; +import io.bisq.gui.util.GUIUtil; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; +import io.bisq.payment.PaymentAccount; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; import javafx.event.ActionEvent; @@ -78,7 +78,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; import static javafx.beans.binding.Bindings.createStringBinding; @FxmlView diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java rename to gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java index 23899aabb0..f9ca86ee4e 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java @@ -15,40 +15,40 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer.createoffer; +package io.bisq.gui.main.offer.createoffer; -import io.bitsquare.app.DevEnv; -import io.bitsquare.common.Timer; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.MathUtils; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.ActivatableWithDataModel; -import io.bitsquare.gui.common.model.ViewModel; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.funds.FundsView; -import io.bitsquare.gui.main.funds.deposit.DepositView; -import io.bitsquare.gui.main.offer.createoffer.monetary.Altcoin; -import io.bitsquare.gui.main.offer.createoffer.monetary.Price; -import io.bitsquare.gui.main.offer.createoffer.monetary.Volume; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.settings.SettingsView; -import io.bitsquare.gui.main.settings.preferences.PreferencesView; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.gui.util.validation.BtcValidator; -import io.bitsquare.gui.util.validation.FiatValidator; -import io.bitsquare.gui.util.validation.InputValidator; -import io.bitsquare.gui.util.validation.SecurityDepositValidator; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.btc.Restrictions; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.provider.price.MarketPrice; -import io.bitsquare.messages.provider.price.PriceFeedService; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.payment.PaymentAccount; +import io.bisq.app.DevEnv; +import io.bisq.common.Timer; +import io.bisq.common.UserThread; +import io.bisq.common.util.MathUtils; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.ActivatableWithDataModel; +import io.bisq.gui.common.model.ViewModel; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.funds.FundsView; +import io.bisq.gui.main.funds.deposit.DepositView; +import io.bisq.gui.main.offer.createoffer.monetary.Altcoin; +import io.bisq.gui.main.offer.createoffer.monetary.Price; +import io.bisq.gui.main.offer.createoffer.monetary.Volume; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.settings.SettingsView; +import io.bisq.gui.main.settings.preferences.PreferencesView; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.gui.util.validation.BtcValidator; +import io.bisq.gui.util.validation.FiatValidator; +import io.bisq.gui.util.validation.InputValidator; +import io.bisq.gui.util.validation.SecurityDepositValidator; +import io.bisq.locale.Res; +import io.bisq.messages.btc.Restrictions; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.provider.price.MarketPrice; +import io.bisq.messages.provider.price.PriceFeedService; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; +import io.bisq.p2p.P2PService; +import io.bisq.payment.PaymentAccount; import javafx.beans.property.*; import javafx.beans.value.ChangeListener; import org.bitcoinj.core.Address; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/Altcoin.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/Altcoin.java similarity index 99% rename from gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/Altcoin.java rename to gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/Altcoin.java index a163cd7466..3613ad84ee 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/Altcoin.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/Altcoin.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.main.offer.createoffer.monetary; +package io.bisq.gui.main.offer.createoffer.monetary; import com.google.common.math.LongMath; import org.bitcoinj.core.Monetary; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/AltcoinExchangeRate.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/AltcoinExchangeRate.java similarity index 98% rename from gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/AltcoinExchangeRate.java rename to gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/AltcoinExchangeRate.java index c2f0f6f905..c0b6041d38 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/AltcoinExchangeRate.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/AltcoinExchangeRate.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.main.offer.createoffer.monetary; +package io.bisq.gui.main.offer.createoffer.monetary; import org.bitcoinj.core.Coin; import org.slf4j.Logger; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/MonetaryWrapper.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/MonetaryWrapper.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/MonetaryWrapper.java rename to gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/MonetaryWrapper.java index 72b5fc49de..567e1ff241 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/MonetaryWrapper.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/MonetaryWrapper.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.main.offer.createoffer.monetary; +package io.bisq.gui.main.offer.createoffer.monetary; import org.bitcoinj.core.Monetary; import org.bitcoinj.utils.MonetaryFormat; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/Price.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/Price.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/Price.java rename to gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/Price.java index fdf373a09c..b69cdb63c0 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/Price.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/Price.java @@ -1,7 +1,7 @@ -package io.bitsquare.gui.main.offer.createoffer.monetary; +package io.bisq.gui.main.offer.createoffer.monetary; -import io.bitsquare.common.util.MathUtils; -import io.bitsquare.messages.locale.CurrencyUtil; +import io.bisq.common.util.MathUtils; +import io.bisq.messages.locale.CurrencyUtil; import org.bitcoinj.core.Coin; import org.bitcoinj.core.Monetary; import org.bitcoinj.utils.ExchangeRate; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/Volume.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/Volume.java similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/Volume.java rename to gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/Volume.java index 419c9f3527..d2b49cd0aa 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/monetary/Volume.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/monetary/Volume.java @@ -1,6 +1,6 @@ -package io.bitsquare.gui.main.offer.createoffer.monetary; +package io.bisq.gui.main.offer.createoffer.monetary; -import io.bitsquare.messages.locale.CurrencyUtil; +import io.bisq.messages.locale.CurrencyUtil; import org.bitcoinj.core.Monetary; import org.bitcoinj.utils.Fiat; import org.slf4j.Logger; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java b/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java rename to gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java index 0687f89be3..f8b6e3b95a 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBook.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java @@ -15,12 +15,12 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer.offerbook; +package io.bisq.gui.main.offer.offerbook; -import io.bitsquare.app.Log; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.trade.TradeManager; -import io.bitsquare.trade.offer.OfferBookService; +import io.bisq.app.Log; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.trade.TradeManager; +import io.bisq.trade.offer.OfferBookService; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import org.slf4j.Logger; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java b/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookListItem.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java rename to gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookListItem.java index 15a8505c18..041d0c0f76 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookListItem.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer.offerbook; +package io.bisq.gui.main.offer.offerbook; -import io.bitsquare.messages.trade.offer.payload.Offer; +import io.bisq.messages.trade.offer.payload.Offer; public class OfferBookListItem { private final Offer offer; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml b/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.fxml similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml rename to gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.fxml index 426f626b85..63ef4af37b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.fxml @@ -19,7 +19,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java b/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java rename to gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java index 11a9b64354..30edaf4108 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java @@ -15,32 +15,32 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer.offerbook; +package io.bisq.gui.main.offer.offerbook; -import io.bitsquare.alert.PrivateNotificationManager; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.components.PeerInfoIcon; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.account.AccountView; -import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView; -import io.bitsquare.gui.main.account.content.fiataccounts.FiatAccountsView; -import io.bitsquare.gui.main.account.settings.AccountSettingsView; -import io.bitsquare.gui.main.funds.FundsView; -import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView; -import io.bitsquare.gui.main.offer.OfferView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.FiatCurrency; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.trade.offer.payload.Offer; +import io.bisq.alert.PrivateNotificationManager; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.components.PeerInfoIcon; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.account.AccountView; +import io.bisq.gui.main.account.content.arbitratorselection.ArbitratorSelectionView; +import io.bisq.gui.main.account.content.fiataccounts.FiatAccountsView; +import io.bisq.gui.main.account.settings.AccountSettingsView; +import io.bisq.gui.main.funds.FundsView; +import io.bisq.gui.main.funds.withdrawal.WithdrawalView; +import io.bisq.gui.main.offer.OfferView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.locale.FiatCurrency; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.trade.offer.payload.Offer; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; @@ -63,7 +63,7 @@ import org.fxmisc.easybind.monadic.MonadicBinding; import javax.inject.Inject; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; @FxmlView public class OfferBookView extends ActivatableViewAndModel { diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java b/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java rename to gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java index 64efb7fb58..d8beaa6eb7 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java @@ -15,34 +15,34 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer.offerbook; +package io.bisq.gui.main.offer.offerbook; import com.google.common.base.Joiner; import com.google.inject.Inject; -import io.bitsquare.app.Version; -import io.bitsquare.common.handlers.ErrorMessageHandler; -import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.filter.FilterManager; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.ActivatableViewModel; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.settings.SettingsView; -import io.bitsquare.gui.main.settings.preferences.PreferencesView; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.*; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.provider.price.PriceFeedService; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.p2p.NodeAddress; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.payment.PaymentAccountUtil; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.closed.ClosedTradableManager; -import io.bitsquare.trade.offer.OpenOfferManager; -import io.bitsquare.user.User; +import io.bisq.app.Version; +import io.bisq.common.handlers.ErrorMessageHandler; +import io.bisq.common.handlers.ResultHandler; +import io.bisq.filter.FilterManager; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.ActivatableViewModel; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.settings.SettingsView; +import io.bisq.gui.main.settings.preferences.PreferencesView; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.locale.Res; +import io.bisq.messages.locale.*; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.provider.price.PriceFeedService; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; +import io.bisq.p2p.NodeAddress; +import io.bisq.p2p.P2PService; +import io.bisq.payment.PaymentAccountUtil; +import io.bisq.trade.Trade; +import io.bisq.trade.closed.ClosedTradableManager; +import io.bisq.trade.offer.OpenOfferManager; +import io.bisq.user.User; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleStringProperty; diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java rename to gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java index 285cd1c7ad..c9ae2aede3 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java @@ -15,31 +15,31 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer.takeoffer; +package io.bisq.gui.main.offer.takeoffer; import com.google.inject.Inject; -import io.bitsquare.app.DevEnv; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.listeners.BalanceListener; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.common.model.ActivatableDataModel; -import io.bitsquare.gui.main.overlays.notifications.Notification; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.arbitration.Arbitrator; -import io.bitsquare.messages.btc.provider.fee.FeeService; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.provider.price.PriceFeedService; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.payment.PaymentAccount; -import io.bitsquare.payment.PaymentAccountUtil; -import io.bitsquare.trade.TradeManager; -import io.bitsquare.trade.handlers.TradeResultHandler; -import io.bitsquare.user.User; +import io.bisq.app.DevEnv; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.listeners.BalanceListener; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.common.util.Utilities; +import io.bisq.gui.common.model.ActivatableDataModel; +import io.bisq.gui.main.overlays.notifications.Notification; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; +import io.bisq.messages.arbitration.Arbitrator; +import io.bisq.messages.btc.provider.fee.FeeService; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.provider.price.PriceFeedService; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; +import io.bisq.payment.PaymentAccount; +import io.bisq.payment.PaymentAccountUtil; +import io.bisq.trade.TradeManager; +import io.bisq.trade.handlers.TradeResultHandler; +import io.bisq.user.User; import javafx.beans.property.*; import javafx.collections.ObservableList; import org.bitcoinj.core.Coin; @@ -100,7 +100,7 @@ class TakeOfferDataModel extends ActivatableDataModel { @Inject - TakeOfferDataModel(TradeManager tradeManager, + TakeOfferDataModel(TradeManager tradeManager, BtcWalletService walletService, User user, FeeService feeService, Preferences preferences, PriceFeedService priceFeedService, BSFormatter formatter) { diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.fxml similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml rename to gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.fxml index d26dc3e4aa..894e31dc05 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.fxml @@ -18,7 +18,7 @@ --> - diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java rename to gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java index 950ed3fd55..b7c94a1124 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java @@ -15,40 +15,41 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer.takeoffer; +package io.bisq.gui.main.offer.takeoffer; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.app.DevEnv; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.account.AccountView; -import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView; -import io.bitsquare.gui.main.account.settings.AccountSettingsView; -import io.bitsquare.gui.main.funds.FundsView; -import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView; -import io.bitsquare.gui.main.offer.OfferView; -import io.bitsquare.gui.main.overlays.notifications.Notification; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow; -import io.bitsquare.gui.main.overlays.windows.QRCodeWindow; -import io.bitsquare.gui.main.portfolio.PortfolioView; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.payment.PaymentAccount; +import io.bisq.app.DevEnv; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Tuple3; +import io.bisq.common.util.Utilities; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.account.AccountView; +import io.bisq.gui.main.account.content.arbitratorselection.ArbitratorSelectionView; +import io.bisq.gui.main.account.settings.AccountSettingsView; +import io.bisq.gui.main.funds.FundsView; +import io.bisq.gui.main.funds.withdrawal.WithdrawalView; +import io.bisq.gui.main.offer.OfferView; +import io.bisq.gui.main.overlays.notifications.Notification; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; +import io.bisq.gui.main.overlays.windows.QRCodeWindow; +import io.bisq.gui.main.portfolio.PortfolioView; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesView; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.FormBuilder; +import io.bisq.gui.util.GUIUtil; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; +import io.bisq.payment.PaymentAccount; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ChangeListener; import javafx.geometry.*; @@ -73,7 +74,6 @@ import java.io.ByteArrayInputStream; import java.net.URI; import java.util.concurrent.TimeUnit; -import static io.bitsquare.gui.util.FormBuilder.*; import static javafx.beans.binding.Bindings.createStringBinding; // TODO Implement other positioning method in InoutTextField to display it over the field instead of right side @@ -620,10 +620,10 @@ public class TakeOfferView extends ActivatableViewAndModel tuple = addLabelComboBox(gridPane, gridRow, Res.getWithCol("shared.tradingAccount"), Layout.FIRST_ROW_DISTANCE); + Tuple2 tuple = FormBuilder.addLabelComboBox(gridPane, gridRow, Res.getWithCol("shared.tradingAccount"), Layout.FIRST_ROW_DISTANCE); paymentAccountsLabel = tuple.first; paymentAccountsLabel.setVisible(false); paymentAccountsLabel.setManaged(false); @@ -647,14 +647,14 @@ public class TakeOfferView extends ActivatableViewAndModel model.onPaymentAccountSelected(paymentAccountsComboBox.getSelectionModel().getSelectedItem())); - Tuple2 tuple2 = addLabelTextField(gridPane, gridRow, Res.getWithCol("shared.paymentMethod"), "", Layout.FIRST_ROW_DISTANCE); + Tuple2 tuple2 = FormBuilder.addLabelTextField(gridPane, gridRow, Res.getWithCol("shared.paymentMethod"), "", Layout.FIRST_ROW_DISTANCE); paymentMethodLabel = tuple2.first; paymentMethodTextField = tuple2.second; - currencyTextField = addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.tradeCurrency"), "").second; + currencyTextField = FormBuilder.addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.tradeCurrency"), "").second; } private void addAmountPriceGroup() { - TitledGroupBg titledGroupBg = addTitledGroupBg(gridPane, ++gridRow, 2, Res.get("takeOffer.setAmountPrice"), Layout.GROUP_DISTANCE); + TitledGroupBg titledGroupBg = FormBuilder.addTitledGroupBg(gridPane, ++gridRow, 2, Res.get("takeOffer.setAmountPrice"), Layout.GROUP_DISTANCE); GridPane.setColumnSpan(titledGroupBg, 3); imageView = new ImageView(); @@ -705,7 +705,7 @@ public class TakeOfferView extends ActivatableViewAndModel addressTuple = addLabelAddressTextField(gridPane, ++gridRow, Res.get("shared.tradeWalletAddress")); + Tuple2 addressTuple = FormBuilder.addLabelAddressTextField(gridPane, ++gridRow, Res.get("shared.tradeWalletAddress")); addressLabel = addressTuple.first; addressLabel.setVisible(false); addressTextField = addressTuple.second; addressTextField.setVisible(false); - Tuple2 balanceTuple = addLabelBalanceTextField(gridPane, ++gridRow, Res.get("shared.tradeWalletBalance")); + Tuple2 balanceTuple = FormBuilder.addLabelBalanceTextField(gridPane, ++gridRow, Res.get("shared.tradeWalletBalance")); balanceLabel = balanceTuple.first; balanceLabel.setVisible(false); balanceTextField = balanceTuple.second; @@ -779,14 +779,14 @@ public class TakeOfferView extends ActivatableViewAndModel onTakeOffer()); - cancelButton2 = addButton(gridPane, ++gridRow, Res.get("shared.cancel")); + cancelButton2 = FormBuilder.addButton(gridPane, ++gridRow, Res.get("shared.cancel")); cancelButton2.setOnAction(e -> { if (model.dataModel.isWalletFunded.get()) { new Popup().warning(Res.get("takeOffer.alreadyFunded.askCancel")) diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java rename to gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java index 264aad520f..e5045b918f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java @@ -15,29 +15,29 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.offer.takeoffer; +package io.bisq.gui.main.offer.takeoffer; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.ActivatableWithDataModel; -import io.bitsquare.gui.common.model.ViewModel; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.funds.FundsView; -import io.bitsquare.gui.main.funds.deposit.DepositView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.gui.util.validation.BtcValidator; -import io.bitsquare.gui.util.validation.InputValidator; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.arbitration.Arbitrator; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.p2p.network.CloseConnectionReason; -import io.bitsquare.p2p.network.Connection; -import io.bitsquare.p2p.network.ConnectionListener; -import io.bitsquare.payment.PaymentAccount; -import io.bitsquare.trade.Trade; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.ActivatableWithDataModel; +import io.bisq.gui.common.model.ViewModel; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.funds.FundsView; +import io.bisq.gui.main.funds.deposit.DepositView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.GUIUtil; +import io.bisq.gui.util.validation.BtcValidator; +import io.bisq.gui.util.validation.InputValidator; +import io.bisq.locale.Res; +import io.bisq.messages.arbitration.Arbitrator; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.p2p.P2PService; +import io.bisq.p2p.network.CloseConnectionReason; +import io.bisq.p2p.network.Connection; +import io.bisq.p2p.network.ConnectionListener; +import io.bisq.payment.PaymentAccount; +import io.bisq.trade.Trade; import javafx.beans.property.*; import javafx.beans.value.ChangeListener; import javafx.collections.ObservableList; @@ -103,7 +103,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel im /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public TakeOfferViewModel(TakeOfferDataModel dataModel, BtcValidator btcValidator, P2PService p2PService, + public TakeOfferViewModel(TakeOfferDataModel dataModel, BtcValidator btcValidator, P2PService p2PService, Navigation navigation, BSFormatter formatter) { super(dataModel); this.dataModel = dataModel; diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java b/gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java similarity index 98% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java rename to gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java index a88663c6b7..95e9518330 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java @@ -15,18 +15,18 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays; +package io.bisq.gui.main.overlays; -import io.bitsquare.app.BitsquareApp; -import io.bitsquare.common.Timer; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.components.BusyAnimation; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.gui.util.Transitions; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; +import io.bisq.app.BitsquareApp; +import io.bisq.common.Timer; +import io.bisq.common.UserThread; +import io.bisq.common.util.Utilities; +import io.bisq.gui.components.BusyAnimation; +import io.bisq.gui.main.MainView; +import io.bisq.gui.util.GUIUtil; +import io.bisq.gui.util.Transitions; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; import javafx.animation.Interpolator; import javafx.animation.KeyFrame; import javafx.animation.KeyValue; @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; import java.util.Optional; import java.util.concurrent.TimeUnit; -import static io.bitsquare.gui.util.FormBuilder.addCheckBox; +import static io.bisq.gui.util.FormBuilder.addCheckBox; public abstract class Overlay { protected final Logger log = LoggerFactory.getLogger(this.getClass()); @@ -734,7 +734,7 @@ public abstract class Overlay { // We might have set it and overridden the default, so we check if it is not set if (dontShowAgainText == null) dontShowAgainText = Res.get("popup.doNotShowAgain"); - + CheckBox dontShowAgainCheckBox = addCheckBox(gridPane, rowIndex, dontShowAgainText, buttonDistance - 1); GridPane.setColumnIndex(dontShowAgainCheckBox, 0); GridPane.setHalignment(dontShowAgainCheckBox, HPos.LEFT); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/editor/PeerInfoWithTagEditor.java b/gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/editor/PeerInfoWithTagEditor.java rename to gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java index eed402c46d..6803ee1858 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/editor/PeerInfoWithTagEditor.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java @@ -1,13 +1,13 @@ -package io.bitsquare.gui.main.overlays.editor; +package io.bisq.gui.main.overlays.editor; -import io.bitsquare.alert.PrivateNotificationManager; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.main.overlays.windows.SendPrivateNotificationWindow; -import io.bitsquare.gui.util.FormBuilder; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; +import io.bisq.alert.PrivateNotificationManager; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.windows.SendPrivateNotificationWindow; +import io.bisq.gui.util.FormBuilder; +import io.bisq.locale.Res; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; import javafx.animation.Interpolator; import javafx.animation.KeyFrame; import javafx.animation.KeyValue; diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/Notification.java b/gui/src/main/java/io/bisq/gui/main/overlays/notifications/Notification.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/Notification.java rename to gui/src/main/java/io/bisq/gui/main/overlays/notifications/Notification.java index 8c11b96c2b..618c3ea77d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/Notification.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/notifications/Notification.java @@ -1,9 +1,9 @@ -package io.bitsquare.gui.main.overlays.notifications; +package io.bisq.gui.main.overlays.notifications; -import io.bitsquare.common.Timer; -import io.bitsquare.common.UserThread; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.locale.Res; +import io.bisq.common.Timer; +import io.bisq.common.UserThread; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.locale.Res; import javafx.animation.Interpolator; import javafx.animation.KeyFrame; import javafx.animation.KeyValue; diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/NotificationCenter.java b/gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/NotificationCenter.java rename to gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java index 145c3b14bc..6a12c0f93f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/NotificationCenter.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java @@ -1,19 +1,19 @@ -package io.bitsquare.gui.main.overlays.notifications; +package io.bisq.gui.main.overlays.notifications; import com.google.inject.Inject; -import io.bitsquare.app.Log; -import io.bitsquare.arbitration.DisputeManager; -import io.bitsquare.common.UserThread; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.disputes.DisputesView; -import io.bitsquare.gui.main.disputes.trader.TraderDisputeView; -import io.bitsquare.gui.main.portfolio.PortfolioView; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.TradeManager; +import io.bisq.app.Log; +import io.bisq.arbitration.DisputeManager; +import io.bisq.common.UserThread; +import io.bisq.gui.Navigation; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.disputes.DisputesView; +import io.bisq.gui.main.disputes.trader.TraderDisputeView; +import io.bisq.gui.main.portfolio.PortfolioView; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesView; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; +import io.bisq.trade.Trade; +import io.bisq.trade.TradeManager; import javafx.collections.ListChangeListener; import org.fxmisc.easybind.EasyBind; import org.fxmisc.easybind.Subscription; diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/NotificationManager.java b/gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationManager.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/NotificationManager.java rename to gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationManager.java index fe27da6d01..160a587c9a 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/notifications/NotificationManager.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationManager.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.main.overlays.notifications; +package io.bisq.gui.main.overlays.notifications; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/popups/Popup.java b/gui/src/main/java/io/bisq/gui/main/overlays/popups/Popup.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/popups/Popup.java rename to gui/src/main/java/io/bisq/gui/main/overlays/popups/Popup.java index 89b6347cd3..b6b7692d26 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/popups/Popup.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/popups/Popup.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.popups; +package io.bisq.gui.main.overlays.popups; -import io.bitsquare.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.Overlay; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/popups/PopupManager.java b/gui/src/main/java/io/bisq/gui/main/overlays/popups/PopupManager.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/popups/PopupManager.java rename to gui/src/main/java/io/bisq/gui/main/overlays/popups/PopupManager.java index 0120ccad56..41a2c1dc1d 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/popups/PopupManager.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/popups/PopupManager.java @@ -1,4 +1,4 @@ -package io.bitsquare.gui.main.overlays.popups; +package io.bisq.gui.main.overlays.popups; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/AddBitcoinNodesWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/AddBitcoinNodesWindow.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/AddBitcoinNodesWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/AddBitcoinNodesWindow.java index 131f5472ac..6f329315ac 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/AddBitcoinNodesWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/AddBitcoinNodesWindow.java @@ -15,15 +15,15 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.messages.user.Preferences; +import io.bisq.common.util.Tuple2; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.util.GUIUtil; +import io.bisq.messages.user.Preferences; import javafx.geometry.HPos; import javafx.geometry.Insets; import javafx.scene.Scene; @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; //TODO not used yet but keep it for later public class AddBitcoinNodesWindow extends Overlay { diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ContractWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java similarity index 65% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ContractWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java index 2219e76fcb..3a92499997 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ContractWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java @@ -15,21 +15,22 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; import com.google.common.base.Joiner; -import io.bitsquare.arbitration.DisputeManager; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.arbitration.Dispute; -import io.bitsquare.messages.locale.CountryUtil; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.payment.payload.PaymentAccountContractData; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.trade.payload.Contract; +import io.bisq.arbitration.DisputeManager; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.FormBuilder; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.arbitration.Dispute; +import io.bisq.messages.locale.CountryUtil; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.payment.payload.PaymentAccountContractData; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.trade.payload.Contract; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.Button; @@ -48,8 +49,6 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; import java.util.List; -import static io.bitsquare.gui.util.FormBuilder.*; - public class ContractWindow extends Overlay { protected static final Logger log = LoggerFactory.getLogger(ContractWindow.class); @@ -114,28 +113,28 @@ public class ContractWindow extends Overlay { rows++; PaymentAccountContractData sellerPaymentAccountContractData = contract.getSellerPaymentAccountContractData(); - addTitledGroupBg(gridPane, ++rowIndex, rows, Res.get("contractWindow.title")); - addLabelTextFieldWithCopyIcon(gridPane, rowIndex, Res.getWithCol("shared.offerId"), offer.getId(), + FormBuilder.addTitledGroupBg(gridPane, ++rowIndex, rows, Res.get("contractWindow.title")); + FormBuilder.addLabelTextFieldWithCopyIcon(gridPane, rowIndex, Res.getWithCol("shared.offerId"), offer.getId(), Layout.FIRST_ROW_DISTANCE).second.setMouseTransparent(false); - addLabelTextField(gridPane, ++rowIndex, Res.get("contractWindow.dates"), formatter.formatDateTime(offer.getDate()) + " / " + formatter.formatDateTime(dispute.getTradeDate())); + FormBuilder.addLabelTextField(gridPane, ++rowIndex, Res.get("contractWindow.dates"), formatter.formatDateTime(offer.getDate()) + " / " + formatter.formatDateTime(dispute.getTradeDate())); String currencyCode = offer.getCurrencyCode(); - addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.offerType"), formatter.getDirectionBothSides(offer.getDirection(), currencyCode)); - addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.tradePrice"), formatter.formatPrice(contract.getTradePrice())); - addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.tradeAmount"), formatter.formatCoinWithCode(contract.getTradeAmount())); - addLabelTextField(gridPane, ++rowIndex, formatter.formatVolumeLabel(currencyCode, ":"), + FormBuilder.addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.offerType"), formatter.getDirectionBothSides(offer.getDirection(), currencyCode)); + FormBuilder.addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.tradePrice"), formatter.formatPrice(contract.getTradePrice())); + FormBuilder.addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.tradeAmount"), formatter.formatCoinWithCode(contract.getTradeAmount())); + FormBuilder.addLabelTextField(gridPane, ++rowIndex, formatter.formatVolumeLabel(currencyCode, ":"), formatter.formatVolumeWithCode(new ExchangeRate(contract.getTradePrice()).coinToFiat(contract.getTradeAmount()))); - addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("contractWindow.btcAddresses"), + FormBuilder.addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("contractWindow.btcAddresses"), contract.getBuyerPayoutAddressString() + " / " + contract.getSellerPayoutAddressString()).second.setMouseTransparent(false); - addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("contractWindow.onions"), contract.getBuyerNodeAddress().getFullAddress() + " / " + contract.getSellerNodeAddress().getFullAddress()); + FormBuilder.addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("contractWindow.onions"), contract.getBuyerNodeAddress().getFullAddress() + " / " + contract.getSellerNodeAddress().getFullAddress()); - addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("contractWindow.numDisputes"), disputeManager.getNrOfDisputes(true, contract) + " / " + disputeManager.getNrOfDisputes(false, contract)); + FormBuilder.addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("contractWindow.numDisputes"), disputeManager.getNrOfDisputes(true, contract) + " / " + disputeManager.getNrOfDisputes(false, contract)); - addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("shared.paymentDetails", Res.get("shared.buyer")), + FormBuilder.addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("shared.paymentDetails", Res.get("shared.buyer")), Res.get(contract.getBuyerPaymentAccountContractData().getPaymentDetails())).second.setMouseTransparent(false); - addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("shared.paymentDetails", Res.get("shared.seller")), + FormBuilder.addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("shared.paymentDetails", Res.get("shared.seller")), Res.get(sellerPaymentAccountContractData.getPaymentDetails())).second.setMouseTransparent(false); - addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("shared.arbitrator"), contract.arbitratorNodeAddress.getFullAddress()); + FormBuilder.addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("shared.arbitrator"), contract.arbitratorNodeAddress.getFullAddress()); if (showAcceptedCountryCodes) { String countries; @@ -146,34 +145,34 @@ public class ContractWindow extends Overlay { countries = CountryUtil.getCodesString(acceptedCountryCodes); tooltip = new Tooltip(CountryUtil.getNamesByCodesString(acceptedCountryCodes)); } - TextField acceptedCountries = addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.acceptedTakerCountries"), countries).second; + TextField acceptedCountries = FormBuilder.addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.acceptedTakerCountries"), countries).second; if (tooltip != null) acceptedCountries.setTooltip(new Tooltip()); } if (showAcceptedBanks) { if (offer.getPaymentMethod().equals(PaymentMethod.SAME_BANK)) { - addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.bankName"), acceptedBanks.get(0)); + FormBuilder.addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.bankName"), acceptedBanks.get(0)); } else if (offer.getPaymentMethod().equals(PaymentMethod.SPECIFIC_BANKS)) { String value = Joiner.on(", ").join(acceptedBanks); Tooltip tooltip = new Tooltip(Res.getWithCol("shared.acceptedBanks") + value); - TextField acceptedBanksTextField = addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.acceptedBanks"), value).second; + TextField acceptedBanksTextField = FormBuilder.addLabelTextField(gridPane, ++rowIndex, Res.getWithCol("shared.acceptedBanks"), value).second; acceptedBanksTextField.setMouseTransparent(false); acceptedBanksTextField.setTooltip(tooltip); } } - addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerFeeTxId"), offer.getOfferFeePaymentTxID()); - addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.takerFeeTxId"), contract.takeOfferFeeTxID); + FormBuilder.addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerFeeTxId"), offer.getOfferFeePaymentTxID()); + FormBuilder.addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.takerFeeTxId"), contract.takeOfferFeeTxID); if (dispute.getDepositTxSerialized() != null) - addLabelTxIdTextField(gridPane, ++rowIndex, Res.getWithCol("shared.depositTransactionId"), dispute.getDepositTxId()); + FormBuilder.addLabelTxIdTextField(gridPane, ++rowIndex, Res.getWithCol("shared.depositTransactionId"), dispute.getDepositTxId()); if (dispute.getPayoutTxSerialized() != null) - addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.payoutTxId"), dispute.getPayoutTxId()); + FormBuilder.addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.payoutTxId"), dispute.getPayoutTxId()); - addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("contractWindow.contractHash"), + FormBuilder.addLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("contractWindow.contractHash"), Utils.HEX.encode(dispute.getContractHash())).second.setMouseTransparent(false); if (contract != null) { - Button viewContractButton = addLabelButton(gridPane, ++rowIndex, Res.get("shared.contractAsJson"), + Button viewContractButton = FormBuilder.addLabelButton(gridPane, ++rowIndex, Res.get("shared.contractAsJson"), Res.get("shared.viewContractAsJson"), 0).second; viewContractButton.setDefaultButton(false); viewContractButton.setOnAction(e -> { @@ -203,7 +202,7 @@ public class ContractWindow extends Overlay { }); } - Button closeButton = addButtonAfterGroup(gridPane, ++rowIndex, Res.get("shared.close")); + Button closeButton = FormBuilder.addButtonAfterGroup(gridPane, ++rowIndex, Res.get("shared.close")); //TODO app wide focus //closeButton.requestFocus(); closeButton.setOnAction(e -> { diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisplayAlertMessageWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/DisplayAlertMessageWindow.java similarity index 85% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisplayAlertMessageWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/DisplayAlertMessageWindow.java index b223ca8a08..cd30fd3caf 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisplayAlertMessageWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/DisplayAlertMessageWindow.java @@ -15,12 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.alert.Alert; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.util.FormBuilder; +import io.bisq.locale.Res; +import io.bisq.messages.alert.Alert; import javafx.geometry.Insets; import javafx.scene.control.Button; import javafx.scene.layout.GridPane; @@ -28,8 +29,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; -import static io.bitsquare.gui.util.FormBuilder.addLabelHyperlinkWithIcon; -import static io.bitsquare.gui.util.FormBuilder.addMultilineLabel; public class DisplayAlertMessageWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(DisplayAlertMessageWindow.class); @@ -67,12 +66,12 @@ public class DisplayAlertMessageWindow extends Overlay. */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.arbitration.DisputeManager; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.exceptions.TransactionVerificationException; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.btc.wallet.TradeWalletService; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.gui.util.Transitions; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.arbitration.Dispute; -import io.bitsquare.messages.arbitration.DisputeResult; -import io.bitsquare.messages.trade.payload.Contract; +import io.bisq.arbitration.DisputeManager; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.exceptions.TransactionVerificationException; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.btc.wallet.TradeWalletService; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.Layout; +import io.bisq.gui.util.Transitions; +import io.bisq.locale.Res; +import io.bisq.messages.arbitration.Dispute; +import io.bisq.messages.arbitration.DisputeResult; +import io.bisq.messages.trade.payload.Contract; import javafx.beans.binding.Bindings; import javafx.beans.binding.ObjectBinding; import javafx.beans.value.ChangeListener; @@ -57,7 +57,7 @@ import java.util.Date; import java.util.Optional; import java.util.concurrent.TimeUnit; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; public class DisputeSummaryWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(DisputeSummaryWindow.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/EmptyWalletWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/EmptyWalletWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java index b332262192..b5c80d3515 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/EmptyWalletWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java @@ -15,20 +15,20 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.app.DevEnv; -import io.bitsquare.btc.wallet.WalletService; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.Transitions; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.btc.Restrictions; -import io.bitsquare.trade.offer.OpenOfferManager; +import io.bisq.app.DevEnv; +import io.bisq.btc.wallet.WalletService; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.Transitions; +import io.bisq.locale.Res; +import io.bisq.messages.btc.Restrictions; +import io.bisq.trade.offer.OpenOfferManager; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.Button; @@ -47,7 +47,7 @@ import org.spongycastle.crypto.params.KeyParameter; import javax.inject.Inject; import java.util.concurrent.TimeUnit; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; public class EmptyWalletWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(EmptyWalletWindow.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/EnterPrivKeyWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/EnterPrivKeyWindow.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/EnterPrivKeyWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/EnterPrivKeyWindow.java index 3b86e0b0a0..334e442c4a 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/EnterPrivKeyWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/EnterPrivKeyWindow.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.app.DevEnv; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.locale.Res; +import io.bisq.app.DevEnv; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.locale.Res; import javafx.beans.value.ChangeListener; import javafx.geometry.Insets; import javafx.scene.Scene; diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/FilterWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/FilterWindow.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/FilterWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/FilterWindow.java index ccadd58f9a..4a1f0c34f0 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/FilterWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/FilterWindow.java @@ -15,16 +15,16 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.app.DevEnv; -import io.bitsquare.filter.FilterManager; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.filter.payload.Filter; -import io.bitsquare.messages.filter.payload.PaymentAccountFilter; +import io.bisq.app.DevEnv; +import io.bisq.filter.FilterManager; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.locale.Res; +import io.bisq.messages.filter.payload.Filter; +import io.bisq.messages.filter.payload.PaymentAccountFilter; import javafx.geometry.HPos; import javafx.geometry.Insets; import javafx.scene.Scene; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.stream.Collectors; -import static io.bitsquare.gui.util.FormBuilder.addLabelInputTextField; +import static io.bisq.gui.util.FormBuilder.addLabelInputTextField; public class FilterWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(FilterWindow.class); @@ -110,6 +110,7 @@ public class FilterWindow extends Overlay { }); } } + private void addContent() { InputTextField keyInputTextField = addLabelInputTextField(gridPane, ++rowIndex, Res.get("shared.unlock"), 10).second; if (DevEnv.USE_DEV_PRIVILEGE_KEYS) diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java index 810a71229d..231e6f0eb4 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java @@ -15,29 +15,29 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; import com.google.common.base.Joiner; -import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.components.BusyAnimation; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.account.AccountView; -import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView; -import io.bitsquare.gui.main.account.settings.AccountSettingsView; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.BankUtil; -import io.bitsquare.messages.locale.CountryUtil; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.payment.PaymentAccount; -import io.bitsquare.user.User; +import io.bisq.common.crypto.KeyRing; +import io.bisq.common.util.Tuple3; +import io.bisq.gui.Navigation; +import io.bisq.gui.components.BusyAnimation; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.account.AccountView; +import io.bisq.gui.main.account.content.arbitratorselection.ArbitratorSelectionView; +import io.bisq.gui.main.account.settings.AccountSettingsView; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.locale.BankUtil; +import io.bisq.messages.locale.CountryUtil; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; +import io.bisq.payment.PaymentAccount; +import io.bisq.user.User; import javafx.geometry.Insets; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -53,7 +53,7 @@ import javax.inject.Inject; import java.util.List; import java.util.Optional; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; public class OfferDetailsWindow extends Overlay { protected static final Logger log = LoggerFactory.getLogger(OfferDetailsWindow.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/QRCodeWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/QRCodeWindow.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/QRCodeWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/QRCodeWindow.java index b330cfbe14..1f0ef914f9 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/QRCodeWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/QRCodeWindow.java @@ -1,7 +1,7 @@ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.locale.Res; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.locale.Res; import javafx.geometry.HPos; import javafx.geometry.Insets; import javafx.scene.control.Label; diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SelectDepositTxWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/SelectDepositTxWindow.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SelectDepositTxWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/SelectDepositTxWindow.java index 45938d06c3..63400cb12b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SelectDepositTxWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/SelectDepositTxWindow.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.locale.Res; +import io.bisq.common.util.Tuple2; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.locale.Res; import javafx.collections.FXCollections; import javafx.geometry.Insets; import javafx.scene.control.ComboBox; @@ -35,8 +35,8 @@ import java.util.List; import java.util.Optional; import java.util.function.Consumer; -import static io.bitsquare.gui.util.FormBuilder.addLabelComboBox; -import static io.bitsquare.gui.util.FormBuilder.addMultilineLabel; +import static io.bisq.gui.util.FormBuilder.addLabelComboBox; +import static io.bisq.gui.util.FormBuilder.addMultilineLabel; public class SelectDepositTxWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(SelectDepositTxWindow.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/SendAlertMessageWindow.java similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/SendAlertMessageWindow.java index afb12f2333..d7c016a0e5 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/SendAlertMessageWindow.java @@ -15,15 +15,15 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.app.DevEnv; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.alert.Alert; +import io.bisq.app.DevEnv; +import io.bisq.common.util.Tuple2; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.locale.Res; +import io.bisq.messages.alert.Alert; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.Button; @@ -36,7 +36,7 @@ import javafx.scene.layout.HBox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; public class SendAlertMessageWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(SendAlertMessageWindow.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendPrivateNotificationWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendPrivateNotificationWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java index 0b5db1eb33..96e5537b77 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendPrivateNotificationWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java @@ -15,18 +15,18 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.app.DevEnv; -import io.bitsquare.common.crypto.PubKeyRing; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.alert.PrivateNotification; -import io.bitsquare.p2p.NodeAddress; -import io.bitsquare.p2p.messaging.SendMailboxMessageListener; +import io.bisq.app.DevEnv; +import io.bisq.common.crypto.PubKeyRing; +import io.bisq.common.util.Tuple2; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.locale.Res; +import io.bisq.messages.alert.PrivateNotification; +import io.bisq.p2p.NodeAddress; +import io.bisq.p2p.messaging.SendMailboxMessageListener; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.Button; @@ -38,8 +38,8 @@ import javafx.scene.layout.HBox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static io.bitsquare.gui.util.FormBuilder.addLabelInputTextField; -import static io.bitsquare.gui.util.FormBuilder.addLabelTextArea; +import static io.bisq.gui.util.FormBuilder.addLabelInputTextField; +import static io.bisq.gui.util.FormBuilder.addLabelTextArea; public class SendPrivateNotificationWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(SendPrivateNotificationWindow.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ShowWalletDataWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/ShowWalletDataWindow.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ShowWalletDataWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/ShowWalletDataWindow.java index 4a4cba5370..62366ac403 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ShowWalletDataWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/ShowWalletDataWindow.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.btc.wallet.WalletsManager; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.locale.Res; +import io.bisq.btc.wallet.WalletsManager; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Utilities; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.locale.Res; import javafx.scene.Scene; import javafx.scene.control.CheckBox; import javafx.scene.control.Label; @@ -30,8 +30,8 @@ import javafx.scene.input.KeyCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static io.bitsquare.gui.util.FormBuilder.addLabelCheckBox; -import static io.bitsquare.gui.util.FormBuilder.addLabelTextArea; +import static io.bisq.gui.util.FormBuilder.addLabelCheckBox; +import static io.bisq.gui.util.FormBuilder.addLabelTextArea; public class ShowWalletDataWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(ShowWalletDataWindow.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SpendFromDepositTxWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/SpendFromDepositTxWindow.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SpendFromDepositTxWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/SpendFromDepositTxWindow.java index b65a978d21..1577160bcf 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SpendFromDepositTxWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/SpendFromDepositTxWindow.java @@ -15,16 +15,16 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; import com.google.common.util.concurrent.FutureCallback; -import io.bitsquare.btc.exceptions.TransactionVerificationException; -import io.bitsquare.btc.exceptions.WalletException; -import io.bitsquare.btc.wallet.TradeWalletService; -import io.bitsquare.common.UserThread; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.main.overlays.popups.Popup; +import io.bisq.btc.exceptions.TransactionVerificationException; +import io.bisq.btc.exceptions.WalletException; +import io.bisq.btc.wallet.TradeWalletService; +import io.bisq.common.UserThread; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.popups.Popup; import javafx.scene.Scene; import javafx.scene.input.KeyCode; import org.bitcoinj.core.AddressFormatException; @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; import javax.annotation.Nullable; -import static io.bitsquare.gui.util.FormBuilder.addLabelInputTextField; +import static io.bisq.gui.util.FormBuilder.addLabelInputTextField; // We dont translate here as it is for dev only purpose public class SpendFromDepositTxWindow extends Overlay { @@ -91,7 +91,7 @@ public class SpendFromDepositTxWindow extends Overlay InputTextField sellerPayoutAmount = addLabelInputTextField(gridPane, ++rowIndex, "sellerPayoutAmount:").second; InputTextField arbitratorPayoutAmount = addLabelInputTextField(gridPane, ++rowIndex, "arbitratorPayoutAmount:").second; InputTextField txFee = addLabelInputTextField(gridPane, ++rowIndex, "Tx fee:").second; - + InputTextField buyerAddressString = addLabelInputTextField(gridPane, ++rowIndex, "buyerAddressString:").second; InputTextField sellerAddressString = addLabelInputTextField(gridPane, ++rowIndex, "sellerAddressString:").second; InputTextField arbitratorAddressString = addLabelInputTextField(gridPane, ++rowIndex, "arbitratorAddressString:").second; @@ -106,7 +106,7 @@ public class SpendFromDepositTxWindow extends Overlay InputTextField P2SHMultiSigOutputScript = addLabelInputTextField(gridPane, ++rowIndex, "P2SHMultiSigOutputScript:").second; - + // Notes: // Open with alt+g and enable DEV mode // Priv key is only visible if pw protection is removed (wallet details data (alt+j)) @@ -115,7 +115,7 @@ public class SpendFromDepositTxWindow extends Overlay // Lookup sellerPrivateKeyAsHex associated with sellerPubKeyAsHex (or buyers) in wallet details data // sellerPubKeys/buyerPubKeys are auto generated if used the fields below // Never set the priv arbitr. key here! - + depositTxHex.setText(""); buyerPayoutAmount.setText("0.51"); @@ -135,8 +135,8 @@ public class SpendFromDepositTxWindow extends Overlay // arbitratorPubKeyAsHex.setText("02c62e794fe67f3a2115e2de4757143ff7f27bdf38aa4ae58a3595baa6d676875b"); // 4.2 - arbitratorAddressString.setText("1FdFzBazmHQxbUbdCUJwuCtR37DrZrEobu"); - arbitratorPubKeyAsHex.setText("030fdc2ebc297df4047442f6079f1ce3b7d1938a41f88bd11497545cc94fcfd315"); + arbitratorAddressString.setText("1FdFzBazmHQxbUbdCUJwuCtR37DrZrEobu"); + arbitratorPubKeyAsHex.setText("030fdc2ebc297df4047442f6079f1ce3b7d1938a41f88bd11497545cc94fcfd315"); P2SHMultiSigOutputScript.setText(""); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java index 1af9e57937..e29e65b7dd 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java @@ -1,15 +1,15 @@ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; import com.google.inject.Inject; -import io.bitsquare.app.BitsquareApp; -import io.bitsquare.app.DevEnv; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; +import io.bisq.app.BitsquareApp; +import io.bisq.app.DevEnv; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static io.bitsquare.gui.util.FormBuilder.addHyperlinkWithIcon; +import static io.bisq.gui.util.FormBuilder.addHyperlinkWithIcon; public class TacWindow extends Overlay { private static final Logger log = LoggerFactory.getLogger(TacWindow.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/TradeDetailsWindow.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/TradeDetailsWindow.java index 306a20414d..f5c1287320 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/TradeDetailsWindow.java @@ -15,20 +15,20 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; -import io.bitsquare.arbitration.DisputeManager; -import io.bitsquare.gui.components.TextFieldWithCopyIcon; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.payment.payload.PaymentAccountContractData; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.trade.payload.Contract; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.TradeManager; +import io.bisq.arbitration.DisputeManager; +import io.bisq.gui.components.TextFieldWithCopyIcon; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.payment.payload.PaymentAccountContractData; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.trade.payload.Contract; +import io.bisq.trade.Trade; +import io.bisq.trade.TradeManager; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.value.ChangeListener; @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; public class TradeDetailsWindow extends Overlay { protected static final Logger log = LoggerFactory.getLogger(TradeDetailsWindow.class); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/WalletPasswordWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/overlays/windows/WalletPasswordWindow.java rename to gui/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java index 35b10b338e..238fa985b7 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/WalletPasswordWindow.java +++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java @@ -15,20 +15,20 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.overlays.windows; +package io.bisq.gui.main.overlays.windows; import com.google.common.base.Splitter; -import io.bitsquare.btc.wallet.WalletsManager; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.crypto.ScryptUtil; -import io.bitsquare.gui.components.BusyAnimation; -import io.bitsquare.gui.components.PasswordTextField; -import io.bitsquare.gui.main.overlays.Overlay; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.Transitions; -import io.bitsquare.gui.util.validation.PasswordValidator; -import io.bitsquare.locale.Res; +import io.bisq.btc.wallet.WalletsManager; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.crypto.ScryptUtil; +import io.bisq.gui.components.BusyAnimation; +import io.bisq.gui.components.PasswordTextField; +import io.bisq.gui.main.overlays.Overlay; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.Transitions; +import io.bisq.gui.util.validation.PasswordValidator; +import io.bisq.locale.Res; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ChangeListener; @@ -60,7 +60,7 @@ import java.time.ZoneOffset; import java.util.concurrent.TimeUnit; import static com.google.inject.internal.util.$Preconditions.checkArgument; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; import static javafx.beans.binding.Bindings.createBooleanBinding; public class WalletPasswordWindow extends Overlay { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml b/gui/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.fxml similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml rename to gui/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.fxml index 0344d145b0..fe3d225143 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.java index fa78c1dd48..561caf13b6 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.java @@ -15,19 +15,19 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio; +package io.bisq.gui.main.portfolio; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.Activatable; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView; -import io.bitsquare.gui.main.portfolio.failedtrades.FailedTradesView; -import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView; -import io.bitsquare.locale.Res; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.failed.FailedTradesManager; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.Activatable; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.portfolio.closedtrades.ClosedTradesView; +import io.bisq.gui.main.portfolio.failedtrades.FailedTradesView; +import io.bisq.gui.main.portfolio.openoffer.OpenOffersView; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesView; +import io.bisq.locale.Res; +import io.bisq.trade.Trade; +import io.bisq.trade.failed.FailedTradesManager; import javafx.beans.value.ChangeListener; import javafx.collections.ListChangeListener; import javafx.fxml.FXML; @@ -62,7 +62,7 @@ public class PortfolioView extends ActivatableViewAndModel openOffersTab.setText(Res.get("portfolio.tab.openOffers")); pendingTradesTab.setText(Res.get("portfolio.tab.pendingTrades")); closedTradesTab.setText(Res.get("portfolio.tab.history")); - + navigationListener = viewPath -> { if (viewPath.size() == 3 && viewPath.indexOf(PortfolioView.class) == 1) loadView(viewPath.tip()); diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradableListItem.java b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradableListItem.java similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradableListItem.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradableListItem.java index 5b263d0d5f..afc470f5df 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradableListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradableListItem.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.closedtrades; +package io.bisq.gui.main.portfolio.closedtrades; -import io.bitsquare.trade.Tradable; +import io.bisq.trade.Tradable; /** * We could remove that wrapper if it is not needed for additional UI only fields. diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java index f794c2a857..373e8e9b58 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.closedtrades; +package io.bisq.gui.main.portfolio.closedtrades; import com.google.inject.Inject; -import io.bitsquare.gui.common.model.ActivatableDataModel; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.trade.Tradable; -import io.bitsquare.trade.closed.ClosedTradableManager; +import io.bisq.gui.common.model.ActivatableDataModel; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.trade.Tradable; +import io.bisq.trade.closed.ClosedTradableManager; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml rename to gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml index 8375cd98f9..4a3d4a226f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java index a8d58a82ae..28fcc13273 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java @@ -15,22 +15,22 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.closedtrades; +package io.bisq.gui.main.portfolio.closedtrades; import com.googlecode.jcsv.writer.CSVEntryConverter; -import io.bitsquare.alert.PrivateNotificationManager; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.components.PeerInfoIcon; -import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow; -import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow; -import io.bitsquare.gui.util.GUIUtil; -import io.bitsquare.locale.Res; -import io.bitsquare.p2p.NodeAddress; -import io.bitsquare.trade.Tradable; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.offer.OpenOffer; +import io.bisq.alert.PrivateNotificationManager; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.components.PeerInfoIcon; +import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; +import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; +import io.bisq.gui.util.GUIUtil; +import io.bisq.locale.Res; +import io.bisq.p2p.NodeAddress; +import io.bisq.trade.Tradable; +import io.bisq.trade.Trade; +import io.bisq.trade.offer.OpenOffer; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.ObservableList; import javafx.collections.transformation.SortedList; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java index fbccbed2b4..9df0b2b141 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java @@ -15,16 +15,16 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.closedtrades; +package io.bisq.gui.main.portfolio.closedtrades; import com.google.inject.Inject; -import io.bitsquare.gui.common.model.ActivatableWithDataModel; -import io.bitsquare.gui.common.model.ViewModel; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; -import io.bitsquare.trade.Tradable; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.offer.OpenOffer; +import io.bisq.gui.common.model.ActivatableWithDataModel; +import io.bisq.gui.common.model.ViewModel; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; +import io.bisq.trade.Tradable; +import io.bisq.trade.Trade; +import io.bisq.trade.offer.OpenOffer; import javafx.collections.ObservableList; import java.util.stream.Collectors; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesDataModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesDataModel.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesDataModel.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesDataModel.java index b2e9660bf5..bb32d24248 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesDataModel.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.failedtrades; +package io.bisq.gui.main.portfolio.failedtrades; import com.google.inject.Inject; -import io.bitsquare.gui.common.model.ActivatableDataModel; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.failed.FailedTradesManager; +import io.bisq.gui.common.model.ActivatableDataModel; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.trade.Trade; +import io.bisq.trade.failed.FailedTradesManager; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesListItem.java b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesListItem.java similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesListItem.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesListItem.java index 09c011b5b8..e3ae15555e 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesListItem.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.failedtrades; +package io.bisq.gui.main.portfolio.failedtrades; -import io.bitsquare.trade.Trade; +import io.bisq.trade.Trade; /** * We could remove that wrapper if it is not needed for additional UI only fields. diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.fxml b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.fxml rename to gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml index 917effaab3..bb427766a5 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.java index 225e2a0d6e..d656b2ffcd 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.failedtrades; +package io.bisq.gui.main.portfolio.failedtrades; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow; -import io.bitsquare.locale.Res; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; +import io.bisq.locale.Res; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.transformation.SortedList; import javafx.fxml.FXML; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java similarity index 92% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java index 06f50146f8..b2605c9a14 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.failedtrades; +package io.bisq.gui.main.portfolio.failedtrades; import com.google.inject.Inject; -import io.bitsquare.gui.common.model.ActivatableWithDataModel; -import io.bitsquare.gui.common.model.ViewModel; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; +import io.bisq.gui.common.model.ActivatableWithDataModel; +import io.bisq.gui.common.model.ViewModel; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; import javafx.collections.ObservableList; class FailedTradesViewModel extends ActivatableWithDataModel implements ViewModel { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOfferListItem.java similarity index 87% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOfferListItem.java index 19c2f0577b..934ed4b5ba 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOfferListItem.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.openoffer; +package io.bisq.gui.main.portfolio.openoffer; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.trade.offer.OpenOffer; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.trade.offer.OpenOffer; /** * We could remove that wrapper if it is not needed for additional UI only fields. diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersDataModel.java similarity index 87% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersDataModel.java index e609704355..f4cf0365be 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersDataModel.java @@ -15,16 +15,16 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.openoffer; +package io.bisq.gui.main.portfolio.openoffer; import com.google.inject.Inject; -import io.bitsquare.common.handlers.ErrorMessageHandler; -import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.gui.common.model.ActivatableDataModel; -import io.bitsquare.messages.provider.price.PriceFeedService; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.trade.offer.OpenOffer; -import io.bitsquare.trade.offer.OpenOfferManager; +import io.bisq.common.handlers.ErrorMessageHandler; +import io.bisq.common.handlers.ResultHandler; +import io.bisq.gui.common.model.ActivatableDataModel; +import io.bisq.messages.provider.price.PriceFeedService; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.trade.offer.OpenOffer; +import io.bisq.trade.offer.OpenOfferManager; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml rename to gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml index b3bc757af5..b4d56dec1b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java index 01e879c509..800498bb7e 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java @@ -15,20 +15,20 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.openoffer; +package io.bisq.gui.main.portfolio.openoffer; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.funds.FundsView; -import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.trade.offer.OpenOffer; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.funds.FundsView; +import io.bisq.gui.main.funds.withdrawal.WithdrawalView; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.OfferDetailsWindow; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; +import io.bisq.trade.offer.OpenOffer; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.transformation.SortedList; import javafx.fxml.FXML; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java similarity index 86% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java index 9bbcd62309..b93a342dd1 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java @@ -15,18 +15,18 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.openoffer; +package io.bisq.gui.main.portfolio.openoffer; import com.google.inject.Inject; -import io.bitsquare.common.handlers.ErrorMessageHandler; -import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.gui.common.model.ActivatableWithDataModel; -import io.bitsquare.gui.common.model.ViewModel; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.trade.offer.OpenOffer; +import io.bisq.common.handlers.ErrorMessageHandler; +import io.bisq.common.handlers.ResultHandler; +import io.bisq.gui.common.model.ActivatableWithDataModel; +import io.bisq.gui.common.model.ViewModel; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.p2p.P2PService; +import io.bisq.trade.offer.OpenOffer; import javafx.collections.ObservableList; import org.bitcoinj.utils.Fiat; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/BuyerSubView.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/BuyerSubView.java index cf89091a85..46f91af9ba 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/BuyerSubView.java @@ -15,12 +15,12 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades; +package io.bisq.gui.main.portfolio.pendingtrades; -import io.bitsquare.app.Log; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.buyer.*; -import io.bitsquare.locale.Res; +import io.bisq.app.Log; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeWizardItem; +import io.bisq.gui.main.portfolio.pendingtrades.steps.buyer.*; +import io.bisq.locale.Res; import org.fxmisc.easybind.EasyBind; public class BuyerSubView extends TradeSubView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java index cac87281b9..1c89baf151 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java @@ -15,39 +15,39 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades; +package io.bisq.gui.main.portfolio.pendingtrades; import com.google.inject.Inject; -import io.bitsquare.app.Log; -import io.bitsquare.arbitration.DisputeAlreadyOpenException; -import io.bitsquare.arbitration.DisputeManager; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.btc.wallet.TradeWalletService; -import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.common.handlers.ErrorMessageHandler; -import io.bitsquare.common.handlers.FaultHandler; -import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.ActivatableDataModel; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.disputes.DisputesView; -import io.bitsquare.gui.main.overlays.notifications.NotificationCenter; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.SelectDepositTxWindow; -import io.bitsquare.gui.main.overlays.windows.WalletPasswordWindow; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.arbitration.Arbitrator; -import io.bitsquare.messages.arbitration.Dispute; -import io.bitsquare.messages.btc.provider.fee.FeeService; -import io.bitsquare.messages.payment.payload.PaymentAccountContractData; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.trade.BuyerTrade; -import io.bitsquare.trade.SellerTrade; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.TradeManager; -import io.bitsquare.user.User; +import io.bisq.app.Log; +import io.bisq.arbitration.DisputeAlreadyOpenException; +import io.bisq.arbitration.DisputeManager; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.btc.wallet.TradeWalletService; +import io.bisq.common.crypto.KeyRing; +import io.bisq.common.handlers.ErrorMessageHandler; +import io.bisq.common.handlers.FaultHandler; +import io.bisq.common.handlers.ResultHandler; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.ActivatableDataModel; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.disputes.DisputesView; +import io.bisq.gui.main.overlays.notifications.NotificationCenter; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.SelectDepositTxWindow; +import io.bisq.gui.main.overlays.windows.WalletPasswordWindow; +import io.bisq.locale.Res; +import io.bisq.messages.arbitration.Arbitrator; +import io.bisq.messages.arbitration.Dispute; +import io.bisq.messages.btc.provider.fee.FeeService; +import io.bisq.messages.payment.payload.PaymentAccountContractData; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; +import io.bisq.p2p.P2PService; +import io.bisq.trade.BuyerTrade; +import io.bisq.trade.SellerTrade; +import io.bisq.trade.Trade; +import io.bisq.trade.TradeManager; +import io.bisq.user.User; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesListItem.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesListItem.java index ba283e21eb..0047f7a07b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesListItem.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades; +package io.bisq.gui.main.portfolio.pendingtrades; -import io.bitsquare.trade.Trade; +import io.bisq.trade.Trade; import javafx.beans.property.ReadOnlyObjectProperty; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.fxml similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.fxml index 1bc0462196..4404a7b7a8 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.fxml @@ -20,7 +20,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java index 3af938d2fe..96a8f2ca9a 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java @@ -15,18 +15,18 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades; +package io.bisq.gui.main.portfolio.pendingtrades; -import io.bitsquare.alert.PrivateNotificationManager; -import io.bitsquare.common.UserThread; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.components.PeerInfoIcon; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; +import io.bisq.alert.PrivateNotificationManager; +import io.bisq.common.UserThread; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.components.PeerInfoIcon; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.overlays.windows.TradeDetailsWindow; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.collections.transformation.SortedList; import javafx.event.EventHandler; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java index 1d186d4fbf..f3470f60cc 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java @@ -15,23 +15,23 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades; +package io.bisq.gui.main.portfolio.pendingtrades; import com.google.inject.Inject; -import io.bitsquare.app.Log; -import io.bitsquare.common.Clock; -import io.bitsquare.gui.common.model.ActivatableWithDataModel; -import io.bitsquare.gui.common.model.ViewModel; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.validation.BtcAddressValidator; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.trade.payload.Contract; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.trade.Trade; -import io.bitsquare.trade.closed.ClosedTradableManager; -import io.bitsquare.user.User; +import io.bisq.app.Log; +import io.bisq.common.Clock; +import io.bisq.gui.common.model.ActivatableWithDataModel; +import io.bisq.gui.common.model.ViewModel; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.validation.BtcAddressValidator; +import io.bisq.locale.Res; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.trade.payload.Contract; +import io.bisq.p2p.P2PService; +import io.bisq.trade.Trade; +import io.bisq.trade.closed.ClosedTradableManager; +import io.bisq.user.User; import javafx.beans.property.*; import javafx.beans.value.ChangeListener; import org.bitcoinj.core.BlockChainListener; @@ -41,7 +41,7 @@ import org.fxmisc.easybind.Subscription; import java.util.Date; import java.util.stream.Collectors; -import static io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel.SellerState.*; +import static io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel.SellerState.*; public class PendingTradesViewModel extends ActivatableWithDataModel implements ViewModel { private Subscription tradeStateSubscription; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/SellerSubView.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/SellerSubView.java index 4b14656a9a..05166dabbb 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/SellerSubView.java @@ -15,12 +15,12 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades; +package io.bisq.gui.main.portfolio.pendingtrades; -import io.bitsquare.app.Log; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.seller.*; -import io.bitsquare.locale.Res; +import io.bisq.app.Log; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeWizardItem; +import io.bisq.gui.main.portfolio.pendingtrades.steps.seller.*; +import io.bisq.locale.Res; import org.fxmisc.easybind.EasyBind; public class SellerSubView extends TradeSubView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/TradeSubView.java similarity index 86% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/TradeSubView.java index cbe881f154..559bb543c8 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/TradeSubView.java @@ -15,13 +15,14 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades; +package io.bisq.gui.main.portfolio.pendingtrades; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeWizardItem; +import io.bisq.gui.util.FormBuilder; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; import javafx.geometry.Insets; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -30,8 +31,6 @@ import org.fxmisc.easybind.Subscription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static io.bitsquare.gui.util.FormBuilder.*; - public abstract class TradeSubView extends HBox { protected final Logger log = LoggerFactory.getLogger(this.getClass()); @@ -87,13 +86,13 @@ public abstract class TradeSubView extends HBox { leftVBox.getChildren().add(leftGridPane); leftGridPaneRowIndex = 0; - tradeProcessTitledGroupBg = addTitledGroupBg(leftGridPane, leftGridPaneRowIndex, 1, Res.get("portfolio.pending.tradeProcess")); + tradeProcessTitledGroupBg = FormBuilder.addTitledGroupBg(leftGridPane, leftGridPaneRowIndex, 1, Res.get("portfolio.pending.tradeProcess")); addWizards(); - TitledGroupBg noticeTitledGroupBg = addTitledGroupBg(leftGridPane, leftGridPaneRowIndex, 1, "", Layout.GROUP_DISTANCE); - Label label = addMultilineLabel(leftGridPane, leftGridPaneRowIndex, "", Layout.FIRST_ROW_AND_GROUP_DISTANCE); - openDisputeButton = addButtonAfterGroup(leftGridPane, ++leftGridPaneRowIndex, Res.get("portfolio.pending.openDispute")); + TitledGroupBg noticeTitledGroupBg = FormBuilder.addTitledGroupBg(leftGridPane, leftGridPaneRowIndex, 1, "", Layout.GROUP_DISTANCE); + Label label = FormBuilder.addMultilineLabel(leftGridPane, leftGridPaneRowIndex, "", Layout.FIRST_ROW_AND_GROUP_DISTANCE); + openDisputeButton = FormBuilder.addButtonAfterGroup(leftGridPane, ++leftGridPaneRowIndex, Res.get("portfolio.pending.openDispute")); GridPane.setColumnIndex(openDisputeButton, 0); openDisputeButton.setId("open-dispute-button"); diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java index 649f0ccdff..5896c5e902 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java @@ -15,21 +15,21 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps; +package io.bisq.gui.main.portfolio.pendingtrades.steps; -import io.bitsquare.app.Log; -import io.bitsquare.common.Clock; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.components.TxIdTextField; -import io.bitsquare.gui.components.paymentmethods.PaymentMethodForm; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.TradeSubView; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.arbitration.Dispute; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.trade.Trade; +import io.bisq.app.Log; +import io.bisq.common.Clock; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.components.TxIdTextField; +import io.bisq.gui.components.paymentmethods.PaymentMethodForm; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.TradeSubView; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.arbitration.Dispute; +import io.bisq.messages.user.Preferences; +import io.bisq.trade.Trade; import javafx.beans.value.ChangeListener; import javafx.scene.control.ProgressBar; import javafx.scene.control.TextField; @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; import java.util.Optional; import static com.google.common.base.Preconditions.checkNotNull; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; public abstract class TradeStepView extends AnchorPane { protected final Logger log = LoggerFactory.getLogger(this.getClass()); diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java index 7b4934a133..5ac13bf2e6 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps; +package io.bisq.gui.main.portfolio.pendingtrades.steps; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.gui.util.Colors; +import io.bisq.gui.util.Colors; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Button; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java index aa2f7b3802..4310b6f3b1 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.buyer; +package io.bisq.gui.main.portfolio.pendingtrades.steps.buyer; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView; -import io.bitsquare.locale.Res; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; +import io.bisq.locale.Res; public class BuyerStep1View extends TradeStepView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java index b75325a419..472a554cdc 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java @@ -15,34 +15,34 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.buyer; +package io.bisq.gui.main.portfolio.pendingtrades.steps.buyer; import ch.qos.logback.core.pattern.util.RegularEscapeUtil; -import io.bitsquare.app.DevEnv; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.gui.components.BusyAnimation; -import io.bitsquare.gui.components.TextFieldWithCopyIcon; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.components.paymentmethods.*; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.payment.payload.CashDepositAccountContractData; -import io.bitsquare.messages.payment.payload.CryptoCurrencyAccountContractData; -import io.bitsquare.messages.payment.payload.PaymentAccountContractData; -import io.bitsquare.messages.payment.payload.USPostalMoneyOrderAccountContractData; -import io.bitsquare.trade.Trade; +import io.bisq.app.DevEnv; +import io.bisq.common.util.Tuple3; +import io.bisq.gui.components.BusyAnimation; +import io.bisq.gui.components.TextFieldWithCopyIcon; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.components.paymentmethods.*; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.payment.payload.CashDepositAccountContractData; +import io.bisq.messages.payment.payload.CryptoCurrencyAccountContractData; +import io.bisq.messages.payment.payload.PaymentAccountContractData; +import io.bisq.messages.payment.payload.USPostalMoneyOrderAccountContractData; +import io.bisq.trade.Trade; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; import org.fxmisc.easybind.EasyBind; import org.fxmisc.easybind.Subscription; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; public class BuyerStep2View extends TradeStepView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java index 94336b346a..132af15adc 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.buyer; +package io.bisq.gui.main.portfolio.pendingtrades.steps.buyer; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView; -import io.bitsquare.locale.Res; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; +import io.bisq.locale.Res; public class BuyerStep3View extends TradeStepView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java index af4d588dcf..e06653a196 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java @@ -15,19 +15,18 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.buyer; +package io.bisq.gui.main.portfolio.pendingtrades.steps.buyer; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView; -import io.bitsquare.locale.Res; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; +import io.bisq.gui.util.FormBuilder; +import io.bisq.locale.Res; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; import org.bitcoinj.core.*; import java.util.List; -import static io.bitsquare.gui.util.FormBuilder.addLabelTextField; - public class BuyerStep4View extends TradeStepView { private TextField blockTextField; @@ -95,8 +94,8 @@ public class BuyerStep4View extends TradeStepView { protected void addContent() { addTradeInfoBlock(); if (model.getLockTime() > 0) { - blockTextField = addLabelTextField(gridPane, gridRow, Res.get("portfolio.pending.step4_buyer.blocks"), "").second; - timeTextField = addLabelTextField(gridPane, ++gridRow, Res.get("portfolio.pending.step4_buyer.date")).second; + blockTextField = FormBuilder.addLabelTextField(gridPane, gridRow, Res.get("portfolio.pending.step4_buyer.blocks"), "").second; + timeTextField = FormBuilder.addLabelTextField(gridPane, ++gridRow, Res.get("portfolio.pending.step4_buyer.date")).second; GridPane.setRowSpan(tradeInfoTitledGroupBg, 5); } else { GridPane.setRowSpan(tradeInfoTitledGroupBg, 3); //TODO should never reach diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java similarity index 91% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java index f710b48ec8..eecad9eb55 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep5View.java @@ -15,31 +15,31 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.buyer; +package io.bisq.gui.main.portfolio.pendingtrades.steps.buyer; -import io.bitsquare.app.DevEnv; -import io.bitsquare.app.Log; -import io.bitsquare.btc.AddressEntry; -import io.bitsquare.btc.AddressEntryException; -import io.bitsquare.btc.InsufficientFundsException; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.handlers.FaultHandler; -import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.common.util.MathUtils; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.funds.FundsView; -import io.bitsquare.gui.main.funds.transactions.TransactionsView; -import io.bitsquare.gui.main.overlays.notifications.Notification; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.btc.Restrictions; +import io.bisq.app.DevEnv; +import io.bisq.app.Log; +import io.bisq.btc.AddressEntry; +import io.bisq.btc.AddressEntryException; +import io.bisq.btc.InsufficientFundsException; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.common.UserThread; +import io.bisq.common.handlers.FaultHandler; +import io.bisq.common.handlers.ResultHandler; +import io.bisq.common.util.MathUtils; +import io.bisq.common.util.Tuple2; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.funds.FundsView; +import io.bisq.gui.main.funds.transactions.TransactionsView; +import io.bisq.gui.main.overlays.notifications.Notification; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.btc.Restrictions; import javafx.beans.value.ChangeListener; import javafx.geometry.Insets; import javafx.scene.control.Button; @@ -54,7 +54,7 @@ import org.spongycastle.crypto.params.KeyParameter; import java.util.concurrent.TimeUnit; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; public class BuyerStep5View extends TradeStepView { private final ChangeListener focusedPropertyListener; diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java index d364637190..dd067e13f7 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.seller; +package io.bisq.gui.main.portfolio.pendingtrades.steps.seller; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView; -import io.bitsquare.locale.Res; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; +import io.bisq.locale.Res; public class SellerStep1View extends TradeStepView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java index 7822c739f8..664931d711 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.seller; +package io.bisq.gui.main.portfolio.pendingtrades.steps.seller; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView; -import io.bitsquare.locale.Res; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; +import io.bisq.locale.Res; public class SellerStep2View extends TradeStepView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java similarity index 94% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java index 0840424dd3..4c0706d888 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java @@ -15,23 +15,23 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.seller; +package io.bisq.gui.main.portfolio.pendingtrades.steps.seller; -import io.bitsquare.app.DevEnv; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.gui.components.BusyAnimation; -import io.bitsquare.gui.components.TextFieldWithCopyIcon; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.payment.payload.*; -import io.bitsquare.messages.trade.payload.Contract; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.trade.Trade; +import io.bisq.app.DevEnv; +import io.bisq.common.util.Tuple3; +import io.bisq.gui.components.BusyAnimation; +import io.bisq.gui.components.TextFieldWithCopyIcon; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.payment.payload.*; +import io.bisq.messages.trade.payload.Contract; +import io.bisq.messages.user.Preferences; +import io.bisq.trade.Trade; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.Tooltip; @@ -41,7 +41,7 @@ import org.fxmisc.easybind.Subscription; import java.util.Optional; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; public class SellerStep3View extends TradeStepView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3bView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3bView.java similarity index 90% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3bView.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3bView.java index 32cec3a354..2b01125e8b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3bView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3bView.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.seller; +package io.bisq.gui.main.portfolio.pendingtrades.steps.seller; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepView; -import io.bitsquare.locale.Res; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; +import io.bisq.locale.Res; public class SellerStep3bView extends TradeStepView { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java similarity index 82% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java index 9411a4dee6..e9f7166abf 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.seller; +package io.bisq.gui.main.portfolio.pendingtrades.steps.seller; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.buyer.BuyerStep4View; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.buyer.BuyerStep4View; public class SellerStep4View extends BuyerStep4View { diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep5View.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep5View.java similarity index 83% rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep5View.java rename to gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep5View.java index f44c6df944..985aec1d16 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep5View.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep5View.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.portfolio.pendingtrades.steps.seller; +package io.bisq.gui.main.portfolio.pendingtrades.steps.seller; -import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel; -import io.bitsquare.gui.main.portfolio.pendingtrades.steps.buyer.BuyerStep5View; -import io.bitsquare.locale.Res; +import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; +import io.bisq.gui.main.portfolio.pendingtrades.steps.buyer.BuyerStep5View; +import io.bisq.locale.Res; public class SellerStep5View extends BuyerStep5View { diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml b/gui/src/main/java/io/bisq/gui/main/settings/SettingsView.fxml similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml rename to gui/src/main/java/io/bisq/gui/main/settings/SettingsView.fxml index f66e062884..0aef05dc46 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/settings/SettingsView.fxml @@ -19,7 +19,7 @@ - diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/gui/src/main/java/io/bisq/gui/main/settings/SettingsView.java similarity index 89% rename from gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java rename to gui/src/main/java/io/bisq/gui/main/settings/SettingsView.java index 830518e285..68b10922d6 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java +++ b/gui/src/main/java/io/bisq/gui/main/settings/SettingsView.java @@ -15,16 +15,16 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.settings; +package io.bisq.gui.main.settings; -import io.bitsquare.gui.Navigation; -import io.bitsquare.gui.common.model.Activatable; -import io.bitsquare.gui.common.view.*; -import io.bitsquare.gui.main.MainView; -import io.bitsquare.gui.main.settings.about.AboutView; -import io.bitsquare.gui.main.settings.network.NetworkSettingsView; -import io.bitsquare.gui.main.settings.preferences.PreferencesView; -import io.bitsquare.locale.Res; +import io.bisq.gui.Navigation; +import io.bisq.gui.common.model.Activatable; +import io.bisq.gui.common.view.*; +import io.bisq.gui.main.MainView; +import io.bisq.gui.main.settings.about.AboutView; +import io.bisq.gui.main.settings.network.NetworkSettingsView; +import io.bisq.gui.main.settings.preferences.PreferencesView; +import io.bisq.locale.Res; import javafx.beans.value.ChangeListener; import javafx.fxml.FXML; import javafx.scene.control.ScrollPane; @@ -53,7 +53,7 @@ public class SettingsView extends ActivatableViewAndModel preferencesTab.setText(Res.get("settings.tab.preferences")); networkTab.setText(Res.get("settings.tab.network")); aboutTab.setText(Res.get("settings.tab.about")); - + navigationListener = viewPath -> { if (viewPath.size() == 3 && viewPath.indexOf(SettingsView.class) == 1) loadView(viewPath.tip()); diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/about/AboutView.fxml b/gui/src/main/java/io/bisq/gui/main/settings/about/AboutView.fxml similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/settings/about/AboutView.fxml rename to gui/src/main/java/io/bisq/gui/main/settings/about/AboutView.fxml index 610432f776..fdbb399035 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/about/AboutView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/settings/about/AboutView.fxml @@ -19,7 +19,7 @@ -. */ -package io.bitsquare.gui.main.settings.about; +package io.bisq.gui.main.settings.about; -import io.bitsquare.app.Version; -import io.bitsquare.gui.common.model.Activatable; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.HyperlinkWithIcon; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; +import io.bisq.app.Version; +import io.bisq.gui.common.model.Activatable; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.HyperlinkWithIcon; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; import javafx.geometry.HPos; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; import javax.inject.Inject; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; @FxmlView public class AboutView extends ActivatableViewAndModel { diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml b/gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.fxml similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml rename to gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.fxml index a38a92015f..43897eafec 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.fxml @@ -17,13 +17,13 @@ ~ along with bisq. If not, see . --> - - + + -. */ -package io.bitsquare.gui.main.settings.network; +package io.bisq.gui.main.settings.network; -import io.bitsquare.app.BitsquareApp; -import io.bitsquare.btc.wallet.WalletsSetup; -import io.bitsquare.common.Clock; -import io.bitsquare.common.UserThread; -import io.bitsquare.gui.common.model.Activatable; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.p2p.network.Statistic; +import io.bisq.app.BitsquareApp; +import io.bisq.btc.wallet.WalletsSetup; +import io.bisq.common.Clock; +import io.bisq.common.UserThread; +import io.bisq.gui.common.model.Activatable; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; +import io.bisq.p2p.P2PService; +import io.bisq.p2p.network.Statistic; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/P2pNetworkListItem.java b/gui/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/main/settings/network/P2pNetworkListItem.java rename to gui/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java index c67c0a09bf..7842bca0cb 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/P2pNetworkListItem.java +++ b/gui/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java @@ -15,14 +15,14 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.main.settings.network; +package io.bisq.gui.main.settings.network; -import io.bitsquare.common.Clock; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; -import io.bitsquare.p2p.network.Connection; -import io.bitsquare.p2p.network.OutboundConnection; -import io.bitsquare.p2p.network.Statistic; +import io.bisq.common.Clock; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; +import io.bisq.p2p.network.Connection; +import io.bisq.p2p.network.OutboundConnection; +import io.bisq.p2p.network.Statistic; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import org.apache.commons.lang3.time.DurationFormatUtils; diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.fxml b/gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.fxml similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.fxml rename to gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.fxml index b2b91a97b7..354a6845af 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.fxml +++ b/gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.fxml @@ -20,7 +20,7 @@ -. */ -package io.bitsquare.gui.main.settings.preferences; +package io.bisq.gui.main.settings.preferences; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.gui.common.model.Activatable; -import io.bitsquare.gui.common.view.ActivatableViewAndModel; -import io.bitsquare.gui.common.view.FxmlView; -import io.bitsquare.gui.components.InputTextField; -import io.bitsquare.gui.components.TitledGroupBg; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.ImageUtil; -import io.bitsquare.gui.util.Layout; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.btc.provider.fee.FeeService; -import io.bitsquare.messages.locale.*; -import io.bitsquare.messages.user.BlockChainExplorer; -import io.bitsquare.messages.user.Preferences; +import io.bisq.common.UserThread; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Tuple3; +import io.bisq.gui.common.model.Activatable; +import io.bisq.gui.common.view.ActivatableViewAndModel; +import io.bisq.gui.common.view.FxmlView; +import io.bisq.gui.components.InputTextField; +import io.bisq.gui.components.TitledGroupBg; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.gui.util.BSFormatter; +import io.bisq.gui.util.ImageUtil; +import io.bisq.gui.util.Layout; +import io.bisq.locale.Res; +import io.bisq.messages.btc.provider.fee.FeeService; +import io.bisq.messages.locale.*; +import io.bisq.messages.user.BlockChainExplorer; +import io.bisq.messages.user.Preferences; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -52,7 +52,7 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static io.bitsquare.gui.util.FormBuilder.*; +import static io.bisq.gui.util.FormBuilder.*; @FxmlView public class PreferencesView extends ActivatableViewAndModel { diff --git a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/gui/src/main/java/io/bisq/gui/util/BSFormatter.java similarity index 98% rename from gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java rename to gui/src/main/java/io/bisq/gui/util/BSFormatter.java index a3f323fb55..ed3782c0ca 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java +++ b/gui/src/main/java/io/bisq/gui/util/BSFormatter.java @@ -15,15 +15,15 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; -import io.bitsquare.common.util.MathUtils; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.locale.LanguageUtil; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.p2p.NodeAddress; +import io.bisq.common.util.MathUtils; +import io.bisq.locale.Res; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.locale.LanguageUtil; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.user.Preferences; +import io.bisq.p2p.NodeAddress; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DurationFormatUtils; import org.bitcoinj.core.Coin; diff --git a/gui/src/main/java/io/bitsquare/gui/util/BsqFormatter.java b/gui/src/main/java/io/bisq/gui/util/BsqFormatter.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/util/BsqFormatter.java rename to gui/src/main/java/io/bisq/gui/util/BsqFormatter.java index 33f43db392..daa8021e0f 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/BsqFormatter.java +++ b/gui/src/main/java/io/bisq/gui/util/BsqFormatter.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; import org.bitcoinj.utils.MonetaryFormat; import org.slf4j.Logger; diff --git a/gui/src/main/java/io/bitsquare/gui/util/Colors.java b/gui/src/main/java/io/bisq/gui/util/Colors.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/Colors.java rename to gui/src/main/java/io/bisq/gui/util/Colors.java index 22636f63ae..d7db305097 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/Colors.java +++ b/gui/src/main/java/io/bisq/gui/util/Colors.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; diff --git a/gui/src/main/java/io/bitsquare/gui/util/CurrencyListItem.java b/gui/src/main/java/io/bisq/gui/util/CurrencyListItem.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/util/CurrencyListItem.java rename to gui/src/main/java/io/bisq/gui/util/CurrencyListItem.java index 6269a0e93e..f1f1d9f7cb 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/CurrencyListItem.java +++ b/gui/src/main/java/io/bisq/gui/util/CurrencyListItem.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; -import io.bitsquare.messages.locale.TradeCurrency; +import io.bisq.messages.locale.TradeCurrency; public class CurrencyListItem { public final TradeCurrency tradeCurrency; diff --git a/gui/src/main/java/io/bitsquare/gui/util/FormBuilder.java b/gui/src/main/java/io/bisq/gui/util/FormBuilder.java similarity index 99% rename from gui/src/main/java/io/bitsquare/gui/util/FormBuilder.java rename to gui/src/main/java/io/bisq/gui/util/FormBuilder.java index f94b5c29cc..28958a21c1 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/FormBuilder.java +++ b/gui/src/main/java/io/bisq/gui/util/FormBuilder.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; import de.jensd.fx.fontawesome.AwesomeIcon; -import io.bitsquare.common.util.Tuple2; -import io.bitsquare.common.util.Tuple3; -import io.bitsquare.common.util.Tuple4; -import io.bitsquare.gui.components.*; +import io.bisq.common.util.Tuple2; +import io.bisq.common.util.Tuple3; +import io.bisq.common.util.Tuple4; +import io.bisq.gui.components.*; import javafx.geometry.HPos; import javafx.geometry.Insets; import javafx.geometry.Pos; diff --git a/gui/src/main/java/io/bitsquare/gui/util/GUIProfiler.java b/gui/src/main/java/io/bisq/gui/util/GUIProfiler.java similarity index 98% rename from gui/src/main/java/io/bitsquare/gui/util/GUIProfiler.java rename to gui/src/main/java/io/bisq/gui/util/GUIProfiler.java index a0df5175cd..8eb66d7ef2 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/GUIProfiler.java +++ b/gui/src/main/java/io/bisq/gui/util/GUIProfiler.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; import com.google.common.base.Stopwatch; import javafx.animation.AnimationTimer; diff --git a/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java b/gui/src/main/java/io/bisq/gui/util/GUIUtil.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java rename to gui/src/main/java/io/bisq/gui/util/GUIUtil.java index c0fe04aaac..30212bb7a6 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java +++ b/gui/src/main/java/io/bisq/gui/util/GUIUtil.java @@ -15,24 +15,24 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; import com.google.common.base.Charsets; import com.googlecode.jcsv.CSVStrategy; import com.googlecode.jcsv.writer.CSVEntryConverter; import com.googlecode.jcsv.writer.CSVWriter; import com.googlecode.jcsv.writer.internal.CSVWriterBuilder; -import io.bitsquare.app.DevEnv; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.gui.components.indicator.TxConfidenceIndicator; -import io.bitsquare.gui.main.overlays.popups.Popup; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.CurrencyUtil; -import io.bitsquare.messages.locale.TradeCurrency; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.payment.PaymentAccount; -import io.bitsquare.storage.Storage; -import io.bitsquare.user.User; +import io.bisq.app.DevEnv; +import io.bisq.common.util.Utilities; +import io.bisq.gui.components.indicator.TxConfidenceIndicator; +import io.bisq.gui.main.overlays.popups.Popup; +import io.bisq.locale.Res; +import io.bisq.messages.locale.CurrencyUtil; +import io.bisq.messages.locale.TradeCurrency; +import io.bisq.messages.user.Preferences; +import io.bisq.payment.PaymentAccount; +import io.bisq.storage.Storage; +import io.bisq.user.User; import javafx.collections.ObservableList; import javafx.geometry.Orientation; import javafx.scene.Node; diff --git a/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java b/gui/src/main/java/io/bisq/gui/util/ImageUtil.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java rename to gui/src/main/java/io/bisq/gui/util/ImageUtil.java index 08732bcf25..c30d0aefb7 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java +++ b/gui/src/main/java/io/bisq/gui/util/ImageUtil.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; import com.sun.javafx.tk.quantum.QuantumToolkit; -import io.bitsquare.messages.locale.Country; +import io.bisq.messages.locale.Country; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import org.slf4j.Logger; diff --git a/gui/src/main/java/io/bitsquare/gui/util/Layout.java b/gui/src/main/java/io/bisq/gui/util/Layout.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/util/Layout.java rename to gui/src/main/java/io/bisq/gui/util/Layout.java index 1e839ef2ac..9ca8c757ef 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/Layout.java +++ b/gui/src/main/java/io/bisq/gui/util/Layout.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; public class Layout { public static final double FIRST_ROW_DISTANCE = 20d; diff --git a/gui/src/main/java/io/bitsquare/gui/util/Transitions.java b/gui/src/main/java/io/bisq/gui/util/Transitions.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/util/Transitions.java rename to gui/src/main/java/io/bisq/gui/util/Transitions.java index 1c789301e5..f6875cb727 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/Transitions.java +++ b/gui/src/main/java/io/bisq/gui/util/Transitions.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; -import io.bitsquare.common.UserThread; -import io.bitsquare.messages.user.Preferences; +import io.bisq.common.UserThread; +import io.bisq.messages.user.Preferences; import javafx.animation.*; import javafx.event.ActionEvent; import javafx.event.EventHandler; diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/AccountNrValidator.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/AccountNrValidator.java index 08f6b7c198..ac6ae1739e 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/AccountNrValidator.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.BankUtil; +import io.bisq.locale.Res; +import io.bisq.messages.locale.BankUtil; import org.apache.commons.lang3.StringUtils; public final class AccountNrValidator extends BankValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/AliPayValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/AliPayValidator.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/validation/AliPayValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/AliPayValidator.java index 8ebdb4279b..4bce0c7dc7 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/AliPayValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/AliPayValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; public final class AliPayValidator extends InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java index 3df31e2dc4..4a0eb3e036 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.gui.util.validation.altcoins.ByteballAddressValidator; -import io.bitsquare.gui.util.validation.params.IOPParams; -import io.bitsquare.gui.util.validation.params.PivxParams; -import io.bitsquare.locale.Res; +import io.bisq.gui.util.validation.altcoins.ByteballAddressValidator; +import io.bisq.gui.util.validation.params.IOPParams; +import io.bisq.gui.util.validation.params.PivxParams; +import io.bisq.locale.Res; import org.bitcoinj.core.Address; import org.bitcoinj.core.AddressFormatException; import org.bitcoinj.params.MainNetParams; diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BICValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/BICValidator.java similarity index 59% rename from gui/src/main/java/io/bitsquare/gui/util/validation/BICValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/BICValidator.java index 0201421124..9aa8ff97d8 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/BICValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/BICValidator.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.locale.Res; +import io.bisq.locale.Res; import java.util.Locale; @@ -51,32 +51,32 @@ public final class BICValidator extends InputValidator { // IBAN max 34 chars // bic: 8 or 11 chars - // check ensure length 8 or 11 - if (!isStringWithFixedLength(input,8) && !isStringWithFixedLength(input,11)) - return new ValidationResult(false, Res.get("validation.bic.invalidLength")); + // check ensure length 8 or 11 + if (!isStringWithFixedLength(input, 8) && !isStringWithFixedLength(input, 11)) + return new ValidationResult(false, Res.get("validation.bic.invalidLength")); - input = input.toUpperCase(Locale.ROOT); + input = input.toUpperCase(Locale.ROOT); - // ensure Bank and Contry code to be letters only - for (int k=0; k<6; k++) { - if (!Character.isLetter(input.charAt(k))) - return new ValidationResult(false, Res.get("validation.bic.letters")); - } + // ensure Bank and Contry code to be letters only + for (int k = 0; k < 6; k++) { + if (!Character.isLetter(input.charAt(k))) + return new ValidationResult(false, Res.get("validation.bic.letters")); + } - // ensure location code starts not with 0 or 1 and ends not with O - char ch = input.charAt(6); - if (ch == '0' || ch == '1' || input.charAt(7) == 'O') - return new ValidationResult(false, Res.get("validation.bic.invalidLocationCode")); + // ensure location code starts not with 0 or 1 and ends not with O + char ch = input.charAt(6); + if (ch == '0' || ch == '1' || input.charAt(7) == 'O') + return new ValidationResult(false, Res.get("validation.bic.invalidLocationCode")); - // check complete for 8 char BIC - if (input.length() == 8) - return new ValidationResult(true); + // check complete for 8 char BIC + if (input.length() == 8) + return new ValidationResult(true); - // ensure branch code does not start with X unless it is XXX - if (input.charAt(8) == 'X') - if (input.charAt(9) != 'X' || input.charAt(10) != 'X') - return new ValidationResult(false, Res.get("validation.bic.invalidBranchCode")); - return new ValidationResult(true); + // ensure branch code does not start with X unless it is XXX + if (input.charAt(8) == 'X') + if (input.charAt(9) != 'X' || input.charAt(10) != 'X') + return new ValidationResult(false, Res.get("validation.bic.invalidBranchCode")); + return new ValidationResult(true); } diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BankIdValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/BankIdValidator.java similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/util/validation/BankIdValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/BankIdValidator.java index 0b0c0b094e..f87cbd03b5 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/BankIdValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/BankIdValidator.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.BankUtil; +import io.bisq.locale.Res; +import io.bisq.messages.locale.BankUtil; public final class BankIdValidator extends BankValidator { public BankIdValidator(String countryCode) { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BankValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/BankValidator.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/util/validation/BankValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/BankValidator.java index 9ea4c47909..10ebfd840c 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/BankValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/BankValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; public abstract class BankValidator extends InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BranchIdValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/BranchIdValidator.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/util/validation/BranchIdValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/BranchIdValidator.java index 26d180058d..c4023e4852 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/BranchIdValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/BranchIdValidator.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.locale.BankUtil; +import io.bisq.locale.Res; +import io.bisq.messages.locale.BankUtil; public final class BranchIdValidator extends BankValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/BtcAddressValidator.java similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/BtcAddressValidator.java index 3b89d991bd..39da9e12ce 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/BtcAddressValidator.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.user.Preferences; +import io.bisq.locale.Res; +import io.bisq.messages.user.Preferences; import org.bitcoinj.core.Address; import org.bitcoinj.core.AddressFormatException; diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/BtcValidator.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/BtcValidator.java index 1a87e96df6..521b616ca8 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/BtcValidator.java @@ -15,10 +15,10 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; import org.bitcoinj.core.Coin; import javax.annotation.Nullable; diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/ChaseQuickPayValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/ChaseQuickPayValidator.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/validation/ChaseQuickPayValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/ChaseQuickPayValidator.java index e10945c7aa..57d1adc4a7 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/ChaseQuickPayValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/ChaseQuickPayValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; public final class ChaseQuickPayValidator extends InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/ClearXchangeValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/ClearXchangeValidator.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/validation/ClearXchangeValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/ClearXchangeValidator.java index 40e60d9c1c..a706cfe705 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/ClearXchangeValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/ClearXchangeValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; public final class ClearXchangeValidator extends InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/EmailValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/EmailValidator.java similarity index 98% rename from gui/src/main/java/io/bitsquare/gui/util/validation/EmailValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/EmailValidator.java index 730bde97a6..524fe5527a 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/EmailValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/EmailValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; /* * Mail addresses consist of localPart @ domainPart @@ -34,7 +34,7 @@ package io.bitsquare.gui.util.validation; * */ -import io.bitsquare.locale.Res; +import io.bisq.locale.Res; public final class EmailValidator extends InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/FiatValidator.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/FiatValidator.java index 037b9d87ff..e0239e536c 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/FiatValidator.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.locale.Res; +import io.bisq.locale.Res; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bisq/gui/util/validation/IBANValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/IBANValidator.java new file mode 100644 index 0000000000..c86c86302b --- /dev/null +++ b/gui/src/main/java/io/bisq/gui/util/validation/IBANValidator.java @@ -0,0 +1,96 @@ +/* + * This file is part of bisq. + * + * bisq is free software: you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * bisq is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public + * License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bisq. If not, see . + */ + +package io.bisq.gui.util.validation; + +import io.bisq.locale.Res; + +import java.math.BigInteger; +import java.util.Locale; + + +// TODO Does not yet recognize special letters like ä, ö, ü, å, ... as invalid characters + +public final class IBANValidator extends InputValidator { + + /////////////////////////////////////////////////////////////////////////////////////////// + // Public methods + /////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public ValidationResult validate(String input) { + // TODO Add validation for primary and secondary IDs according to the selected type + + // IBAN max 34 chars, shortest is Norwegian with 15 chars, BBAN may include letters + // bic: max 11 char + + // check input length first + if (isStringInRange(input, 15, 34)) { + input = input.toUpperCase(Locale.ROOT); // ensure upper case + + // check if country code is letters and checksum numeric + if (!(Character.isLetter(input.charAt(0)) && Character.isLetter(input.charAt(1)))) + return new ValidationResult(false, Res.get("validation.iban.invalidCountryCode")); + if (!(Character.isDigit(input.charAt(2)) && Character.isDigit(input.charAt(3)))) + return new ValidationResult(false, Res.get("validation.iban.checkSumNotNumeric")); + + // reorder IBAN to format + String input2 = input.substring(4, input.length()) + input.substring(0, 4); + + // check if input is alphanumeric and count included letters + int charCount = 0; + char ch; + for (int k = 0; k < input2.length(); k++) { + ch = input2.charAt(k); + if (Character.isLetter(ch)) + charCount++; + else if (!Character.isDigit(ch)) + return (new ValidationResult(false, Res.get("validation.iban.nonNumericChars"))); + } + + // create final char array for checksum validation + char[] charArray = new char[input2.length() + charCount]; + int i = 0; + int tmp; + for (int k = 0; k < input2.length(); k++) { + ch = input2.charAt(k); + if (Character.isLetter(ch)) { + tmp = ch - ('A' - 10); // letters are transformed to two digit numbers A->10, B->11, ... + String s = Integer.toString(tmp); + charArray[i++] = s.charAt(0); // insert transformed + charArray[i++] = s.charAt(1); // letters into char array + } else charArray[i++] = ch; // transfer digits directly to char array + } +// System.out.print(Arrays.toString(charArray) + '\t'); + BigInteger bigInt = new BigInteger(new String(charArray)); + int result = bigInt.mod(new BigInteger(Integer.toString(97))).intValue(); + if (result == 1) + return new ValidationResult(true); + else + return new ValidationResult(false, Res.get("validation.iban.checkSumInvalid")); + } +// return new ValidationResult(false, BSResources.get("validation.accountNrChars", "15 - 34")); + return new ValidationResult(false, Res.get("validation.iban.invalidLength")); + } + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Private methods + /////////////////////////////////////////////////////////////////////////////////////////// + + +} diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/InputValidator.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/InputValidator.java index 38cea32f15..b5dd5ab0bc 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/InputValidator.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.locale.Res; +import io.bisq.locale.Res; public class InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/InteracETransferValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/InteracETransferValidator.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/util/validation/InteracETransferValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/InteracETransferValidator.java index 406305af8d..8997acb229 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/InteracETransferValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/InteracETransferValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; /* * Interac e-Transfer requires a mail address or Canadian (mobile) phone number @@ -29,7 +29,7 @@ package io.bitsquare.gui.util.validation; * They are to change in some future (according to the linked document around 2019/2020) */ -import io.bitsquare.locale.Res; +import io.bisq.locale.Res; public final class InteracETransferValidator extends InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/NumberValidator.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/NumberValidator.java index 2286553e58..77c92ecb4d 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/NumberValidator.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.locale.Res; +import io.bisq.locale.Res; /** * NumberValidator for validating basic number values. diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/OKPayValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/OKPayValidator.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/validation/OKPayValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/OKPayValidator.java index c3ed5cc1c7..e43e161942 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/OKPayValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/OKPayValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; public final class OKPayValidator extends InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/OptionalBtcValidator.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/OptionalBtcValidator.java index cfeb253eee..45d44c088c 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/OptionalBtcValidator.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.gui.util.BSFormatter; +import io.bisq.gui.util.BSFormatter; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/OptionalFiatValidator.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/OptionalFiatValidator.java index 9c596d2b4f..e3989a22ab 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/OptionalFiatValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/PasswordValidator.java similarity index 95% rename from gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/PasswordValidator.java index 3c089cf769..a526343e93 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/PasswordValidator.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.locale.Res; +import io.bisq.locale.Res; public final class PasswordValidator extends InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/PerfectMoneyValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/PerfectMoneyValidator.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/validation/PerfectMoneyValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/PerfectMoneyValidator.java index 7f18ca1bea..4795c6cb95 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/PerfectMoneyValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/PerfectMoneyValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; public final class PerfectMoneyValidator extends InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/SecurityDepositValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/SecurityDepositValidator.java similarity index 93% rename from gui/src/main/java/io/bitsquare/gui/util/validation/SecurityDepositValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/SecurityDepositValidator.java index 45524f2877..a8b4249ca7 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/SecurityDepositValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/SecurityDepositValidator.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.locale.Res; -import io.bitsquare.messages.btc.Restrictions; +import io.bisq.gui.util.BSFormatter; +import io.bisq.locale.Res; +import io.bisq.messages.btc.Restrictions; import org.bitcoinj.core.Coin; import javax.inject.Inject; diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/SwishValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/SwishValidator.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/validation/SwishValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/SwishValidator.java index 459b0c8901..d069f4cea9 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/SwishValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/SwishValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; public final class SwishValidator extends InputValidator { diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/USPostalMoneyOrderValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/USPostalMoneyOrderValidator.java similarity index 96% rename from gui/src/main/java/io/bitsquare/gui/util/validation/USPostalMoneyOrderValidator.java rename to gui/src/main/java/io/bisq/gui/util/validation/USPostalMoneyOrderValidator.java index 585991625f..99f6bbea21 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/USPostalMoneyOrderValidator.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/USPostalMoneyOrderValidator.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; public final class USPostalMoneyOrderValidator extends InputValidator { diff --git a/gui/src/main/java/io/bisq/gui/util/validation/altcoins/ByteballAddressValidator.java b/gui/src/main/java/io/bisq/gui/util/validation/altcoins/ByteballAddressValidator.java new file mode 100644 index 0000000000..2479e2b395 --- /dev/null +++ b/gui/src/main/java/io/bisq/gui/util/validation/altcoins/ByteballAddressValidator.java @@ -0,0 +1,178 @@ +/* + * This file is part of bisq. + * + * bisq is free software: you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * bisq is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public + * License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bisq. If not, see . + */ + +package io.bisq.gui.util.validation.altcoins; + +import io.bisq.gui.util.validation.InputValidator; +import org.apache.commons.codec.binary.Base32; +import org.apache.commons.codec.binary.Base64; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Created by DevAlexey on 19.12.2016. + */ +public class ByteballAddressValidator { + private static final Base32 base32 = new Base32(); + private static final Base64 base64 = new Base64(); + private static final String PI = "14159265358979323846264338327950288419716939937510"; + private static final String[] arrRelativeOffsets = PI.split(""); + private static Integer[] arrOffsets160, arrOffsets288; + + static { + try { + arrOffsets160 = calcOffsets(160); + } catch (Exception e) { + e.printStackTrace(); + } + try { + arrOffsets288 = calcOffsets(288); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static InputValidator.ValidationResult validate(String input) { + return new InputValidator.ValidationResult(isValidAddress(input)); + } + + private static boolean isValidAddress(String address) { + return isValidChash(address, 32); + } + + private static boolean isValidChash(String str, int len) { + return (isStringOfLength(str, len) && isChashValid(str)); + } + + private static boolean isStringOfLength(String str, int len) { + return str.length() == len; + } + + private static void checkLength(int chash_length) throws Exception { + if (chash_length != 160 && chash_length != 288) + throw new Exception("unsupported c-hash length: " + chash_length); + } + + private static Integer[] calcOffsets(int chash_length) throws Exception { + checkLength(chash_length); + List arrOffsets = new ArrayList<>(chash_length); + int offset = 0; + int index = 0; + + for (int i = 0; offset < chash_length; i++) { + int relative_offset = Integer.parseInt(arrRelativeOffsets[i]); + if (relative_offset == 0) + continue; + offset += relative_offset; + if (chash_length == 288) + offset += 4; + if (offset >= chash_length) + break; + arrOffsets.add(offset); + //console.log("index="+index+", offset="+offset); + index++; + } + + if (index != 32) + throw new Exception("wrong number of checksum bits"); + + return arrOffsets.toArray(new Integer[0]); + } + + private static SeparatedData separateIntoCleanDataAndChecksum(String bin) throws Exception { + int len = bin.length(); + Integer[] arrOffsets; + if (len == 160) + arrOffsets = arrOffsets160; + else if (len == 288) + arrOffsets = arrOffsets288; + else + throw new Exception("bad length"); + StringBuilder arrFrags = new StringBuilder(); + StringBuilder arrChecksumBits = new StringBuilder(); + int start = 0; + for (int i = 0; i < arrOffsets.length; i++) { + arrFrags.append(bin.substring(start, arrOffsets[i])); + arrChecksumBits.append(bin.substring(arrOffsets[i], arrOffsets[i] + 1)); + start = arrOffsets[i] + 1; + } + // add last frag + if (start < bin.length()) + arrFrags.append(bin.substring(start)); + String binCleanData = arrFrags.toString(); + String binChecksum = arrChecksumBits.toString(); + return new SeparatedData(binCleanData, binChecksum); + } + + private static String buffer2bin(byte[] buf) { + StringBuffer bytes = new StringBuffer(); + for (int i = 0; i < buf.length; i++) { + String bin = String.format("%8s", Integer.toBinaryString(buf[i] & 0xFF)).replace(' ', '0'); + bytes.append(bin); + } + return bytes.toString(); + } + + private static byte[] bin2buffer(String bin) { + int len = bin.length() / 8; + byte[] buf = new byte[len]; + for (int i = 0; i < len; i++) + buf[i] = (byte) Integer.parseInt(bin.substring(i * 8, (i + 1) * 8), 2); + return buf; + } + + private static boolean isChashValid(String encoded) { + int encoded_len = encoded.length(); + if (encoded_len != 32 && encoded_len != 48) // 160/5 = 32, 288/6 = 48 + return false; + byte[] chash = (encoded_len == 32) ? base32.decode(encoded) : base64.decode(encoded); + String binChash = buffer2bin(chash); + SeparatedData separated = null; + try { + separated = separateIntoCleanDataAndChecksum(binChash); + } catch (Exception e) { + return false; + } + byte[] clean_data = bin2buffer(separated.clean_data); + byte[] checksum = bin2buffer(separated.checksum); + return Arrays.equals(getChecksum(clean_data), checksum); + } + + private static byte[] getChecksum(byte[] clean_data) { + + try { + byte[] full_checksum = MessageDigest.getInstance("SHA-256").digest(clean_data); + byte[] checksum = {full_checksum[5], full_checksum[13], full_checksum[21], full_checksum[29]}; + return checksum; + } catch (NoSuchAlgorithmException e) { + return null; + } + } + + private static class SeparatedData { + String clean_data, checksum; + + public SeparatedData(String clean_data, String checksum) { + this.clean_data = clean_data; + this.checksum = checksum; + } + } +} diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/params/IOPParams.java b/gui/src/main/java/io/bisq/gui/util/validation/params/IOPParams.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/util/validation/params/IOPParams.java rename to gui/src/main/java/io/bisq/gui/util/validation/params/IOPParams.java index d90491a5ad..a27437829e 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/params/IOPParams.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/params/IOPParams.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation.params; +package io.bisq.gui.util.validation.params; import org.bitcoinj.core.*; import org.bitcoinj.store.BlockStore; diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/params/PivxParams.java b/gui/src/main/java/io/bisq/gui/util/validation/params/PivxParams.java similarity index 97% rename from gui/src/main/java/io/bitsquare/gui/util/validation/params/PivxParams.java rename to gui/src/main/java/io/bisq/gui/util/validation/params/PivxParams.java index 647bde5648..e594c3df29 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/params/PivxParams.java +++ b/gui/src/main/java/io/bisq/gui/util/validation/params/PivxParams.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation.params; +package io.bisq.gui.util.validation.params; import org.bitcoinj.core.*; import org.bitcoinj.store.BlockStore; diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/IBANValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/IBANValidator.java deleted file mode 100644 index d497dc39f3..0000000000 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/IBANValidator.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * This file is part of bisq. - * - * bisq is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * bisq is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with bisq. If not, see . - */ - -package io.bitsquare.gui.util.validation; - -import io.bitsquare.locale.Res; - -import java.math.BigInteger; -import java.util.Locale; - - -// TODO Does not yet recognize special letters like ä, ö, ü, å, ... as invalid characters - -public final class IBANValidator extends InputValidator { - - /////////////////////////////////////////////////////////////////////////////////////////// - // Public methods - /////////////////////////////////////////////////////////////////////////////////////////// - - @Override - public ValidationResult validate(String input) { - // TODO Add validation for primary and secondary IDs according to the selected type - - // IBAN max 34 chars, shortest is Norwegian with 15 chars, BBAN may include letters - // bic: max 11 char - - // check input length first - if (isStringInRange(input, 15, 34)) { - input = input.toUpperCase(Locale.ROOT); // ensure upper case - - // check if country code is letters and checksum numeric - if (!( Character.isLetter(input.charAt(0)) && Character.isLetter(input.charAt(1)) )) - return new ValidationResult(false, Res.get("validation.iban.invalidCountryCode")); - if (!( Character.isDigit(input.charAt(2)) && Character.isDigit(input.charAt(3)) )) - return new ValidationResult(false, Res.get("validation.iban.checkSumNotNumeric")); - - // reorder IBAN to format - String input2 = input.substring(4, input.length()) + input.substring(0, 4); - - // check if input is alphanumeric and count included letters - int charCount = 0; - char ch; - for (int k=0; k10, B->11, ... - String s = Integer.toString(tmp); - charArray[i++] = s.charAt(0); // insert transformed - charArray[i++] = s.charAt(1); // letters into char array - } else charArray[i++] = ch; // transfer digits directly to char array - } -// System.out.print(Arrays.toString(charArray) + '\t'); - BigInteger bigInt = new BigInteger(new String(charArray)); - int result = bigInt.mod(new BigInteger(Integer.toString(97))).intValue(); - if (result == 1) - return new ValidationResult(true); - else - return new ValidationResult(false, Res.get("validation.iban.checkSumInvalid")); - } -// return new ValidationResult(false, BSResources.get("validation.accountNrChars", "15 - 34")); - return new ValidationResult(false, Res.get("validation.iban.invalidLength")); - } - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Private methods - /////////////////////////////////////////////////////////////////////////////////////////// - - -} diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/altcoins/ByteballAddressValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/altcoins/ByteballAddressValidator.java deleted file mode 100644 index 8eb8a8fd25..0000000000 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/altcoins/ByteballAddressValidator.java +++ /dev/null @@ -1,178 +0,0 @@ -/* - * This file is part of bisq. - * - * bisq is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * bisq is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with bisq. If not, see . - */ - -package io.bitsquare.gui.util.validation.altcoins; - -import io.bitsquare.gui.util.validation.InputValidator; -import org.apache.commons.codec.binary.Base32; -import org.apache.commons.codec.binary.Base64; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * Created by DevAlexey on 19.12.2016. - */ -public class ByteballAddressValidator { - private static final Base32 base32 = new Base32(); - private static final Base64 base64 = new Base64(); - private static final String PI = "14159265358979323846264338327950288419716939937510"; - private static final String[] arrRelativeOffsets = PI.split(""); - private static Integer[] arrOffsets160, arrOffsets288; - - static { - try { - arrOffsets160 = calcOffsets(160); - } catch (Exception e) { - e.printStackTrace(); - } - try { - arrOffsets288 = calcOffsets(288); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static InputValidator.ValidationResult validate(String input) { - return new InputValidator.ValidationResult(isValidAddress(input)); - } - - private static boolean isValidAddress(String address) { - return isValidChash(address, 32); - } - - private static boolean isValidChash(String str, int len) { - return (isStringOfLength(str, len) && isChashValid(str)); - } - - private static boolean isStringOfLength(String str, int len) { - return str.length() == len; - } - - private static void checkLength(int chash_length) throws Exception { - if (chash_length != 160 && chash_length != 288) - throw new Exception("unsupported c-hash length: " + chash_length); - } - - private static Integer[] calcOffsets(int chash_length) throws Exception { - checkLength(chash_length); - List arrOffsets = new ArrayList<>(chash_length); - int offset = 0; - int index = 0; - - for (int i = 0; offset < chash_length; i++) { - int relative_offset = Integer.parseInt(arrRelativeOffsets[i]); - if (relative_offset == 0) - continue; - offset += relative_offset; - if (chash_length == 288) - offset += 4; - if (offset >= chash_length) - break; - arrOffsets.add(offset); - //console.log("index="+index+", offset="+offset); - index++; - } - - if (index != 32) - throw new Exception("wrong number of checksum bits"); - - return arrOffsets.toArray(new Integer[0]); - } - - private static SeparatedData separateIntoCleanDataAndChecksum(String bin) throws Exception { - int len = bin.length(); - Integer[] arrOffsets; - if (len == 160) - arrOffsets = arrOffsets160; - else if (len == 288) - arrOffsets = arrOffsets288; - else - throw new Exception("bad length"); - StringBuilder arrFrags = new StringBuilder(); - StringBuilder arrChecksumBits = new StringBuilder(); - int start = 0; - for (int i = 0; i < arrOffsets.length; i++) { - arrFrags.append(bin.substring(start, arrOffsets[i])); - arrChecksumBits.append(bin.substring(arrOffsets[i], arrOffsets[i] + 1)); - start = arrOffsets[i] + 1; - } - // add last frag - if (start < bin.length()) - arrFrags.append(bin.substring(start)); - String binCleanData = arrFrags.toString(); - String binChecksum = arrChecksumBits.toString(); - return new SeparatedData(binCleanData, binChecksum); - } - - private static String buffer2bin(byte[] buf) { - StringBuffer bytes = new StringBuffer(); - for (int i = 0; i < buf.length; i++) { - String bin = String.format("%8s", Integer.toBinaryString(buf[i] & 0xFF)).replace(' ', '0'); - bytes.append(bin); - } - return bytes.toString(); - } - - private static byte[] bin2buffer(String bin) { - int len = bin.length() / 8; - byte[] buf = new byte[len]; - for (int i = 0; i < len; i++) - buf[i] = (byte) Integer.parseInt(bin.substring(i * 8, (i + 1) * 8), 2); - return buf; - } - - private static boolean isChashValid(String encoded) { - int encoded_len = encoded.length(); - if (encoded_len != 32 && encoded_len != 48) // 160/5 = 32, 288/6 = 48 - return false; - byte[] chash = (encoded_len == 32) ? base32.decode(encoded) : base64.decode(encoded); - String binChash = buffer2bin(chash); - SeparatedData separated = null; - try { - separated = separateIntoCleanDataAndChecksum(binChash); - } catch (Exception e) { - return false; - } - byte[] clean_data = bin2buffer(separated.clean_data); - byte[] checksum = bin2buffer(separated.checksum); - return Arrays.equals(getChecksum(clean_data), checksum); - } - - private static byte[] getChecksum(byte[] clean_data) { - - try { - byte[] full_checksum = MessageDigest.getInstance("SHA-256").digest(clean_data); - byte[] checksum = {full_checksum[5], full_checksum[13], full_checksum[21], full_checksum[29]}; - return checksum; - } catch (NoSuchAlgorithmException e) { - return null; - } - } - - private static class SeparatedData { - String clean_data, checksum; - - public SeparatedData(String clean_data, String checksum) { - this.clean_data = clean_data; - this.checksum = checksum; - } - } -} diff --git a/gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java b/gui/src/test/java/io/bisq/app/BitsquareEnvironmentTests.java similarity index 97% rename from gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java rename to gui/src/test/java/io/bisq/app/BitsquareEnvironmentTests.java index 6bd2382814..ba12f1bee0 100644 --- a/gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java +++ b/gui/src/test/java/io/bisq/app/BitsquareEnvironmentTests.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.app; +package io.bisq.app; import org.junit.Test; import org.springframework.core.env.ConfigurableEnvironment; @@ -23,7 +23,7 @@ import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertySource; import org.springframework.mock.env.MockPropertySource; -import static io.bitsquare.app.BitsquareEnvironment.*; +import static io.bisq.app.BitsquareEnvironment.*; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.springframework.core.env.PropertySource.named; diff --git a/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$Malformed.fxml b/gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests$Malformed.fxml similarity index 100% rename from gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$Malformed.fxml rename to gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests$Malformed.fxml diff --git a/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml b/gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml similarity index 100% rename from gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml rename to gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml diff --git a/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml b/gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml similarity index 87% rename from gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml rename to gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml index be7b9c4e88..b692a3814e 100644 --- a/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml +++ b/gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml @@ -16,6 +16,6 @@ --> - diff --git a/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$WellFormed.fxml b/gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests$WellFormed.fxml similarity index 89% rename from gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$WellFormed.fxml rename to gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests$WellFormed.fxml index 7261659cb2..6e79594759 100644 --- a/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$WellFormed.fxml +++ b/gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests$WellFormed.fxml @@ -16,6 +16,6 @@ --> - diff --git a/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java b/gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests.java similarity index 95% rename from gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java rename to gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests.java index 3a95b6cb79..058eae7de2 100644 --- a/gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java +++ b/gui/src/test/java/io/bisq/common/fxml/FxmlViewLoaderTests.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.fxml; +package io.bisq.common.fxml; -import io.bitsquare.gui.common.ViewfxException; -import io.bitsquare.gui.common.fxml.FxmlViewLoader; -import io.bitsquare.gui.common.view.*; +import io.bisq.gui.common.ViewfxException; +import io.bisq.gui.common.fxml.FxmlViewLoader; +import io.bisq.gui.common.view.*; import javafx.fxml.LoadException; import org.junit.Before; import org.junit.Ignore; diff --git a/gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java b/gui/src/test/java/io/bisq/common/support/CachingViewLoaderTests.java similarity index 89% rename from gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java rename to gui/src/test/java/io/bisq/common/support/CachingViewLoaderTests.java index 9fcbada5cd..e2c87ecfee 100644 --- a/gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java +++ b/gui/src/test/java/io/bisq/common/support/CachingViewLoaderTests.java @@ -15,11 +15,11 @@ * along with bisq. If not, see . */ -package io.bitsquare.common.support; +package io.bisq.common.support; -import io.bitsquare.gui.common.view.AbstractView; -import io.bitsquare.gui.common.view.CachingViewLoader; -import io.bitsquare.gui.common.view.ViewLoader; +import io.bisq.gui.common.view.AbstractView; +import io.bisq.gui.common.view.CachingViewLoader; +import io.bisq.gui.common.view.ViewLoader; import org.junit.Test; import static org.mockito.BDDMockito.then; diff --git a/gui/src/test/java/io/bitsquare/gui/AwesomeFontDemo.java b/gui/src/test/java/io/bisq/gui/AwesomeFontDemo.java similarity index 98% rename from gui/src/test/java/io/bitsquare/gui/AwesomeFontDemo.java rename to gui/src/test/java/io/bisq/gui/AwesomeFontDemo.java index 5ef83c73b3..00582bf5db 100644 --- a/gui/src/test/java/io/bitsquare/gui/AwesomeFontDemo.java +++ b/gui/src/test/java/io/bisq/gui/AwesomeFontDemo.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui; +package io.bisq.gui; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; diff --git a/gui/src/test/java/io/bitsquare/gui/BindingTest.java b/gui/src/test/java/io/bisq/gui/BindingTest.java similarity index 98% rename from gui/src/test/java/io/bitsquare/gui/BindingTest.java rename to gui/src/test/java/io/bisq/gui/BindingTest.java index b033c179d4..d4ca7dbb4c 100644 --- a/gui/src/test/java/io/bitsquare/gui/BindingTest.java +++ b/gui/src/test/java/io/bisq/gui/BindingTest.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui; +package io.bisq.gui; import javafx.application.Application; import javafx.beans.property.SimpleStringProperty; diff --git a/gui/src/test/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModelTest.java b/gui/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java similarity index 92% rename from gui/src/test/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModelTest.java rename to gui/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java index 23b2645a8c..8ec2678085 100644 --- a/gui/src/test/java/io/bitsquare/gui/main/market/trades/TradesChartsViewModelTest.java +++ b/gui/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java @@ -1,8 +1,8 @@ -package io.bitsquare.gui.main.market.trades; +package io.bisq.gui.main.market.trades; -import io.bitsquare.gui.main.market.trades.charts.CandleData; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.messages.trade.statistics.payload.TradeStatistics; +import io.bisq.gui.main.market.trades.charts.CandleData; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.messages.trade.statistics.payload.TradeStatistics; import org.bitcoinj.core.Coin; import org.bitcoinj.utils.Fiat; import org.junit.Ignore; diff --git a/gui/src/test/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModelTest.java b/gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java similarity index 95% rename from gui/src/test/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModelTest.java rename to gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java index e99f8eb2dc..e1b600b099 100644 --- a/gui/src/test/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModelTest.java +++ b/gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java @@ -1,15 +1,15 @@ -package io.bitsquare.gui.main.offer.offerbook; +package io.bisq.gui.main.offer.offerbook; -import io.bitsquare.messages.locale.Country; -import io.bitsquare.messages.locale.CryptoCurrency; -import io.bitsquare.messages.locale.FiatCurrency; -import io.bitsquare.messages.payment.PaymentMethod; -import io.bitsquare.messages.payment.payload.NationalBankAccountContractData; -import io.bitsquare.messages.payment.payload.SameBankAccountContractData; -import io.bitsquare.messages.payment.payload.SepaAccountContractData; -import io.bitsquare.messages.payment.payload.SpecificBanksAccountContractData; -import io.bitsquare.messages.trade.offer.payload.Offer; -import io.bitsquare.payment.*; +import io.bisq.messages.locale.Country; +import io.bisq.messages.locale.CryptoCurrency; +import io.bisq.messages.locale.FiatCurrency; +import io.bisq.messages.payment.PaymentMethod; +import io.bisq.messages.payment.payload.NationalBankAccountContractData; +import io.bisq.messages.payment.payload.SameBankAccountContractData; +import io.bisq.messages.payment.payload.SepaAccountContractData; +import io.bisq.messages.payment.payload.SpecificBanksAccountContractData; +import io.bisq.messages.trade.offer.payload.Offer; +import io.bisq.payment.*; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -78,7 +78,7 @@ public class OfferBookViewModelTest { assertTrue(PaymentAccountUtil.isAnyPaymentAccountValidForOffer( getSEPAPaymentMethod("EUR", "AT", new ArrayList<>(Arrays.asList("AT", "DE")), "PSK"), paymentAccounts)); - + // offer: sepa paymentAccount: nationalBank - same country, same currency // wrong method paymentAccounts = new ArrayList<>(Arrays.asList(getNationalBankAccount("EUR", "AT", "PSK"))); diff --git a/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java b/gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java similarity index 99% rename from gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java rename to gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java index abc934e55b..f09e3eddf7 100644 --- a/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java +++ b/gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util; +package io.bisq.gui.util; import org.bitcoinj.core.Coin; import org.junit.Test; diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java b/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java similarity index 99% rename from gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java rename to gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java index 177d36d8fe..cf6a82275e 100644 --- a/gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java +++ b/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; import org.junit.Test; @@ -67,7 +67,7 @@ public class AltCoinAddressValidatorTest { assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaTo").isValid); assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaRt#").isValid); }*/ - + @Test public void testIOP() { AltCoinAddressValidator validator = new AltCoinAddressValidator(); diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java b/gui/src/test/java/io/bisq/gui/util/validation/BtcValidatorTest.java similarity index 96% rename from gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java rename to gui/src/test/java/io/bisq/gui/util/validation/BtcValidatorTest.java index bed0ab0019..eb13b6a93f 100644 --- a/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java +++ b/gui/src/test/java/io/bisq/gui/util/validation/BtcValidatorTest.java @@ -15,9 +15,9 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; -import io.bitsquare.gui.util.BSFormatter; +import io.bisq.gui.util.BSFormatter; import org.bitcoinj.core.Coin; import org.junit.Test; diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java b/gui/src/test/java/io/bisq/gui/util/validation/FiatValidatorTest.java similarity index 96% rename from gui/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java rename to gui/src/test/java/io/bisq/gui/util/validation/FiatValidatorTest.java index 0c3ba0c7e5..89c931b239 100644 --- a/gui/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java +++ b/gui/src/test/java/io/bisq/gui/util/validation/FiatValidatorTest.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; import org.junit.Test; @@ -26,7 +26,7 @@ public class FiatValidatorTest { @Test public void testValidate() { FiatValidator validator = new FiatValidator(); - NumberValidator.ValidationResult validationResult; + InputValidator.ValidationResult validationResult; assertTrue(validator.validate("1").isValid); diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/InteracETransferValidatorTest.java b/gui/src/test/java/io/bisq/gui/util/validation/InteracETransferValidatorTest.java similarity index 97% rename from gui/src/test/java/io/bitsquare/gui/util/validation/InteracETransferValidatorTest.java rename to gui/src/test/java/io/bisq/gui/util/validation/InteracETransferValidatorTest.java index 916f172c1e..d7ba7d9b2b 100644 --- a/gui/src/test/java/io/bitsquare/gui/util/validation/InteracETransferValidatorTest.java +++ b/gui/src/test/java/io/bisq/gui/util/validation/InteracETransferValidatorTest.java @@ -15,7 +15,7 @@ * along with bisq. If not, see . */ -package io.bitsquare.gui.util.validation; +package io.bisq.gui.util.validation; import org.junit.Test; diff --git a/headless/pom.xml b/headless/pom.xml index 19abbb09cb..d355df5e14 100644 --- a/headless/pom.xml +++ b/headless/pom.xml @@ -42,7 +42,7 @@ - io.bitsquare.headless.HeadlessMain + io.bisq.headless.HeadlessMain diff --git a/headless/src/main/java/io/bitsquare/headless/Headless.java b/headless/src/main/java/io/bisq/headless/Headless.java similarity index 86% rename from headless/src/main/java/io/bitsquare/headless/Headless.java rename to headless/src/main/java/io/bisq/headless/Headless.java index e364229fa6..989e245add 100644 --- a/headless/src/main/java/io/bitsquare/headless/Headless.java +++ b/headless/src/main/java/io/bisq/headless/Headless.java @@ -1,25 +1,25 @@ -package io.bitsquare.headless; +package io.bisq.headless; import ch.qos.logback.classic.Level; import com.google.inject.Guice; import com.google.inject.Injector; -import io.bitsquare.app.AppOptionKeys; -import io.bitsquare.app.BitsquareEnvironment; -import io.bitsquare.app.Log; -import io.bitsquare.app.Version; -import io.bitsquare.arbitration.ArbitratorManager; -import io.bitsquare.btc.wallet.BsqWalletService; -import io.bitsquare.btc.wallet.BtcWalletService; -import io.bitsquare.btc.wallet.WalletsSetup; -import io.bitsquare.common.CommonOptionKeys; -import io.bitsquare.common.UserThread; -import io.bitsquare.common.handlers.ResultHandler; -import io.bitsquare.common.util.LimitedKeyStrengthException; -import io.bitsquare.common.util.Utilities; -import io.bitsquare.p2p.P2PService; -import io.bitsquare.p2p.P2PServiceListener; -import io.bitsquare.trade.offer.OfferBookService; -import io.bitsquare.trade.offer.OpenOfferManager; +import io.bisq.app.AppOptionKeys; +import io.bisq.app.BitsquareEnvironment; +import io.bisq.app.Log; +import io.bisq.app.Version; +import io.bisq.arbitration.ArbitratorManager; +import io.bisq.btc.wallet.BsqWalletService; +import io.bisq.btc.wallet.BtcWalletService; +import io.bisq.btc.wallet.WalletsSetup; +import io.bisq.common.CommonOptionKeys; +import io.bisq.common.UserThread; +import io.bisq.common.handlers.ResultHandler; +import io.bisq.common.util.LimitedKeyStrengthException; +import io.bisq.common.util.Utilities; +import io.bisq.p2p.P2PService; +import io.bisq.p2p.P2PServiceListener; +import io.bisq.trade.offer.OfferBookService; +import io.bisq.trade.offer.OpenOfferManager; import org.apache.commons.lang3.exception.ExceptionUtils; import org.bitcoinj.store.BlockStoreException; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/headless/src/main/java/io/bitsquare/headless/HeadlessMain.java b/headless/src/main/java/io/bisq/headless/HeadlessMain.java similarity index 91% rename from headless/src/main/java/io/bitsquare/headless/HeadlessMain.java rename to headless/src/main/java/io/bisq/headless/HeadlessMain.java index 5731c6dd05..26c8ba1532 100644 --- a/headless/src/main/java/io/bitsquare/headless/HeadlessMain.java +++ b/headless/src/main/java/io/bisq/headless/HeadlessMain.java @@ -15,13 +15,13 @@ * along with bisq. If not, see . */ -package io.bitsquare.headless; +package io.bisq.headless; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.bitsquare.app.AppOptionKeys; -import io.bitsquare.app.BitsquareEnvironment; -import io.bitsquare.app.BitsquareExecutable; -import io.bitsquare.common.UserThread; +import io.bisq.app.AppOptionKeys; +import io.bisq.app.BitsquareEnvironment; +import io.bisq.app.BitsquareExecutable; +import io.bisq.common.UserThread; import joptsimple.OptionException; import joptsimple.OptionParser; import joptsimple.OptionSet; @@ -32,8 +32,8 @@ import java.util.Scanner; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; -import static io.bitsquare.app.BitsquareEnvironment.DEFAULT_APP_NAME; -import static io.bitsquare.app.BitsquareEnvironment.DEFAULT_USER_DATA_DIR; +import static io.bisq.app.BitsquareEnvironment.DEFAULT_APP_NAME; +import static io.bisq.app.BitsquareEnvironment.DEFAULT_USER_DATA_DIR; public class HeadlessMain extends BitsquareExecutable { private static final Logger log = LoggerFactory.getLogger(HeadlessMain.class); diff --git a/headless/src/main/java/io/bitsquare/headless/HeadlessModule.java b/headless/src/main/java/io/bisq/headless/HeadlessModule.java similarity index 80% rename from headless/src/main/java/io/bitsquare/headless/HeadlessModule.java rename to headless/src/main/java/io/bisq/headless/HeadlessModule.java index 9766d448e7..929518a3f6 100644 --- a/headless/src/main/java/io/bitsquare/headless/HeadlessModule.java +++ b/headless/src/main/java/io/bisq/headless/HeadlessModule.java @@ -15,26 +15,26 @@ * along with bisq. If not, see . */ -package io.bitsquare.headless; +package io.bisq.headless; import com.google.inject.Singleton; -import io.bitsquare.alert.AlertModule; -import io.bitsquare.app.AppModule; -import io.bitsquare.app.BitsquareEnvironment; -import io.bitsquare.arbitration.ArbitratorModule; -import io.bitsquare.btc.BitcoinModule; -import io.bitsquare.common.Clock; -import io.bitsquare.common.crypto.KeyRing; -import io.bitsquare.common.crypto.KeyStorage; -import io.bitsquare.crypto.EncryptionServiceModule; -import io.bitsquare.dao.DaoModule; -import io.bitsquare.filter.FilterModule; -import io.bitsquare.messages.user.Preferences; -import io.bitsquare.p2p.P2PModule; -import io.bitsquare.storage.Storage; -import io.bitsquare.trade.TradeModule; -import io.bitsquare.trade.offer.OfferModule; -import io.bitsquare.user.User; +import io.bisq.alert.AlertModule; +import io.bisq.app.AppModule; +import io.bisq.app.BitsquareEnvironment; +import io.bisq.arbitration.ArbitratorModule; +import io.bisq.btc.BitcoinModule; +import io.bisq.common.Clock; +import io.bisq.common.crypto.KeyRing; +import io.bisq.common.crypto.KeyStorage; +import io.bisq.crypto.EncryptionServiceModule; +import io.bisq.dao.DaoModule; +import io.bisq.filter.FilterModule; +import io.bisq.messages.user.Preferences; +import io.bisq.p2p.P2PModule; +import io.bisq.storage.Storage; +import io.bisq.trade.TradeModule; +import io.bisq.trade.offer.OfferModule; +import io.bisq.user.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; diff --git a/headless/src/main/resources/logback.xml b/headless/src/main/resources/logback.xml index f576f6af12..41dba7bd34 100644 --- a/headless/src/main/resources/logback.xml +++ b/headless/src/main/resources/logback.xml @@ -27,8 +27,8 @@ - - + +