From 919cde4e437abf8b145de4f772c8f8dcbb97e0f4 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 26 Aug 2014 21:52:04 +0200 Subject: [PATCH] removed unused code, comments, small refactorings --- src/main/java/io/bitsquare/BitSquare.java | 9 +- .../{user => arbitrator}/Arbitrator.java | 2 +- .../{user => arbitrator}/Reputation.java | 7 +- .../java/io/bitsquare/btc/WalletFacade.java | 6 +- .../java/io/bitsquare/di/BitSquareModule.java | 2 +- .../java/io/bitsquare/gui/MainController.java | 2 +- .../java/io/bitsquare/gui/NavigationItem.java | 2 +- .../ArbitratorBrowserController.java} | 10 +- .../ArbitratorBrowserView.fxml} | 2 +- .../profile/ArbitratorProfileController.java | 4 +- .../ArbitratorRegistrationController.java | 8 +- .../gui/components/CachingTabPane.java | 3 +- .../ConfidenceDisplay.java | 8 +- .../io/bitsquare/gui/components/HSpacer.java | 2 - .../gui/components/NetworkSyncPane.java | 2 + .../gui/components/NoFocusScrollPane.java | 29 --- .../io/bitsquare/gui/components/Popups.java | 3 + .../io/bitsquare/gui/components/VSpacer.java | 2 - .../gui/components/ValidatedTextField.java | 2 + .../gui/components/ValidatingTextField.java | 2 +- .../ConfidenceProgressIndicator.java | 2 + .../ConfidenceProgressIndicatorBehavior.java | 5 + .../skin/ConfidenceProgressIndicatorSkin.java | 4 +- .../components/processbar/ProcessStepBar.java | 58 ----- .../processbar/ProcessStepBarSkin.java | 208 ------------------ .../processbar/ProcessStepItem.java | 54 ----- .../bitsquare/gui/funds/FundsController.java | 2 +- .../gui/funds/deposit/DepositController.java | 1 + .../io/bitsquare/gui/home/HomeController.java | 2 + .../io/bitsquare/gui/msg/MsgController.java | 2 + .../gui/orders/OrdersController.java | 2 +- .../orders/closed/ClosedTradeController.java | 2 +- .../pending/PendingTradeController.java | 2 +- .../gui/settings/SettingsController.java | 13 +- .../bitsquare/gui/trade/TradeController.java | 14 +- .../trade/createoffer/CreateOfferModel.java | 2 +- .../createoffer/CreateOfferPresenter.java | 2 +- .../trade/orderbook/OrderBookController.java | 12 +- ...ntroller.java => TakeOfferController.java} | 6 +- .../gui/trade/takeoffer/TakeOfferView.fxml | 2 +- .../io/bitsquare/gui/util/BSFormatter.java | 2 +- .../java/io/bitsquare/gui/util/ImageUtil.java | 2 - .../util/{ => validation}/BtcValidator.java | 2 +- .../util/{ => validation}/FiatValidator.java | 2 +- .../{ => validation}/NumberValidator.java | 2 +- .../{ => validation}/ValidationHelper.java | 2 +- .../msg/BootstrappedPeerFactory.java | 2 +- .../java/io/bitsquare/msg/MessageFacade.java | 4 +- src/main/java/io/bitsquare/msg/P2PNode.java | 4 +- .../IncomingTradeMessageListener.java | 2 +- .../{storage => persistence}/Persistence.java | 2 +- .../java/io/bitsquare/settings/Settings.java | 2 +- .../java/io/bitsquare/trade/Contract.java | 3 + src/main/java/io/bitsquare/trade/Offer.java | 4 +- src/main/java/io/bitsquare/trade/Trade.java | 2 + .../java/io/bitsquare/trade/TradeManager.java | 8 +- .../bitsquare/trade/orderbook/OrderBook.java | 2 +- .../createoffer/CreateOfferCoordinator.java | 2 +- .../protocol/{ => trade}/TradeMessage.java | 2 +- .../messages/BankTransferInitedMessage.java | 2 +- .../messages/DepositTxPublishedMessage.java | 2 +- .../RequestTakerDepositPaymentMessage.java | 2 +- .../RespondToTakeOfferRequestMessage.java | 2 +- .../messages/PayoutTxPublishedMessage.java | 2 +- ...RequestOffererPublishDepositTxMessage.java | 2 +- .../messages/RequestTakeOfferMessage.java | 2 +- .../messages/TakeOfferFeePayedMessage.java | 2 +- src/main/java/io/bitsquare/user/User.java | 3 +- .../java/io/bitsquare/util/AWTSystemTray.java | 4 + ...geDirectory.java => AppDirectoryUtil.java} | 6 +- .../java/io/bitsquare/util/DSAKeyUtil.java | 6 - src/main/java/io/bitsquare/util/FileUtil.java | 4 +- .../resources/i18n/displayStrings.properties | 1 + .../bitsquare/gui/util/BtcValidatorTest.java | 3 + .../bitsquare/gui/util/FiatValidatorTest.java | 3 + 75 files changed, 142 insertions(+), 457 deletions(-) rename src/main/java/io/bitsquare/{user => arbitrator}/Arbitrator.java (99%) rename src/main/java/io/bitsquare/{user => arbitrator}/Reputation.java (90%) rename src/main/java/io/bitsquare/gui/arbitrators/{overview/ArbitratorOverviewController.java => browser/ArbitratorBrowserController.java} (95%) rename src/main/java/io/bitsquare/gui/arbitrators/{overview/ArbitratorOverviewView.fxml => browser/ArbitratorBrowserView.fxml} (97%) rename src/main/java/io/bitsquare/gui/{util => components}/ConfidenceDisplay.java (99%) delete mode 100644 src/main/java/io/bitsquare/gui/components/NoFocusScrollPane.java delete mode 100644 src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java delete mode 100644 src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java delete mode 100644 src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java rename src/main/java/io/bitsquare/gui/trade/takeoffer/{TakerOfferController.java => TakeOfferController.java} (98%) rename src/main/java/io/bitsquare/gui/util/{ => validation}/BtcValidator.java (98%) rename src/main/java/io/bitsquare/gui/util/{ => validation}/FiatValidator.java (98%) rename src/main/java/io/bitsquare/gui/util/{ => validation}/NumberValidator.java (99%) rename src/main/java/io/bitsquare/gui/util/{ => validation}/ValidationHelper.java (99%) rename src/main/java/io/bitsquare/{storage => persistence}/Persistence.java (99%) rename src/main/java/io/bitsquare/trade/protocol/{ => trade}/TradeMessage.java (94%) rename src/main/java/io/bitsquare/util/{StorageDirectory.java => AppDirectoryUtil.java} (95%) diff --git a/src/main/java/io/bitsquare/BitSquare.java b/src/main/java/io/bitsquare/BitSquare.java index 0539aa0551..ebe63de372 100644 --- a/src/main/java/io/bitsquare/BitSquare.java +++ b/src/main/java/io/bitsquare/BitSquare.java @@ -25,10 +25,10 @@ import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.util.Profiler; import io.bitsquare.msg.MessageFacade; import io.bitsquare.settings.Settings; -import io.bitsquare.storage.Persistence; +import io.bitsquare.persistence.Persistence; import io.bitsquare.user.User; import io.bitsquare.util.AWTSystemTray; -import io.bitsquare.util.StorageDirectory; +import io.bitsquare.util.AppDirectoryUtil; import com.google.common.base.Throwables; @@ -48,7 +48,6 @@ import javafx.stage.Stage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public class BitSquare extends Application { private static final Logger log = LoggerFactory.getLogger(BitSquare.class); @@ -83,8 +82,8 @@ public class BitSquare extends Application { Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> Popups.handleUncaughtExceptions (Throwables.getRootCause(throwable))); - StorageDirectory.setStorageDirectory( - new File(StorageDirectory.getApplicationDirectory().getCanonicalPath() + "/data")); + AppDirectoryUtil.setStorageDirectory( + new File(AppDirectoryUtil.getApplicationDirectory().getCanonicalPath() + "/data")); // currently there is not SystemTray support for java fx (planned for version 3) so we use the old AWT AWTSystemTray.createSystemTray(primaryStage); diff --git a/src/main/java/io/bitsquare/user/Arbitrator.java b/src/main/java/io/bitsquare/arbitrator/Arbitrator.java similarity index 99% rename from src/main/java/io/bitsquare/user/Arbitrator.java rename to src/main/java/io/bitsquare/arbitrator/Arbitrator.java index eb48b9dd77..48ae03be9d 100644 --- a/src/main/java/io/bitsquare/user/Arbitrator.java +++ b/src/main/java/io/bitsquare/arbitrator/Arbitrator.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.user; +package io.bitsquare.arbitrator; import java.io.Serializable; diff --git a/src/main/java/io/bitsquare/user/Reputation.java b/src/main/java/io/bitsquare/arbitrator/Reputation.java similarity index 90% rename from src/main/java/io/bitsquare/user/Reputation.java rename to src/main/java/io/bitsquare/arbitrator/Reputation.java index 075244cd8d..fbeab9e947 100644 --- a/src/main/java/io/bitsquare/user/Reputation.java +++ b/src/main/java/io/bitsquare/arbitrator/Reputation.java @@ -15,13 +15,18 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.user; +package io.bitsquare.arbitrator; import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +//TODO still open if we use that really... + +/** + * Reputation for Arbitrators + */ public class Reputation implements Serializable { private static final long serialVersionUID = -3073174320050879490L; diff --git a/src/main/java/io/bitsquare/btc/WalletFacade.java b/src/main/java/io/bitsquare/btc/WalletFacade.java index e245b5026e..14a778b65c 100644 --- a/src/main/java/io/bitsquare/btc/WalletFacade.java +++ b/src/main/java/io/bitsquare/btc/WalletFacade.java @@ -21,8 +21,8 @@ import io.bitsquare.BitSquare; import io.bitsquare.btc.listeners.BalanceListener; import io.bitsquare.btc.listeners.ConfidenceListener; import io.bitsquare.crypto.CryptoFacade; -import io.bitsquare.storage.Persistence; -import io.bitsquare.util.StorageDirectory; +import io.bitsquare.persistence.Persistence; +import io.bitsquare.util.AppDirectoryUtil; import com.google.bitcoin.core.Address; import com.google.bitcoin.core.AddressFormatException; @@ -139,7 +139,7 @@ public class WalletFacade { Threading.USER_THREAD = Platform::runLater; // If seed is non-null it means we are restoring from backup. - walletAppKit = new WalletAppKit(params, StorageDirectory.getStorageDirectory(), WALLET_PREFIX) { + walletAppKit = new WalletAppKit(params, AppDirectoryUtil.getStorageDirectory(), WALLET_PREFIX) { @Override protected void onSetupCompleted() { // Don't make the user wait for confirmations for now, as the intention is they're sending it diff --git a/src/main/java/io/bitsquare/di/BitSquareModule.java b/src/main/java/io/bitsquare/di/BitSquareModule.java index db0fc1dac7..1a5fc6c4b8 100644 --- a/src/main/java/io/bitsquare/di/BitSquareModule.java +++ b/src/main/java/io/bitsquare/di/BitSquareModule.java @@ -28,7 +28,7 @@ import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.P2PNode; import io.bitsquare.msg.SeedNodeAddress; import io.bitsquare.settings.Settings; -import io.bitsquare.storage.Persistence; +import io.bitsquare.persistence.Persistence; import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.orderbook.OrderBook; import io.bitsquare.user.User; diff --git a/src/main/java/io/bitsquare/gui/MainController.java b/src/main/java/io/bitsquare/gui/MainController.java index e22c22ad89..ffa1cc824a 100644 --- a/src/main/java/io/bitsquare/gui/MainController.java +++ b/src/main/java/io/bitsquare/gui/MainController.java @@ -29,7 +29,7 @@ import io.bitsquare.gui.util.Profiler; import io.bitsquare.gui.util.Transitions; import io.bitsquare.msg.listeners.BootstrapListener; import io.bitsquare.msg.MessageFacade; -import io.bitsquare.storage.Persistence; +import io.bitsquare.persistence.Persistence; import io.bitsquare.trade.TradeManager; import io.bitsquare.user.User; import io.bitsquare.util.AWTSystemTray; diff --git a/src/main/java/io/bitsquare/gui/NavigationItem.java b/src/main/java/io/bitsquare/gui/NavigationItem.java index 43eae9380f..99b7d30bb0 100644 --- a/src/main/java/io/bitsquare/gui/NavigationItem.java +++ b/src/main/java/io/bitsquare/gui/NavigationItem.java @@ -43,7 +43,7 @@ public enum NavigationItem { TRANSACTIONS("/io/bitsquare/gui/funds/transactions/TransactionsView.fxml"), ARBITRATOR_PROFILE("/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileView.fxml"), - ARBITRATOR_OVERVIEW("/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewView.fxml"), + ARBITRATOR_BROWSER("/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml"), ARBITRATOR_REGISTRATION("/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationView.fxml"); private final String fxmlUrl; diff --git a/src/main/java/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewController.java b/src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserController.java similarity index 95% rename from src/main/java/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewController.java rename to src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserController.java index eaca468582..a4609581ac 100644 --- a/src/main/java/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewController.java +++ b/src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserController.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.arbitrators.overview; +package io.bitsquare.gui.arbitrators.browser; import io.bitsquare.di.GuiceFXMLLoader; import io.bitsquare.gui.CachedViewController; @@ -26,8 +26,8 @@ import io.bitsquare.locale.LanguageUtil; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.ArbitratorListener; import io.bitsquare.settings.Settings; -import io.bitsquare.storage.Persistence; -import io.bitsquare.user.Arbitrator; +import io.bitsquare.persistence.Persistence; +import io.bitsquare.arbitrator.Arbitrator; import java.io.IOException; @@ -56,7 +56,7 @@ import net.tomp2p.storage.Data; * * Arbitration is not much developed yet */ -public class ArbitratorOverviewController extends CachedViewController implements ArbitratorListener { +public class ArbitratorBrowserController extends CachedViewController implements ArbitratorListener { private final Settings settings; private final Persistence persistence; @@ -74,7 +74,7 @@ public class ArbitratorOverviewController extends CachedViewController implement /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public ArbitratorOverviewController(Settings settings, Persistence persistence, MessageFacade messageFacade) { + public ArbitratorBrowserController(Settings settings, Persistence persistence, MessageFacade messageFacade) { this.settings = settings; this.persistence = persistence; diff --git a/src/main/java/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewView.fxml b/src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewView.fxml rename to src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml index 9a1aa17234..764083fa37 100644 --- a/src/main/java/io/bitsquare/gui/arbitrators/overview/ArbitratorOverviewView.fxml +++ b/src/main/java/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml @@ -18,7 +18,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java b/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java index bd7b6b27dd..9c67ec1f7f 100644 --- a/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java +++ b/src/main/java/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileController.java @@ -22,8 +22,8 @@ import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.ViewController; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.settings.Settings; -import io.bitsquare.storage.Persistence; -import io.bitsquare.user.Arbitrator; +import io.bitsquare.persistence.Persistence; +import io.bitsquare.arbitrator.Arbitrator; import java.net.URL; diff --git a/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java b/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java index 690ba57cdd..fb36fc217e 100644 --- a/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java +++ b/src/main/java/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationController.java @@ -25,13 +25,13 @@ import io.bitsquare.gui.arbitrators.profile.ArbitratorProfileController; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BitSquareValidator; -import io.bitsquare.gui.util.ConfidenceDisplay; +import io.bitsquare.gui.components.ConfidenceDisplay; import io.bitsquare.locale.LanguageUtil; import io.bitsquare.locale.Localisation; import io.bitsquare.msg.MessageFacade; -import io.bitsquare.storage.Persistence; -import io.bitsquare.user.Arbitrator; -import io.bitsquare.user.Reputation; +import io.bitsquare.persistence.Persistence; +import io.bitsquare.arbitrator.Arbitrator; +import io.bitsquare.arbitrator.Reputation; import io.bitsquare.user.User; import io.bitsquare.util.DSAKeyUtil; diff --git a/src/main/java/io/bitsquare/gui/components/CachingTabPane.java b/src/main/java/io/bitsquare/gui/components/CachingTabPane.java index 21f0fbf0f8..3b028e7853 100644 --- a/src/main/java/io/bitsquare/gui/components/CachingTabPane.java +++ b/src/main/java/io/bitsquare/gui/components/CachingTabPane.java @@ -19,7 +19,7 @@ package io.bitsquare.gui.components; import io.bitsquare.di.GuiceFXMLLoader; import io.bitsquare.gui.ViewController; -import io.bitsquare.storage.Persistence; +import io.bitsquare.persistence.Persistence; import java.io.IOException; @@ -37,7 +37,6 @@ import org.slf4j.LoggerFactory; * So when switching back to an already opened tab it is faster as no fxml loading is needed anymore. */ -//TODO remove manual caching as its done now in loader public class CachingTabPane extends TabPane { private static final Logger log = LoggerFactory.getLogger(CachingTabPane.class); diff --git a/src/main/java/io/bitsquare/gui/util/ConfidenceDisplay.java b/src/main/java/io/bitsquare/gui/components/ConfidenceDisplay.java similarity index 99% rename from src/main/java/io/bitsquare/gui/util/ConfidenceDisplay.java rename to src/main/java/io/bitsquare/gui/components/ConfidenceDisplay.java index d833b79bd0..76dd9edfb5 100644 --- a/src/main/java/io/bitsquare/gui/util/ConfidenceDisplay.java +++ b/src/main/java/io/bitsquare/gui/components/ConfidenceDisplay.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.util; +package io.bitsquare.gui.components; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; @@ -35,19 +35,15 @@ import javafx.scene.control.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +// TODO refactor public class ConfidenceDisplay { private static final Logger log = LoggerFactory.getLogger(ConfidenceDisplay.class); private WalletEventListener walletEventListener; - - private Wallet wallet; - private Label confirmationLabel; - private TextField balanceTextField; private Transaction transaction; - private ConfidenceProgressIndicator progressIndicator; public ConfidenceDisplay(Wallet wallet, Label confirmationLabel, TextField balanceTextField, diff --git a/src/main/java/io/bitsquare/gui/components/HSpacer.java b/src/main/java/io/bitsquare/gui/components/HSpacer.java index bedd20dfcb..87c7ee45e3 100644 --- a/src/main/java/io/bitsquare/gui/components/HSpacer.java +++ b/src/main/java/io/bitsquare/gui/components/HSpacer.java @@ -21,8 +21,6 @@ package io.bitsquare.gui.components; import javafx.scene.layout.*; public class HSpacer extends Pane { - public HSpacer() { - } public HSpacer(double width) { setPrefWidth(width); diff --git a/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java b/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java index 901e58a4f4..e8dbdf5de7 100644 --- a/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java +++ b/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java @@ -23,6 +23,8 @@ import javafx.scene.control.*; import javafx.scene.layout.*; import javafx.util.Duration; +// TODO replace with new notification component from lighthouse/bitcoinJ + public class NetworkSyncPane extends HBox { private final ProgressBar networkSyncProgressBar; diff --git a/src/main/java/io/bitsquare/gui/components/NoFocusScrollPane.java b/src/main/java/io/bitsquare/gui/components/NoFocusScrollPane.java deleted file mode 100644 index 35d1196e77..0000000000 --- a/src/main/java/io/bitsquare/gui/components/NoFocusScrollPane.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of Bitsquare. - * - * Bitsquare 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. - * - * Bitsquare 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 Bitsquare. If not, see . - */ - -package io.bitsquare.gui.components; - -import javafx.scene.control.*; - -class NoFocusScrollPane extends ScrollPane { - public NoFocusScrollPane() { - } - - public void requestFocus() { - // prevent focus - } -} diff --git a/src/main/java/io/bitsquare/gui/components/Popups.java b/src/main/java/io/bitsquare/gui/components/Popups.java index fee8532e69..ac8ab683b8 100644 --- a/src/main/java/io/bitsquare/gui/components/Popups.java +++ b/src/main/java/io/bitsquare/gui/components/Popups.java @@ -32,6 +32,9 @@ import org.controlsfx.control.action.Action; import org.controlsfx.dialog.Dialog; import org.controlsfx.dialog.Dialogs; +/** + * Collection of controlsfx Popups + */ public class Popups { // Information diff --git a/src/main/java/io/bitsquare/gui/components/VSpacer.java b/src/main/java/io/bitsquare/gui/components/VSpacer.java index 6832e1ed67..cde9c54543 100644 --- a/src/main/java/io/bitsquare/gui/components/VSpacer.java +++ b/src/main/java/io/bitsquare/gui/components/VSpacer.java @@ -21,8 +21,6 @@ package io.bitsquare.gui.components; import javafx.scene.layout.*; public class VSpacer extends Pane { - public VSpacer() { - } public VSpacer(double height) { setPrefHeight(height); diff --git a/src/main/java/io/bitsquare/gui/components/ValidatedTextField.java b/src/main/java/io/bitsquare/gui/components/ValidatedTextField.java index 71299197c1..c0a1a58c4f 100644 --- a/src/main/java/io/bitsquare/gui/components/ValidatedTextField.java +++ b/src/main/java/io/bitsquare/gui/components/ValidatedTextField.java @@ -46,6 +46,8 @@ import org.slf4j.LoggerFactory; * *

*/ + +//TODO replace with ValidatingTextField @Deprecated public class ValidatedTextField extends TextField { private static final Logger log = LoggerFactory.getLogger(ValidatedTextField.class); diff --git a/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java b/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java index bd48d0c436..02f77f127f 100644 --- a/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java +++ b/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.components; -import io.bitsquare.gui.util.NumberValidator; +import io.bitsquare.gui.util.validation.NumberValidator; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java b/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java index 2ee2c3d916..2dd2bab91d 100644 --- a/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java +++ b/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java @@ -35,6 +35,8 @@ import javafx.css.PseudoClass; import javafx.css.StyleableProperty; import javafx.scene.control.*; +// TODO Copied form OpenJFX, check license issues and way how we integrated it +// We changed behaviour which was not exposed via APIs /** * A circular control which is used for indicating progress, either diff --git a/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java b/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java index d3c159331b..a16e29ddd9 100644 --- a/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java +++ b/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java @@ -31,6 +31,11 @@ import java.util.Collections; import com.sun.javafx.scene.control.behavior.BehaviorBase; +// TODO Copied form OpenJFX, check license issues and way how we integrated it +// We changed behaviour which was not exposed via APIs +/** + * @param + */ public class ConfidenceProgressIndicatorBehavior extends BehaviorBase { /** diff --git a/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java b/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java index 1bd5d85c71..9e5f4243ca 100644 --- a/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java +++ b/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java @@ -64,7 +64,9 @@ import com.sun.javafx.css.converters.PaintConverter; import com.sun.javafx.css.converters.SizeConverter; import com.sun.javafx.scene.control.skin.BehaviorSkinBase; -@SuppressWarnings({"WeakerAccess", "SameReturnValue"}) +// TODO Copied form OpenJFX, check license issues and way how we integrated it +// We changed behaviour which was not exposed via APIs + public class ConfidenceProgressIndicatorSkin extends BehaviorSkinBase> { diff --git a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java b/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java deleted file mode 100644 index 1d1a42a7e5..0000000000 --- a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * This file is part of Bitsquare. - * - * Bitsquare 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. - * - * Bitsquare 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 Bitsquare. If not, see . - */ - -package io.bitsquare.gui.components.processbar; - -import java.util.List; - -import javafx.scene.control.*; - -public class ProcessStepBar extends Control { - - - private List processStepItems = null; - - public ProcessStepBar() { - } - - - public ProcessStepBar(List processStepItems) { - this.processStepItems = processStepItems; - } - - - @Override - protected Skin createDefaultSkin() { - return new ProcessStepBarSkin<>(this); - } - - - List getProcessStepItems() { - return processStepItems; - } - - public void setProcessStepItems(List processStepItems) { - this.processStepItems = processStepItems; - if (getSkin() != null) { - ((ProcessStepBarSkin) getSkin()).dataChanged(); - } - } - - public void next() { - ((ProcessStepBarSkin) getSkin()).next(); - } -} diff --git a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java b/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java deleted file mode 100644 index 430b6f6122..0000000000 --- a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java +++ /dev/null @@ -1,208 +0,0 @@ -/* - * This file is part of Bitsquare. - * - * Bitsquare 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. - * - * Bitsquare 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 Bitsquare. If not, see . - */ - -package io.bitsquare.gui.components.processbar; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javafx.geometry.Insets; -import javafx.geometry.Pos; -import javafx.scene.*; -import javafx.scene.control.*; -import javafx.scene.layout.*; -import javafx.scene.paint.*; -import javafx.scene.shape.*; - -import com.sun.javafx.scene.control.behavior.BehaviorBase; -import com.sun.javafx.scene.control.behavior.KeyBinding; -import com.sun.javafx.scene.control.skin.BehaviorSkinBase; - -class ProcessStepBarSkin extends BehaviorSkinBase, BehaviorBase>> { - private final ProcessStepBar controller; - private LabelWithBorder currentLabelWithBorder; - private LabelWithBorder prevLabelWithBorder; - private int index; - private List labelWithBorders; - - public ProcessStepBarSkin(final ProcessStepBar control) { - super(control, new BehaviorBase<>(control, Collections.emptyList())); - - controller = getSkinnable(); - - applyData(); - } - - public void dataChanged() { - applyData(); - } - - private void applyData() { - if (controller.getProcessStepItems() != null) { - int i = 0; - labelWithBorders = new ArrayList<>(); - int size = controller.getProcessStepItems().size(); - for (ProcessStepItem processStepItem : controller.getProcessStepItems()) { - LabelWithBorder labelWithBorder = new LabelWithBorder(processStepItem, i == 0, i == size - 1); - getChildren().add(labelWithBorder); - labelWithBorders.add(labelWithBorder); - if (i == 0) { - currentLabelWithBorder = prevLabelWithBorder = labelWithBorder; - } - - i++; - } - - currentLabelWithBorder.select(); - } - } - - public void next() { - index++; - - prevLabelWithBorder.deSelect(); - if (index < labelWithBorders.size()) { - currentLabelWithBorder = labelWithBorders.get(index); - currentLabelWithBorder.select(); - - prevLabelWithBorder = currentLabelWithBorder; - } - } - - @Override - protected void layoutChildren(double x, double y, double width, double height) { - double distance = 10; - double padding = 50; - for (int i = 0; i < getChildren().size(); i++) { - Node node = getChildren().get(i); - - double newWidth = snapSize(node.prefWidth(height)) + padding; - double newHeight = snapSize(node.prefHeight(-1) + 10); - - if (i > 0) { - x = snapPosition(x - ((LabelWithBorder) node).getArrowWidth()); - } - - x = snapPosition(x); - y = snapPosition(y); - node.resize(newWidth, newHeight); - node.relocate(x, y); - x += newWidth + distance; - } - } - - - public static class LabelWithBorder extends Label { - final double borderWidth = 1; - private final double arrowWidth = 10; - private final double arrowHeight = 30; - - private final ProcessStepItem processStepItem; - private final boolean isFirst; - private final boolean isLast; - - public LabelWithBorder(ProcessStepItem processStepItem, boolean isFirst, boolean isLast) { - super(processStepItem.getLabel()); - this.processStepItem = processStepItem; - - this.isFirst = isFirst; - this.isLast = isLast; - - setAlignment(Pos.CENTER); - setTextFill(Color.GRAY); - setStyle("-fx-font-size: 14"); - - this.setShape(createButtonShape()); - - BorderStroke borderStroke = new BorderStroke(Color.LIGHTGRAY, BorderStrokeStyle.SOLID, null, - new BorderWidths(borderWidth, borderWidth, borderWidth, borderWidth), Insets.EMPTY); - this.setBorder(new Border(borderStroke)); - } - - public void select() { - BorderStroke borderStroke = new BorderStroke(processStepItem.getColor(), BorderStrokeStyle.SOLID, null, - new BorderWidths(borderWidth, borderWidth, borderWidth, borderWidth), Insets.EMPTY); - this.setBorder(new Border(borderStroke)); - setTextFill(processStepItem.getColor()); - } - - public void deSelect() { - } - - public double getArrowWidth() { - return arrowWidth; - } - - - private Path createButtonShape() { - // build the following shape (or home without left arrow) - - // -------- - // \ \ - // / / - // -------- - Path path = new Path(); - - // begin in the upper left corner - MoveTo e1 = new MoveTo(0, 0); - path.getElements().add(e1); - - // draw a horizontal line that defines the width of the shape - HLineTo e2 = new HLineTo(); - // bind the width of the shape to the width of the button - e2.xProperty().bind(this.widthProperty().subtract(arrowWidth)); - path.getElements().add(e2); - - if (!isLast) { - // draw upper part of right arrow - LineTo e3 = new LineTo(); - // the x endpoint of this line depends on the x property of line e2 - e3.xProperty().bind(e2.xProperty().add(arrowWidth)); - e3.setY(arrowHeight / 2.0); - path.getElements().add(e3); - } - - - // draw lower part of right arrow - LineTo e4 = new LineTo(); - // the x endpoint of this line depends on the x property of line e2 - e4.xProperty().bind(e2.xProperty()); - e4.setY(arrowHeight); - path.getElements().add(e4); - - // draw lower horizontal line - HLineTo e5 = new HLineTo(0); - path.getElements().add(e5); - - if (!isFirst) { - LineTo e6 = new LineTo(arrowWidth, arrowHeight / 2.0); - path.getElements().add(e6); - } - - // close path - ClosePath e7 = new ClosePath(); - path.getElements().add(e7); - // this is a dummy color to fill the shape, it won't be visible - path.setFill(Color.BLACK); - - return path; - } - - - } -} diff --git a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java b/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java deleted file mode 100644 index 9ee37095a5..0000000000 --- a/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of Bitsquare. - * - * Bitsquare 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. - * - * Bitsquare 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 Bitsquare. If not, see . - */ - -package io.bitsquare.gui.components.processbar; - -import io.bitsquare.gui.util.Colors; - -import javafx.scene.paint.*; - -public class ProcessStepItem { - private final String label; - private final Paint color; - private final boolean progressIndicator; - - public ProcessStepItem(String label) { - this(label, Colors.BLUE, false); - } - - public ProcessStepItem(String label, Paint color) { - this(label, color, false); - } - - private ProcessStepItem(String label, Paint color, boolean hasProgressIndicator) { - this.label = label; - this.color = color; - this.progressIndicator = hasProgressIndicator; - } - - public String getLabel() { - return label; - } - - public Paint getColor() { - return color; - } - - public boolean hasProgressIndicator() { - return progressIndicator; - } -} diff --git a/src/main/java/io/bitsquare/gui/funds/FundsController.java b/src/main/java/io/bitsquare/gui/funds/FundsController.java index 2671fddea2..31c7be5428 100644 --- a/src/main/java/io/bitsquare/gui/funds/FundsController.java +++ b/src/main/java/io/bitsquare/gui/funds/FundsController.java @@ -21,7 +21,7 @@ import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.ViewController; import io.bitsquare.gui.components.CachingTabPane; -import io.bitsquare.storage.Persistence; +import io.bitsquare.persistence.Persistence; import java.net.URL; diff --git a/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java b/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java index d7993912ea..e14f8f2371 100644 --- a/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java +++ b/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java @@ -43,6 +43,7 @@ import de.jensd.fx.fontawesome.AwesomeIcon; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +// TODO: might be removed completely public class DepositController extends CachedViewController { private static final Logger log = LoggerFactory.getLogger(DepositController.class); diff --git a/src/main/java/io/bitsquare/gui/home/HomeController.java b/src/main/java/io/bitsquare/gui/home/HomeController.java index eb5f53b7f7..f61d827b27 100644 --- a/src/main/java/io/bitsquare/gui/home/HomeController.java +++ b/src/main/java/io/bitsquare/gui/home/HomeController.java @@ -35,6 +35,8 @@ import javafx.scene.*; import javafx.stage.Modality; import javafx.stage.Stage; +// home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home, +// probably overview, event history, new, charts,... -> low prio public class HomeController extends CachedViewController { private ArbitratorRegistrationController arbitratorRegistrationController; diff --git a/src/main/java/io/bitsquare/gui/msg/MsgController.java b/src/main/java/io/bitsquare/gui/msg/MsgController.java index 67038fc002..fb30396fdb 100644 --- a/src/main/java/io/bitsquare/gui/msg/MsgController.java +++ b/src/main/java/io/bitsquare/gui/msg/MsgController.java @@ -30,6 +30,8 @@ import javax.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +// will be probably only used for arbitration communication, will be renamed and the icon changed + public class MsgController extends CachedViewController { private static final Logger log = LoggerFactory.getLogger(MsgController.class); diff --git a/src/main/java/io/bitsquare/gui/orders/OrdersController.java b/src/main/java/io/bitsquare/gui/orders/OrdersController.java index 4ce9279463..b34e03a8f4 100644 --- a/src/main/java/io/bitsquare/gui/orders/OrdersController.java +++ b/src/main/java/io/bitsquare/gui/orders/OrdersController.java @@ -21,7 +21,7 @@ import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.ViewController; import io.bitsquare.gui.components.CachingTabPane; -import io.bitsquare.storage.Persistence; +import io.bitsquare.persistence.Persistence; import java.net.URL; diff --git a/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java b/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java index 915da14f91..0b87dee241 100644 --- a/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java +++ b/src/main/java/io/bitsquare/gui/orders/closed/ClosedTradeController.java @@ -27,7 +27,7 @@ import javax.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +//TODO impl. missing yet public class ClosedTradeController extends CachedViewController { private static final Logger log = LoggerFactory.getLogger(ClosedTradeController.class); diff --git a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java b/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java index 9025abf565..ee3954aa94 100644 --- a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java +++ b/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeController.java @@ -24,7 +24,7 @@ import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.CachedViewController; import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator; import io.bitsquare.gui.util.BSFormatter; -import io.bitsquare.gui.util.ConfidenceDisplay; +import io.bitsquare.gui.components.ConfidenceDisplay; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.locale.Country; import io.bitsquare.locale.Localisation; diff --git a/src/main/java/io/bitsquare/gui/settings/SettingsController.java b/src/main/java/io/bitsquare/gui/settings/SettingsController.java index 54cefd651d..8ff5d9d354 100644 --- a/src/main/java/io/bitsquare/gui/settings/SettingsController.java +++ b/src/main/java/io/bitsquare/gui/settings/SettingsController.java @@ -35,9 +35,9 @@ import io.bitsquare.locale.Localisation; import io.bitsquare.locale.Region; import io.bitsquare.msg.MessageFacade; import io.bitsquare.settings.Settings; -import io.bitsquare.storage.Persistence; -import io.bitsquare.user.Arbitrator; -import io.bitsquare.user.Reputation; +import io.bitsquare.persistence.Persistence; +import io.bitsquare.arbitrator.Arbitrator; +import io.bitsquare.arbitrator.Reputation; import io.bitsquare.user.User; import io.bitsquare.util.DSAKeyUtil; @@ -74,6 +74,9 @@ import org.controlsfx.control.action.Action; import org.controlsfx.dialog.Dialog; // TODO separate in 2 view/controllers +// TODO: change ui to dispaly a menu on the left and the content on the right +// there will be more screens + public class SettingsController extends CachedViewController { private final User user; private final Settings settings; @@ -183,7 +186,7 @@ public class SettingsController extends CachedViewController { Scene scene = new Scene((Parent) view, 800, 600); stage.setScene(scene); stage.setOnHidden(windowEvent -> { - if (navigationItem == NavigationItem.ARBITRATOR_OVERVIEW) + if (navigationItem == NavigationItem.ARBITRATOR_BROWSER) updateArbitrators(); }); stage.show(); @@ -232,7 +235,7 @@ public class SettingsController extends CachedViewController { @FXML public void onOpenArbitratorScreen() { - loadViewAndGetChildController(NavigationItem.ARBITRATOR_OVERVIEW); + loadViewAndGetChildController(NavigationItem.ARBITRATOR_BROWSER); } diff --git a/src/main/java/io/bitsquare/gui/trade/TradeController.java b/src/main/java/io/bitsquare/gui/trade/TradeController.java index d533e20267..cfec85a2d4 100644 --- a/src/main/java/io/bitsquare/gui/trade/TradeController.java +++ b/src/main/java/io/bitsquare/gui/trade/TradeController.java @@ -24,7 +24,7 @@ import io.bitsquare.gui.ViewController; import io.bitsquare.gui.components.ValidatingTextField; import io.bitsquare.gui.trade.createoffer.CreateOfferCodeBehind; import io.bitsquare.gui.trade.orderbook.OrderBookController; -import io.bitsquare.gui.trade.takeoffer.TakerOfferController; +import io.bitsquare.gui.trade.takeoffer.TakeOfferController; import io.bitsquare.trade.Direction; import java.io.IOException; @@ -47,7 +47,7 @@ public class TradeController extends CachedViewController { protected OrderBookController orderBookController; protected CreateOfferCodeBehind createOfferCodeBehind; - protected TakerOfferController takerOfferController; + protected TakeOfferController takeOfferController; protected GuiceFXMLLoader orderBookLoader; @@ -126,20 +126,20 @@ public class TradeController extends CachedViewController { return null; } else if (navigationItem == NavigationItem.TAKE_OFFER) { - checkArgument(takerOfferController == null); + checkArgument(takeOfferController == null); // CreateOffer and TakeOffer must not be cached by GuiceFXMLLoader as we cannot use a view multiple times // in different graphs GuiceFXMLLoader loader = new GuiceFXMLLoader(getClass().getResource(navigationItem.getFxmlUrl()), false); try { final Parent view = loader.load(); - takerOfferController = loader.getController(); - takerOfferController.setParentController(this); + takeOfferController = loader.getController(); + takeOfferController.setParentController(this); final Tab tab = new Tab("Take offer"); tab.setContent(view); tabPane.getTabs().add(tab); tabPane.getSelectionModel().select(tabPane.getTabs().size() - 1); - return takerOfferController; + return takeOfferController; } catch (IOException e) { log.error(e.getMessage()); } @@ -163,7 +163,7 @@ public class TradeController extends CachedViewController { } public void onTakeOfferViewRemoved() { - takerOfferController = null; + takeOfferController = null; } diff --git a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferModel.java b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferModel.java index 1515a81b90..0d4a0a6fb7 100644 --- a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferModel.java +++ b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferModel.java @@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkArgument; /** - * Model: + * Data model: * Does not know the Presenter and View (CodeBehind) * Use Guice for DI *

diff --git a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferPresenter.java b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferPresenter.java index ccd16d2fee..2960042408 100644 --- a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferPresenter.java +++ b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferPresenter.java @@ -45,7 +45,7 @@ import static javafx.beans.binding.Bindings.createStringBinding; * Knows Model, does not know the View (CodeBehind) *

* - Holds data and state of the View (formatted) - * - Receive view input from Controller. Validates input, apply business logic, format to Presenter properties and + * - Receive view input from CodeBehind. Validates input, apply business logic, format to Presenter properties and * convert input to Model. * - Listen to updates from Model, apply business logic and format it to Presenter properties. Model update handling * can be done via Binding. diff --git a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java b/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java index 48609766a7..48c154d27e 100644 --- a/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java +++ b/src/main/java/io/bitsquare/gui/trade/orderbook/OrderBookController.java @@ -26,7 +26,7 @@ import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.ViewController; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.trade.createoffer.CreateOfferCodeBehind; -import io.bitsquare.gui.trade.takeoffer.TakerOfferController; +import io.bitsquare.gui.trade.takeoffer.TakeOfferController; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.locale.Country; @@ -34,7 +34,7 @@ import io.bitsquare.locale.CurrencyUtil; import io.bitsquare.locale.Localisation; import io.bitsquare.msg.MessageFacade; import io.bitsquare.settings.Settings; -import io.bitsquare.storage.Persistence; +import io.bitsquare.persistence.Persistence; import io.bitsquare.trade.Direction; import io.bitsquare.trade.Offer; import io.bitsquare.trade.orderbook.OrderBook; @@ -343,8 +343,8 @@ public class OrderBookController extends CachedViewController { private void takeOffer(Offer offer) { if (isRegistered()) { - TakerOfferController takerOfferController = - (TakerOfferController) parentController.loadViewAndGetChildController(NavigationItem.TAKE_OFFER); + TakeOfferController takeOfferController = + (TakeOfferController) parentController.loadViewAndGetChildController(NavigationItem.TAKE_OFFER); Coin requestedAmount; if (!"".equals(amount.getText())) { @@ -354,8 +354,8 @@ public class OrderBookController extends CachedViewController { requestedAmount = offer.getAmount(); } - if (takerOfferController != null) { - takerOfferController.initWithData(offer, requestedAmount); + if (takeOfferController != null) { + takeOfferController.initWithData(offer, requestedAmount); } } else { diff --git a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java b/src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferController.java similarity index 98% rename from src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java rename to src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferController.java index d3e9a440ed..84052ce38d 100644 --- a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakerOfferController.java +++ b/src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferController.java @@ -46,8 +46,8 @@ import javafx.scene.control.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TakerOfferController extends CachedViewController { - private static final Logger log = LoggerFactory.getLogger(TakerOfferController.class); +public class TakeOfferController extends CachedViewController { + private static final Logger log = LoggerFactory.getLogger(TakeOfferController.class); private final TradeManager tradeManager; private final WalletFacade walletFacade; @@ -74,7 +74,7 @@ public class TakerOfferController extends CachedViewController { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private TakerOfferController(TradeManager tradeManager, WalletFacade walletFacade) { + private TakeOfferController(TradeManager tradeManager, WalletFacade walletFacade) { this.tradeManager = tradeManager; this.walletFacade = walletFacade; } diff --git a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml b/src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml index 8364e6ef86..70747737aa 100644 --- a/src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml +++ b/src/main/java/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/src/main/java/io/bitsquare/gui/util/BSFormatter.java index 601c2e4361..713f19105f 100644 --- a/src/main/java/io/bitsquare/gui/util/BSFormatter.java +++ b/src/main/java/io/bitsquare/gui/util/BSFormatter.java @@ -20,7 +20,7 @@ package io.bitsquare.gui.util; import io.bitsquare.locale.Country; import io.bitsquare.locale.Localisation; import io.bitsquare.trade.Direction; -import io.bitsquare.user.Arbitrator; +import io.bitsquare.arbitrator.Arbitrator; import com.google.bitcoin.core.Coin; import com.google.bitcoin.utils.CoinFormat; diff --git a/src/main/java/io/bitsquare/gui/util/ImageUtil.java b/src/main/java/io/bitsquare/gui/util/ImageUtil.java index e64049f9ef..05de271774 100644 --- a/src/main/java/io/bitsquare/gui/util/ImageUtil.java +++ b/src/main/java/io/bitsquare/gui/util/ImageUtil.java @@ -47,12 +47,10 @@ public class ImageUtil { public static final String SELL = "/images/sell.png"; public static final String REMOVE = "/images/removeOffer.png"; - public static Image getIconImage(String iconName) { return new Image(ImageUtil.class.getResourceAsStream(iconName)); } - public static ImageView getIconImageView(String iconName) { return new ImageView(new Image(ImageUtil.class.getResourceAsStream(iconName))); } diff --git a/src/main/java/io/bitsquare/gui/util/BtcValidator.java b/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java similarity index 98% rename from src/main/java/io/bitsquare/gui/util/BtcValidator.java rename to src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java index 75dc8bebbb..4b956c7ed8 100644 --- a/src/main/java/io/bitsquare/gui/util/BtcValidator.java +++ b/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.util; +package io.bitsquare.gui.util.validation; import com.google.bitcoin.core.NetworkParameters; diff --git a/src/main/java/io/bitsquare/gui/util/FiatValidator.java b/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java similarity index 98% rename from src/main/java/io/bitsquare/gui/util/FiatValidator.java rename to src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java index 8e44838c14..02eb9ea885 100644 --- a/src/main/java/io/bitsquare/gui/util/FiatValidator.java +++ b/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.util; +package io.bitsquare.gui.util.validation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/bitsquare/gui/util/NumberValidator.java b/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java similarity index 99% rename from src/main/java/io/bitsquare/gui/util/NumberValidator.java rename to src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java index 2bba2ea3b5..88a24b229b 100644 --- a/src/main/java/io/bitsquare/gui/util/NumberValidator.java +++ b/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.util; +package io.bitsquare.gui.util.validation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/bitsquare/gui/util/ValidationHelper.java b/src/main/java/io/bitsquare/gui/util/validation/ValidationHelper.java similarity index 99% rename from src/main/java/io/bitsquare/gui/util/ValidationHelper.java rename to src/main/java/io/bitsquare/gui/util/validation/ValidationHelper.java index b175fc71da..157dae95d4 100644 --- a/src/main/java/io/bitsquare/gui/util/ValidationHelper.java +++ b/src/main/java/io/bitsquare/gui/util/validation/ValidationHelper.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.util; +package io.bitsquare.gui.util.validation; import io.bitsquare.gui.components.ValidatingTextField; diff --git a/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java b/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java index bf18316d7b..a41d4e6526 100644 --- a/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java +++ b/src/main/java/io/bitsquare/msg/BootstrappedPeerFactory.java @@ -17,7 +17,7 @@ package io.bitsquare.msg; -import io.bitsquare.storage.Persistence; +import io.bitsquare.persistence.Persistence; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; diff --git a/src/main/java/io/bitsquare/msg/MessageFacade.java b/src/main/java/io/bitsquare/msg/MessageFacade.java index 42212a47d3..bc4cd1e4d3 100644 --- a/src/main/java/io/bitsquare/msg/MessageFacade.java +++ b/src/main/java/io/bitsquare/msg/MessageFacade.java @@ -24,8 +24,8 @@ import io.bitsquare.msg.listeners.IncomingTradeMessageListener; import io.bitsquare.msg.listeners.OrderBookListener; import io.bitsquare.msg.listeners.OutgoingTradeMessageListener; import io.bitsquare.trade.Offer; -import io.bitsquare.trade.protocol.TradeMessage; -import io.bitsquare.user.Arbitrator; +import io.bitsquare.trade.protocol.trade.TradeMessage; +import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.user.User; import com.google.common.util.concurrent.FutureCallback; diff --git a/src/main/java/io/bitsquare/msg/P2PNode.java b/src/main/java/io/bitsquare/msg/P2PNode.java index 35bb47f3d0..954cd36762 100644 --- a/src/main/java/io/bitsquare/msg/P2PNode.java +++ b/src/main/java/io/bitsquare/msg/P2PNode.java @@ -18,7 +18,7 @@ package io.bitsquare.msg; import io.bitsquare.BitSquare; -import io.bitsquare.util.StorageDirectory; +import io.bitsquare.util.AppDirectoryUtil; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -302,7 +302,7 @@ public class P2PNode { if (useDiscStorage) { try { - File path = new File(StorageDirectory.getStorageDirectory().getCanonicalPath() + "/" + BitSquare + File path = new File(AppDirectoryUtil.getStorageDirectory().getCanonicalPath() + "/" + BitSquare .getAppName() + "_tomP2P"); if (!path.exists()) { boolean created = path.mkdir(); diff --git a/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java b/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java index ebc623d16e..7262d11d2c 100644 --- a/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java +++ b/src/main/java/io/bitsquare/msg/listeners/IncomingTradeMessageListener.java @@ -17,7 +17,7 @@ package io.bitsquare.msg.listeners; -import io.bitsquare.trade.protocol.TradeMessage; +import io.bitsquare.trade.protocol.trade.TradeMessage; import net.tomp2p.peers.PeerAddress; diff --git a/src/main/java/io/bitsquare/storage/Persistence.java b/src/main/java/io/bitsquare/persistence/Persistence.java similarity index 99% rename from src/main/java/io/bitsquare/storage/Persistence.java rename to src/main/java/io/bitsquare/persistence/Persistence.java index 9a321feb77..ecc86d101d 100644 --- a/src/main/java/io/bitsquare/storage/Persistence.java +++ b/src/main/java/io/bitsquare/persistence/Persistence.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.storage; +package io.bitsquare.persistence; import io.bitsquare.BitSquare; import io.bitsquare.util.FileUtil; diff --git a/src/main/java/io/bitsquare/settings/Settings.java b/src/main/java/io/bitsquare/settings/Settings.java index de0db88a48..f8cfe5dabd 100644 --- a/src/main/java/io/bitsquare/settings/Settings.java +++ b/src/main/java/io/bitsquare/settings/Settings.java @@ -18,7 +18,7 @@ package io.bitsquare.settings; import io.bitsquare.locale.Country; -import io.bitsquare.user.Arbitrator; +import io.bitsquare.arbitrator.Arbitrator; import com.google.bitcoin.core.Coin; diff --git a/src/main/java/io/bitsquare/trade/Contract.java b/src/main/java/io/bitsquare/trade/Contract.java index c932c485e3..fe4ce10187 100644 --- a/src/main/java/io/bitsquare/trade/Contract.java +++ b/src/main/java/io/bitsquare/trade/Contract.java @@ -26,6 +26,9 @@ import java.io.Serializable; import java.security.PublicKey; +//TODO flatten down? +// TODO The relation Offer, Trade and Contract need to be reviewed and might be changed + public class Contract implements Serializable { private static final long serialVersionUID = 71472356206100158L; diff --git a/src/main/java/io/bitsquare/trade/Offer.java b/src/main/java/io/bitsquare/trade/Offer.java index 90fd905f1b..e5f5e3e499 100644 --- a/src/main/java/io/bitsquare/trade/Offer.java +++ b/src/main/java/io/bitsquare/trade/Offer.java @@ -19,7 +19,7 @@ package io.bitsquare.trade; import io.bitsquare.bank.BankAccountType; import io.bitsquare.locale.Country; -import io.bitsquare.user.Arbitrator; +import io.bitsquare.arbitrator.Arbitrator; import com.google.bitcoin.core.Coin; @@ -34,6 +34,8 @@ import java.util.Date; import java.util.List; import java.util.Locale; +//TODO flatten down? + public class Offer implements Serializable { private static final long serialVersionUID = -971164804305475826L; diff --git a/src/main/java/io/bitsquare/trade/Trade.java b/src/main/java/io/bitsquare/trade/Trade.java index 068472efcb..e6c2f29a3d 100644 --- a/src/main/java/io/bitsquare/trade/Trade.java +++ b/src/main/java/io/bitsquare/trade/Trade.java @@ -25,6 +25,8 @@ import java.io.Serializable; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleStringProperty; +//TODO flatten down? + public class Trade implements Serializable { private static final long serialVersionUID = -8275323072940974077L; diff --git a/src/main/java/io/bitsquare/trade/TradeManager.java b/src/main/java/io/bitsquare/trade/TradeManager.java index 410a547510..5236897597 100644 --- a/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/src/main/java/io/bitsquare/trade/TradeManager.java @@ -24,10 +24,10 @@ import io.bitsquare.gui.components.Popups; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.listeners.TakeOfferRequestListener; import io.bitsquare.settings.Settings; -import io.bitsquare.storage.Persistence; +import io.bitsquare.persistence.Persistence; import io.bitsquare.trade.handlers.ErrorMessageHandler; import io.bitsquare.trade.handlers.TransactionResultHandler; -import io.bitsquare.trade.protocol.TradeMessage; +import io.bitsquare.trade.protocol.trade.TradeMessage; import io.bitsquare.trade.protocol.createoffer.CreateOfferCoordinator; import io.bitsquare.trade.protocol.trade.offerer.BuyerAcceptsOfferProtocol; import io.bitsquare.trade.protocol.trade.offerer.BuyerAcceptsOfferProtocolListener; @@ -67,6 +67,10 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * The domain for the trading + * TODO: Too messy, need to be improved a lot.... + */ public class TradeManager { private static final Logger log = LoggerFactory.getLogger(TradeManager.class); diff --git a/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java b/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java index 72ea011e59..fdbd43fcaa 100644 --- a/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java +++ b/src/main/java/io/bitsquare/trade/orderbook/OrderBook.java @@ -27,7 +27,7 @@ import io.bitsquare.settings.Settings; import io.bitsquare.trade.Direction; import io.bitsquare.trade.Offer; import io.bitsquare.trade.TradeManager; -import io.bitsquare.user.Arbitrator; +import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.user.User; import java.io.IOException; diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java index 6d2d0626df..bfb4c02664 100644 --- a/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java +++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java @@ -19,7 +19,7 @@ package io.bitsquare.trade.protocol.createoffer; import io.bitsquare.btc.WalletFacade; import io.bitsquare.msg.MessageFacade; -import io.bitsquare.storage.Persistence; +import io.bitsquare.persistence.Persistence; import io.bitsquare.trade.Offer; import io.bitsquare.trade.handlers.FaultHandler; import io.bitsquare.trade.handlers.TransactionResultHandler; diff --git a/src/main/java/io/bitsquare/trade/protocol/TradeMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/TradeMessage.java similarity index 94% rename from src/main/java/io/bitsquare/trade/protocol/TradeMessage.java rename to src/main/java/io/bitsquare/trade/protocol/trade/TradeMessage.java index e21ee0222e..141b95bb9f 100644 --- a/src/main/java/io/bitsquare/trade/protocol/TradeMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/TradeMessage.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.trade.protocol; +package io.bitsquare.trade.protocol.trade; public interface TradeMessage { public String getTradeId(); diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferInitedMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferInitedMessage.java index 233aa57b20..ef56956fb8 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferInitedMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferInitedMessage.java @@ -17,7 +17,7 @@ package io.bitsquare.trade.protocol.trade.offerer.messages; -import io.bitsquare.trade.protocol.TradeMessage; +import io.bitsquare.trade.protocol.trade.TradeMessage; import com.google.bitcoin.core.Coin; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java index 23df2ca954..4d99ced858 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java @@ -17,7 +17,7 @@ package io.bitsquare.trade.protocol.trade.offerer.messages; -import io.bitsquare.trade.protocol.TradeMessage; +import io.bitsquare.trade.protocol.trade.TradeMessage; import java.io.Serializable; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestTakerDepositPaymentMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestTakerDepositPaymentMessage.java index fd98a53c9d..63ea56b31f 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestTakerDepositPaymentMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestTakerDepositPaymentMessage.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.offerer.messages; import io.bitsquare.bank.BankAccount; -import io.bitsquare.trade.protocol.TradeMessage; +import io.bitsquare.trade.protocol.trade.TradeMessage; import java.io.Serializable; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java index e7da683313..7642d98e52 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java @@ -17,7 +17,7 @@ package io.bitsquare.trade.protocol.trade.offerer.messages; -import io.bitsquare.trade.protocol.TradeMessage; +import io.bitsquare.trade.protocol.trade.TradeMessage; import java.io.Serializable; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java index d1845914d0..6440f416a3 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java @@ -17,7 +17,7 @@ package io.bitsquare.trade.protocol.trade.taker.messages; -import io.bitsquare.trade.protocol.TradeMessage; +import io.bitsquare.trade.protocol.trade.TradeMessage; import java.io.Serializable; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java index d66cb44ecf..e0e7249429 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.taker.messages; import io.bitsquare.bank.BankAccount; -import io.bitsquare.trade.protocol.TradeMessage; +import io.bitsquare.trade.protocol.trade.TradeMessage; import java.io.Serializable; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java index 2a0e2cdf63..1f345277f9 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java @@ -17,7 +17,7 @@ package io.bitsquare.trade.protocol.trade.taker.messages; -import io.bitsquare.trade.protocol.TradeMessage; +import io.bitsquare.trade.protocol.trade.TradeMessage; import java.io.Serializable; diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java index 474686eb3f..b78e7b49ae 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java @@ -17,7 +17,7 @@ package io.bitsquare.trade.protocol.trade.taker.messages; -import io.bitsquare.trade.protocol.TradeMessage; +import io.bitsquare.trade.protocol.trade.TradeMessage; import com.google.bitcoin.core.Coin; diff --git a/src/main/java/io/bitsquare/user/User.java b/src/main/java/io/bitsquare/user/User.java index f2f43a711b..110d2be9dc 100644 --- a/src/main/java/io/bitsquare/user/User.java +++ b/src/main/java/io/bitsquare/user/User.java @@ -40,7 +40,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * The User is persisted locally it is never transmitted over the wire (messageKeyPair contains private key!). + * The User is persisted locally. + * It must never be transmitted over the wire (messageKeyPair contains private key!). */ public class User implements Serializable { private static final Logger log = LoggerFactory.getLogger(User.class); diff --git a/src/main/java/io/bitsquare/util/AWTSystemTray.java b/src/main/java/io/bitsquare/util/AWTSystemTray.java index 79fe6fa7fa..9500517e56 100644 --- a/src/main/java/io/bitsquare/util/AWTSystemTray.java +++ b/src/main/java/io/bitsquare/util/AWTSystemTray.java @@ -31,6 +31,10 @@ import javafx.stage.Stage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * There is no JavaFX support yet, so we need to use AWT. + * TODO research more + */ public class AWTSystemTray { private static final Logger log = LoggerFactory.getLogger(AWTSystemTray.class); private static boolean isStageVisible = true; diff --git a/src/main/java/io/bitsquare/util/StorageDirectory.java b/src/main/java/io/bitsquare/util/AppDirectoryUtil.java similarity index 95% rename from src/main/java/io/bitsquare/util/StorageDirectory.java rename to src/main/java/io/bitsquare/util/AppDirectoryUtil.java index 32a0ba1cb4..b3404d0b5b 100644 --- a/src/main/java/io/bitsquare/util/StorageDirectory.java +++ b/src/main/java/io/bitsquare/util/AppDirectoryUtil.java @@ -23,8 +23,8 @@ import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class StorageDirectory { - private static final Logger log = LoggerFactory.getLogger(StorageDirectory.class); +public class AppDirectoryUtil { + private static final Logger log = LoggerFactory.getLogger(AppDirectoryUtil.class); private static File storageDirectory; static { @@ -53,7 +53,7 @@ public class StorageDirectory { public static File getApplicationDirectory() { File executionRoot = - new File(StorageDirectory.class.getProtectionDomain().getCodeSource().getLocation().getFile()); + new File(AppDirectoryUtil.class.getProtectionDomain().getCodeSource().getLocation().getFile()); try { log.trace("executionRoot " + executionRoot.getCanonicalPath()); diff --git a/src/main/java/io/bitsquare/util/DSAKeyUtil.java b/src/main/java/io/bitsquare/util/DSAKeyUtil.java index 5964b5b93e..681907c232 100755 --- a/src/main/java/io/bitsquare/util/DSAKeyUtil.java +++ b/src/main/java/io/bitsquare/util/DSAKeyUtil.java @@ -31,12 +31,6 @@ import org.slf4j.LoggerFactory; public class DSAKeyUtil { private static final Logger log = LoggerFactory.getLogger(DSAKeyUtil.class); - - /////////////////////////////////////////////////////////////////////////////////////////// - // Public API - /////////////////////////////////////////////////////////////////////////////////////////// - - public static String getHexStringFromPublicKey(PublicKey publicKey) { final X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(publicKey.getEncoded()); return Utils.HEX.encode(x509EncodedKeySpec.getEncoded()); diff --git a/src/main/java/io/bitsquare/util/FileUtil.java b/src/main/java/io/bitsquare/util/FileUtil.java index ac3cd6314a..b30fb77df1 100644 --- a/src/main/java/io/bitsquare/util/FileUtil.java +++ b/src/main/java/io/bitsquare/util/FileUtil.java @@ -29,11 +29,11 @@ public class FileUtil { private static final Logger log = LoggerFactory.getLogger(FileUtil.class); public static File getFile(String name, String suffix) { - return new File(StorageDirectory.getStorageDirectory(), name + "." + suffix); + return new File(AppDirectoryUtil.getStorageDirectory(), name + "." + suffix); } public static File getTempFile(String prefix) throws IOException { - return File.createTempFile("temp_" + prefix, null, StorageDirectory.getStorageDirectory()); + return File.createTempFile("temp_" + prefix, null, AppDirectoryUtil.getStorageDirectory()); } public static void writeTempFileToFile(File tempFile, File file) throws IOException { diff --git a/src/main/resources/i18n/displayStrings.properties b/src/main/resources/i18n/displayStrings.properties index 67a088b673..f0fae4fd6c 100644 --- a/src/main/resources/i18n/displayStrings.properties +++ b/src/main/resources/i18n/displayStrings.properties @@ -1,3 +1,4 @@ +# TODO: locale support will be added when ui is more final # generic OTHER=Other diff --git a/src/test/java/io/bitsquare/gui/util/BtcValidatorTest.java b/src/test/java/io/bitsquare/gui/util/BtcValidatorTest.java index 92743d09cf..9eebc6a17b 100644 --- a/src/test/java/io/bitsquare/gui/util/BtcValidatorTest.java +++ b/src/test/java/io/bitsquare/gui/util/BtcValidatorTest.java @@ -17,6 +17,9 @@ package io.bitsquare.gui.util; +import io.bitsquare.gui.util.validation.BtcValidator; +import io.bitsquare.gui.util.validation.NumberValidator; + import com.google.bitcoin.core.Coin; import com.google.bitcoin.core.NetworkParameters; diff --git a/src/test/java/io/bitsquare/gui/util/FiatValidatorTest.java b/src/test/java/io/bitsquare/gui/util/FiatValidatorTest.java index db15ab1dd9..1c5987a4a0 100644 --- a/src/test/java/io/bitsquare/gui/util/FiatValidatorTest.java +++ b/src/test/java/io/bitsquare/gui/util/FiatValidatorTest.java @@ -17,6 +17,9 @@ package io.bitsquare.gui.util; +import io.bitsquare.gui.util.validation.FiatValidator; +import io.bitsquare.gui.util.validation.NumberValidator; + import org.junit.Test; import static org.junit.Assert.*;