From 88951d71b8d5037d186851dc8671c646b890292a Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 30 Oct 2014 13:41:24 +0100 Subject: [PATCH] Capitalize 'Bitsquare' consistently --- build.gradle | 2 +- package/windows.bat | 2 +- .../{BitSquare.java => Bitsquare.java} | 6 ++--- .../{BitSquareUI.java => BitsquareUI.java} | 20 ++++++++-------- .../java/io/bitsquare/btc/WalletFacade.java | 12 +++++----- ...SquareModule.java => BitsquareModule.java} | 24 +++++++++---------- .../java/io/bitsquare/gui/AWTSystemTray.java | 12 +++++----- .../io/bitsquare/gui/components/Popups.java | 12 +++++----- .../java/io/bitsquare/gui/main/MainModel.java | 6 ++--- .../io/bitsquare/gui/main/MainViewCB.java | 8 +++---- .../arbitrator/ArbitratorSettingsViewCB.java | 5 ++-- .../restrictions/RestrictionsViewCB.java | 9 ++++--- .../java/io/bitsquare/gui/main/help/Help.java | 6 ++--- .../io/bitsquare/persistence/Persistence.java | 4 ++-- .../util/BitsquareArgumentParser.java | 4 ++-- ...TestSuite.java => BitsquareTestSuite.java} | 2 +- .../account/AccountSettingsUITestRunner.java | 4 ++-- .../gui/main/account/AccountUITestRunner.java | 4 ++-- .../account/RegistrationUITestRunner.java | 4 ++-- .../gui/main/account/SetupUITestRunner.java | 4 ++-- .../FundRegistrationWalletUIMockRunner.java | 4 ++-- .../uimock/RegistrationUIMockRunner.java | 4 ++-- .../pending/PendingTradesUIRunner.java | 4 ++-- .../uimock/PendingTradesUIMockRunner.java | 4 ++-- .../settings/FiatAccountUITestRunner.java | 4 ++-- .../main/settings/PasswordUITestRunner.java | 4 ++-- .../settings/RegistrationUITestRunner.java | 4 ++-- .../settings/RestrictionsUITestRunner.java | 4 ++-- .../main/settings/SeedWordsUITestRunner.java | 4 ++-- .../BankAccountSettingsUIMockRunner.java | 4 ++-- .../RestrictionSettingsUIMockRunner.java | 4 ++-- .../uimock/SeedWordsUIMockRunner.java | 4 ++-- .../uimock/SetPasswordUIMockRunner.java | 4 ++-- .../createoffer/CreateOfferUITestRunner.java | 4 ++-- .../uimock/CreateOfferUIMockRunner.java | 4 ++-- .../msg/dhttest/DHTTestController.java | 4 ++-- .../bitsquare/msg/dhttest/DHTTestRunner.java | 4 ++-- 37 files changed, 108 insertions(+), 110 deletions(-) rename src/main/java/io/bitsquare/{BitSquare.java => Bitsquare.java} (98%) rename src/main/java/io/bitsquare/{BitSquareUI.java => BitsquareUI.java} (91%) rename src/main/java/io/bitsquare/di/{BitSquareModule.java => BitsquareModule.java} (90%) rename src/test/java/io/bitsquare/{BitSquareTestSuite.java => BitsquareTestSuite.java} (97%) diff --git a/build.gradle b/build.gradle index 0014993725..c23c113067 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ sourceCompatibility = 1.8 sourceSets.main.resources.srcDirs += 'src/main/java' -mainClassName = "io.bitsquare.BitSquare" +mainClassName = "io.bitsquare.Bitsquare" run { if ( project.hasProperty('args') ) { diff --git a/package/windows.bat b/package/windows.bat index d8d92fed10..58cf0bb2a9 100644 --- a/package/windows.bat +++ b/package/windows.bat @@ -1 +1 @@ -C:\Progra~1\Java\jdk1.8.0_20\bin\javapackager.exe -deploy -BappVersion=0.1.0 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir build -appclass io.bitsquare.BitSquare -srcfiles .\build\libs\bitsquare-0.1.0-SNAPSHOT-all.jar -outfile Bitsquare -Bruntime="c:\Program Files\Java\jdk1.8.0_20\jre" +C:\Progra~1\Java\jdk1.8.0_20\bin\javapackager.exe -deploy -BappVersion=0.1.0 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir build -appclass io.bitsquare.Bitsquare -srcfiles .\build\libs\bitsquare-0.1.0-SNAPSHOT-all.jar -outfile Bitsquare -Bruntime="c:\Program Files\Java\jdk1.8.0_20\jre" diff --git a/src/main/java/io/bitsquare/BitSquare.java b/src/main/java/io/bitsquare/Bitsquare.java similarity index 98% rename from src/main/java/io/bitsquare/BitSquare.java rename to src/main/java/io/bitsquare/Bitsquare.java index 8d7f3b07bc..39d4b23307 100644 --- a/src/main/java/io/bitsquare/BitSquare.java +++ b/src/main/java/io/bitsquare/Bitsquare.java @@ -46,8 +46,8 @@ import net.sourceforge.argparse4j.inf.Namespace; import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; -public class BitSquare { - private static final Logger log = LoggerFactory.getLogger(BitSquare.class); +public class Bitsquare { + private static final Logger log = LoggerFactory.getLogger(Bitsquare.class); private static String appName = "Bitsquare"; private static int clientPort; @@ -145,7 +145,7 @@ public class BitSquare { else { // We use a random port for the client if no port is passed to the application clientPort = (port == -1) ? new Ports().tcpPort() : port; - Application.launch(BitSquareUI.class, args); + Application.launch(BitsquareUI.class, args); } } } diff --git a/src/main/java/io/bitsquare/BitSquareUI.java b/src/main/java/io/bitsquare/BitsquareUI.java similarity index 91% rename from src/main/java/io/bitsquare/BitSquareUI.java rename to src/main/java/io/bitsquare/BitsquareUI.java index 7280b14879..d674e693b1 100644 --- a/src/main/java/io/bitsquare/BitSquareUI.java +++ b/src/main/java/io/bitsquare/BitsquareUI.java @@ -18,7 +18,7 @@ package io.bitsquare; import io.bitsquare.btc.WalletFacade; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.gui.AWTSystemTray; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.Popups; @@ -49,8 +49,8 @@ import org.slf4j.LoggerFactory; import akka.actor.ActorSystem; import lighthouse.files.AppDirectory; -public class BitSquareUI extends Application { - private static final Logger log = LoggerFactory.getLogger(BitSquareUI.class); +public class BitsquareUI extends Application { + private static final Logger log = LoggerFactory.getLogger(BitsquareUI.class); public static final boolean fillFormsWithDummyData = true; @@ -59,7 +59,7 @@ public class BitSquareUI extends Application { private WalletFacade walletFacade; private MessageFacade messageFacade; - public void BitSquareUI() { + public void BitsquareUI() { Profiler.init(); } @@ -69,26 +69,26 @@ public class BitSquareUI extends Application { @Override public void start(Stage primaryStage) { - Profiler.printMsgWithTime("BitSquare.start called"); - BitSquareUI.primaryStage = primaryStage; + Profiler.printMsgWithTime("Bitsquare.start called"); + BitsquareUI.primaryStage = primaryStage; Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> Popups.handleUncaughtExceptions (Throwables.getRootCause(throwable))); try { - AppDirectory.initAppDir(BitSquare.getAppName()); + AppDirectory.initAppDir(Bitsquare.getAppName()); } catch (IOException e) { log.error(e.getMessage()); } - final Injector injector = Guice.createInjector(new BitSquareModule()); + final Injector injector = Guice.createInjector(new BitsquareModule()); // currently there is not SystemTray support for java fx (planned for version 3) so we use the old AWT AWTSystemTray.createSystemTray(primaryStage, injector.getInstance(ActorSystem.class), this); walletFacade = injector.getInstance(WalletFacade.class); messageFacade = injector.getInstance(MessageFacade.class); - Profiler.printMsgWithTime("BitSquare: messageFacade, walletFacade created"); + Profiler.printMsgWithTime("Bitsquare: messageFacade, walletFacade created"); // apply stored data final User user = injector.getInstance(User.class); @@ -101,7 +101,7 @@ public class BitSquareUI extends Application { settings.applyPersistedSettings((Settings) persistence.read(settings.getClass().getName())); - primaryStage.setTitle("BitSquare (" + BitSquare.getAppName() + ")"); + primaryStage.setTitle("Bitsquare (" + Bitsquare.getAppName() + ")"); // sometimes there is a rendering bug, see https://github.com/bitsquare/bitsquare/issues/160 if (ImageUtil.isRetina()) diff --git a/src/main/java/io/bitsquare/btc/WalletFacade.java b/src/main/java/io/bitsquare/btc/WalletFacade.java index f94c9d46d5..95cda59203 100644 --- a/src/main/java/io/bitsquare/btc/WalletFacade.java +++ b/src/main/java/io/bitsquare/btc/WalletFacade.java @@ -17,7 +17,7 @@ package io.bitsquare.btc; -import io.bitsquare.BitSquare; +import io.bitsquare.Bitsquare; import io.bitsquare.btc.listeners.AddressConfidenceListener; import io.bitsquare.btc.listeners.BalanceListener; import io.bitsquare.btc.listeners.TxConfidenceListener; @@ -95,7 +95,7 @@ public class WalletFacade { public static final String MAIN_NET = "mainnet"; public static final String TEST_NET = "testnet"; public static final String REG_TEST_NET = "regtest"; - public static final String WALLET_PREFIX = BitSquare.getAppName(); + public static final String WALLET_PREFIX = Bitsquare.getAppName(); private final ReentrantLock lock = Threading.lock("lock"); private final NetworkParameters params; @@ -179,9 +179,9 @@ public class WalletFacade { } walletAppKit.setDownloadListener(downloadListener) .setBlockingStartup(false) - .setUserAgent("BitSquare", "0.1"); - - /* + .setUserAgent("Bitsquare", "0.1"); + + /* // TODO restore from DeterministicSeed if (seed != null) walletAppKit.restoreWalletFromSeed(seed); @@ -554,7 +554,7 @@ public class WalletFacade { tx.addOutput(Transaction.MIN_NONDUST_OUTPUT, new ScriptBuilder().op(OP_RETURN).data(data).build()); // We don't take a fee at the moment - // 0.0000454 BTC will get extra to miners as it is lower then durst + // 0.0000454 BTC will get extra to miners as it is lower then durst /* Coin fee = FeePolicy.REGISTRATION_FEE .subtract(Transaction.MIN_NONDUST_OUTPUT) .subtract(FeePolicy.TX_FEE); diff --git a/src/main/java/io/bitsquare/di/BitSquareModule.java b/src/main/java/io/bitsquare/di/BitsquareModule.java similarity index 90% rename from src/main/java/io/bitsquare/di/BitSquareModule.java rename to src/main/java/io/bitsquare/di/BitsquareModule.java index 5b92c1ce46..dfb675e4a5 100644 --- a/src/main/java/io/bitsquare/di/BitSquareModule.java +++ b/src/main/java/io/bitsquare/di/BitsquareModule.java @@ -18,7 +18,7 @@ package io.bitsquare.di; -import io.bitsquare.BitSquare; +import io.bitsquare.Bitsquare; import io.bitsquare.btc.BlockChainFacade; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletFacade; @@ -60,8 +60,8 @@ import org.slf4j.LoggerFactory; import akka.actor.ActorSystem; -public class BitSquareModule extends AbstractModule { - private static final Logger log = LoggerFactory.getLogger(BitSquareModule.class); +public class BitsquareModule extends AbstractModule { + private static final Logger log = LoggerFactory.getLogger(BitsquareModule.class); static Properties properties; @@ -112,11 +112,11 @@ class StaticSeedNodeAddressesProvider implements Provider { NetworkParameters result = null; //If config is available we override the networkType defined in Guice with the one from the config file - if (BitSquareModule.properties == null) - BitSquareModule.properties = ConfigLoader.loadConfig(); + if (BitsquareModule.properties == null) + BitsquareModule.properties = ConfigLoader.loadConfig(); - log.info("networkType from config file: " + BitSquareModule.properties.getProperty("networkType")); - String networkTypeFromConfig = BitSquareModule.properties.getProperty("networkType"); + log.info("networkType from config file: " + BitsquareModule.properties.getProperty("networkType")); + String networkTypeFromConfig = BitsquareModule.properties.getProperty("networkType"); // Set default // String networkType= WalletFacade.MAIN_NET; @@ -172,7 +172,7 @@ class ActorSystemProvider implements Provider { @Override public ActorSystem get() { - ActorSystem system = ActorSystem.create(BitSquare.getAppName()); + ActorSystem system = ActorSystem.create(Bitsquare.getAppName()); // create top level actors //system.actorOf(DHTManager.getProps(), DHTManager.SEED_NAME); diff --git a/src/main/java/io/bitsquare/gui/AWTSystemTray.java b/src/main/java/io/bitsquare/gui/AWTSystemTray.java index 57f77324f7..e4aca83785 100644 --- a/src/main/java/io/bitsquare/gui/AWTSystemTray.java +++ b/src/main/java/io/bitsquare/gui/AWTSystemTray.java @@ -18,8 +18,8 @@ package io.bitsquare.gui; -import io.bitsquare.BitSquare; -import io.bitsquare.BitSquareUI; +import io.bitsquare.BitsquareUI; +import io.bitsquare.Bitsquare; import io.bitsquare.gui.util.ImageUtil; import java.awt.*; @@ -47,10 +47,10 @@ public class AWTSystemTray { private static MenuItem showGuiItem; private static Stage stage; private static ActorSystem actorSystem; - private static BitSquareUI application; + private static BitsquareUI application; private static TrayIcon trayIcon; - public static void createSystemTray(Stage stage, ActorSystem actorSystem, BitSquareUI application) { + public static void createSystemTray(Stage stage, ActorSystem actorSystem, BitsquareUI application) { AWTSystemTray.stage = stage; AWTSystemTray.actorSystem = actorSystem; AWTSystemTray.application = application; @@ -65,10 +65,10 @@ public class AWTSystemTray { else trayIcon = new TrayIcon(getImage(ImageUtil.SYS_TRAY)); - trayIcon.setToolTip("BitSquare P2P Fiat-Bitcoin exchange"); + trayIcon.setToolTip("Bitsquare P2P Fiat-Bitcoin exchange"); PopupMenu popupMenu = new PopupMenu(); - MenuItem aboutItem = new MenuItem("Info about " + BitSquare.getAppName()); + MenuItem aboutItem = new MenuItem("Info about " + Bitsquare.getAppName()); popupMenu.add(aboutItem); popupMenu.addSeparator(); showGuiItem = new MenuItem("Close exchange window"); diff --git a/src/main/java/io/bitsquare/gui/components/Popups.java b/src/main/java/io/bitsquare/gui/components/Popups.java index d0143cafa1..35e60da8a9 100644 --- a/src/main/java/io/bitsquare/gui/components/Popups.java +++ b/src/main/java/io/bitsquare/gui/components/Popups.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.components; -import io.bitsquare.BitSquareUI; +import io.bitsquare.BitsquareUI; import io.bitsquare.gui.OverlayManager; import io.bitsquare.locale.BSResources; @@ -70,7 +70,7 @@ public class Popups { public static void openInfoPopup(String masthead, String message, List actions) { Dialogs.create() - .owner(BitSquareUI.getPrimaryStage()) + .owner(BitsquareUI.getPrimaryStage()) .message(message) .masthead(masthead) .actions(actions) @@ -107,7 +107,7 @@ public class Popups { public static Action openConfirmPopup(String title, String masthead, String message, List actions) { return Dialogs.create() - .owner(BitSquareUI.getPrimaryStage()) + .owner(BitsquareUI.getPrimaryStage()) .title(title) .message(message) .masthead(masthead) @@ -140,7 +140,7 @@ public class Popups { private static void openWarningPopup(String title, String masthead, String message, List actions) { Dialogs.create() - .owner(BitSquareUI.getPrimaryStage()) + .owner(BitsquareUI.getPrimaryStage()) .title(title) .message(message) .masthead(masthead) @@ -173,7 +173,7 @@ public class Popups { private static Action openErrorPopup(String title, String masthead, String message, List actions) { return Dialogs.create() - .owner(BitSquareUI.getPrimaryStage()) + .owner(BitsquareUI.getPrimaryStage()) .title(title) .message(message) .masthead(masthead) @@ -202,7 +202,7 @@ public class Popups { } }); return Dialogs.create() - .owner(BitSquareUI.getPrimaryStage()) + .owner(BitsquareUI.getPrimaryStage()) .title(title) .message(message) .masthead(masthead) diff --git a/src/main/java/io/bitsquare/gui/main/MainModel.java b/src/main/java/io/bitsquare/gui/main/MainModel.java index 5cd874cbfc..659ad09e9a 100644 --- a/src/main/java/io/bitsquare/gui/main/MainModel.java +++ b/src/main/java/io/bitsquare/gui/main/MainModel.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main; -import io.bitsquare.BitSquare; +import io.bitsquare.Bitsquare; import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.UIModel; @@ -104,10 +104,10 @@ class MainModel extends UIModel { void initBackend() { - // For testing with the serverside seednode we need the BootstrappedPeerFactory which gets started form + // For testing with the serverside seednode we need the BootstrappedPeerFactory which gets started form // messageFacade.init - messageFacade.init(BitSquare.getClientPort(), new BootstrapListener() { + messageFacade.init(Bitsquare.getClientPort(), new BootstrapListener() { @Override public void onCompleted() { messageFacadeInited = true; diff --git a/src/main/java/io/bitsquare/gui/main/MainViewCB.java b/src/main/java/io/bitsquare/gui/main/MainViewCB.java index 7f802cf075..5d8ecc48be 100644 --- a/src/main/java/io/bitsquare/gui/main/MainViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewCB.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main; -import io.bitsquare.BitSquare; +import io.bitsquare.Bitsquare; import io.bitsquare.bank.BankAccount; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.OverlayManager; @@ -165,7 +165,7 @@ public class MainViewCB extends ViewCB { /////////////////////////////////////////////////////////////////////////////////////////// - // Private Methods: Startup + // Private Methods: Startup /////////////////////////////////////////////////////////////////////////////////////////// private void startup() { @@ -213,8 +213,8 @@ public class MainViewCB extends ViewCB { numPendingTradesLabel.setText(String.valueOf(numPendingTrades)); } - log.trace("openInfoNotification " + BitSquare.getAppName()); - SystemNotification.openInfoNotification(BitSquare.getAppName(), "You got a new trade message."); + log.trace("openInfoNotification " + Bitsquare.getAppName()); + SystemNotification.openInfoNotification(Bitsquare.getAppName(), "You got a new trade message."); } else { if (portfolioButtonButtonPane.getChildren().size() > 1) diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java index 8b6b814817..0ea5bac3a1 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsViewCB.java @@ -17,8 +17,7 @@ package io.bitsquare.gui.main.account.arbitrator; -import io.bitsquare.BitSquare; -import io.bitsquare.BitSquareUI; +import io.bitsquare.BitsquareUI; import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationViewCB; @@ -103,7 +102,7 @@ public class ArbitratorSettingsViewCB extends CachedViewCB { final Parent view = loader.load(); arbitratorRegistrationViewCB = loader.getController(); - final Stage rootStage = BitSquareUI.getPrimaryStage(); + final Stage rootStage = BitsquareUI.getPrimaryStage(); final Stage stage = new Stage(); stage.setTitle("Arbitrator"); stage.setMinWidth(800); diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java index 8b65c1f90a..440ef9222d 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java @@ -17,8 +17,7 @@ package io.bitsquare.gui.main.account.content.restrictions; -import io.bitsquare.BitSquare; -import io.bitsquare.BitSquareUI; +import io.bitsquare.BitsquareUI; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.Navigation; @@ -115,7 +114,7 @@ public class RestrictionsViewCB extends CachedViewCB implements /////////////////////////////////////////////////////////////////////////////////////////// - // ContextAware implementation + // ContextAware implementation /////////////////////////////////////////////////////////////////////////////////////////// @Override @@ -197,7 +196,7 @@ public class RestrictionsViewCB extends CachedViewCB implements Initializable childController = loader.getController(); //childController.setParentController(this); - final Stage rootStage = BitSquareUI.getPrimaryStage(); + final Stage rootStage = BitsquareUI.getPrimaryStage(); final Stage stage = new Stage(); stage.setTitle("Arbitrator selection"); stage.setMinWidth(800); @@ -382,7 +381,7 @@ public class RestrictionsViewCB extends CachedViewCB implements presentationModel.removeArbitrator(arbitrator); } - + /* private void addCountry(Country country) { if (!countryList.contains(country) && country != null) { diff --git a/src/main/java/io/bitsquare/gui/main/help/Help.java b/src/main/java/io/bitsquare/gui/main/help/Help.java index 7df24472cf..d6ff3dc518 100644 --- a/src/main/java/io/bitsquare/gui/main/help/Help.java +++ b/src/main/java/io/bitsquare/gui/main/help/Help.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.help; -import io.bitsquare.BitSquareUI; +import io.bitsquare.BitsquareUI; import java.net.MalformedURLException; import java.net.URL; @@ -30,7 +30,7 @@ import javafx.stage.Stage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -// TODO Find good solution for a web based help content management system. +// TODO Find good solution for a web based help content management system. public class Help { private static final Logger log = LoggerFactory.getLogger(Help.class); @@ -49,7 +49,7 @@ public class Help { if (helpWindow == null) { helpWindow = new Stage(); helpWindow.initModality(Modality.NONE); - helpWindow.initOwner(BitSquareUI.getPrimaryStage()); + helpWindow.initOwner(BitsquareUI.getPrimaryStage()); webView = new WebView(); helpWindow.setScene(new Scene(webView, 800, 600)); } diff --git a/src/main/java/io/bitsquare/persistence/Persistence.java b/src/main/java/io/bitsquare/persistence/Persistence.java index 8797f6b35d..c1dbf20817 100644 --- a/src/main/java/io/bitsquare/persistence/Persistence.java +++ b/src/main/java/io/bitsquare/persistence/Persistence.java @@ -17,7 +17,7 @@ package io.bitsquare.persistence; -import io.bitsquare.BitSquare; +import io.bitsquare.Bitsquare; import io.bitsquare.util.FileUtil; import org.bitcoinj.utils.Threading; @@ -52,7 +52,7 @@ public class Persistence { private static final Logger log = LoggerFactory.getLogger(Persistence.class); private static final ReentrantLock lock = Threading.lock("Storage"); - private final String prefix = BitSquare.getAppName() + "_pref"; + private final String prefix = Bitsquare.getAppName() + "_pref"; private final File storageFile = FileUtil.getFile(prefix, "ser"); @GuardedBy("lock") diff --git a/src/main/java/io/bitsquare/util/BitsquareArgumentParser.java b/src/main/java/io/bitsquare/util/BitsquareArgumentParser.java index b3eca557b7..f4d3850442 100644 --- a/src/main/java/io/bitsquare/util/BitsquareArgumentParser.java +++ b/src/main/java/io/bitsquare/util/BitsquareArgumentParser.java @@ -46,9 +46,9 @@ public class BitsquareArgumentParser { private final ArgumentParser parser; public BitsquareArgumentParser() { - parser = ArgumentParsers.newArgumentParser("BitSquare") + parser = ArgumentParsers.newArgumentParser("Bitsquare") .defaultHelp(true) - .description("BitSquare - The decentralized bitcoin exchange."); + .description("Bitsquare - The decentralized bitcoin exchange."); parser.addArgument("-s", "--" + SEED_FLAG) .action(Arguments.storeTrue()) .help("Start as DHT seed peer, no UI."); diff --git a/src/test/java/io/bitsquare/BitSquareTestSuite.java b/src/test/java/io/bitsquare/BitsquareTestSuite.java similarity index 97% rename from src/test/java/io/bitsquare/BitSquareTestSuite.java rename to src/test/java/io/bitsquare/BitsquareTestSuite.java index 8690e1ccf0..ba5df56737 100644 --- a/src/test/java/io/bitsquare/BitSquareTestSuite.java +++ b/src/test/java/io/bitsquare/BitsquareTestSuite.java @@ -37,5 +37,5 @@ import org.junit.runners.Suite; BtcValidatorTest.class }) -public class BitSquareTestSuite { +public class BitsquareTestSuite { } diff --git a/src/test/java/io/bitsquare/gui/main/account/AccountSettingsUITestRunner.java b/src/test/java/io/bitsquare/gui/main/account/AccountSettingsUITestRunner.java index 74ca0f16ca..477daeb5f2 100644 --- a/src/test/java/io/bitsquare/gui/main/account/AccountSettingsUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/AccountSettingsUITestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class AccountSettingsUITestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/account/AccountUITestRunner.java b/src/test/java/io/bitsquare/gui/main/account/AccountUITestRunner.java index 55c0f2b653..3210d702a9 100644 --- a/src/test/java/io/bitsquare/gui/main/account/AccountUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/AccountUITestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class AccountUITestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/account/RegistrationUITestRunner.java b/src/test/java/io/bitsquare/gui/main/account/RegistrationUITestRunner.java index 87f5e724ec..4a99ba1d6b 100644 --- a/src/test/java/io/bitsquare/gui/main/account/RegistrationUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/RegistrationUITestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class RegistrationUITestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/account/SetupUITestRunner.java b/src/test/java/io/bitsquare/gui/main/account/SetupUITestRunner.java index 450180bf21..712684b6b9 100644 --- a/src/test/java/io/bitsquare/gui/main/account/SetupUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/SetupUITestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class SetupUITestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletUIMockRunner.java index a8f1f5d9f2..0f9078307d 100644 --- a/src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletUIMockRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account.registration.uimock; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class FundRegistrationWalletUIMockRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationUIMockRunner.java index b50127c2f3..5ef755eb44 100644 --- a/src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationUIMockRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account.registration.uimock; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class RegistrationUIMockRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesUIRunner.java b/src/test/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesUIRunner.java index d31fba7612..56071edbaf 100644 --- a/src/test/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesUIRunner.java +++ b/src/test/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesUIRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.portfolio.pending; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class PendingTradesUIRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesUIMockRunner.java index 5333ac4a2d..6a469b663f 100644 --- a/src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/portfolio/pending/uimock/PendingTradesUIMockRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.portfolio.pending.uimock; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class PendingTradesUIMockRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/settings/FiatAccountUITestRunner.java b/src/test/java/io/bitsquare/gui/main/settings/FiatAccountUITestRunner.java index 549b518409..9323e79adb 100644 --- a/src/test/java/io/bitsquare/gui/main/settings/FiatAccountUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/FiatAccountUITestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class FiatAccountUITestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/settings/PasswordUITestRunner.java b/src/test/java/io/bitsquare/gui/main/settings/PasswordUITestRunner.java index 13500a7522..b500bf1c8c 100644 --- a/src/test/java/io/bitsquare/gui/main/settings/PasswordUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/PasswordUITestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class PasswordUITestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/settings/RegistrationUITestRunner.java b/src/test/java/io/bitsquare/gui/main/settings/RegistrationUITestRunner.java index 17e59357e6..89b7c16336 100644 --- a/src/test/java/io/bitsquare/gui/main/settings/RegistrationUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/RegistrationUITestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class RegistrationUITestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/settings/RestrictionsUITestRunner.java b/src/test/java/io/bitsquare/gui/main/settings/RestrictionsUITestRunner.java index 866faadffd..1cf27b8206 100644 --- a/src/test/java/io/bitsquare/gui/main/settings/RestrictionsUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/RestrictionsUITestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class RestrictionsUITestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/settings/SeedWordsUITestRunner.java b/src/test/java/io/bitsquare/gui/main/settings/SeedWordsUITestRunner.java index b42947682e..ba1375373e 100644 --- a/src/test/java/io/bitsquare/gui/main/settings/SeedWordsUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/SeedWordsUITestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class SeedWordsUITestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsUIMockRunner.java index ee9f0c32c5..14ac6c7e8c 100644 --- a/src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsUIMockRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings.uimock; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class BankAccountSettingsUIMockRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsUIMockRunner.java index b95ee6cfb9..585c06a906 100644 --- a/src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsUIMockRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings.uimock; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class RestrictionSettingsUIMockRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsUIMockRunner.java index 5f11478c71..f987537f4e 100644 --- a/src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsUIMockRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings.uimock; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class SeedWordsUIMockRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordUIMockRunner.java index 6447a73a8a..0376ccf605 100644 --- a/src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordUIMockRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.settings.uimock; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class SetPasswordUIMockRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferUITestRunner.java b/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferUITestRunner.java index e59ef7297b..4fceb10a98 100644 --- a/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferUITestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.trade.createoffer; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class CreateOfferUITestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferUIMockRunner.java b/src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferUIMockRunner.java index 7c9cf1b4c9..e51516259e 100644 --- a/src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferUIMockRunner.java +++ b/src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferUIMockRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.trade.createoffer.uimock; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -53,7 +53,7 @@ public class CreateOfferUIMockRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane(); diff --git a/src/test/java/io/bitsquare/msg/dhttest/DHTTestController.java b/src/test/java/io/bitsquare/msg/dhttest/DHTTestController.java index 8fb1e5f132..a7d10ee728 100644 --- a/src/test/java/io/bitsquare/msg/dhttest/DHTTestController.java +++ b/src/test/java/io/bitsquare/msg/dhttest/DHTTestController.java @@ -17,7 +17,7 @@ package io.bitsquare.msg.dhttest; -import io.bitsquare.BitSquare; +import io.bitsquare.Bitsquare; import io.bitsquare.bank.BankAccountType; import io.bitsquare.gui.main.trade.offerbook.OfferBookListItem; import io.bitsquare.locale.CountryUtil; @@ -77,7 +77,7 @@ public class DHTTestController implements Initializable { @Override public void initialize(URL url, ResourceBundle rb) { - messageFacade.init(BitSquare.getClientPort(), new BootstrapListener() { + messageFacade.init(Bitsquare.getClientPort(), new BootstrapListener() { @Override public void onCompleted() { onMessageFacadeInitialised(); diff --git a/src/test/java/io/bitsquare/msg/dhttest/DHTTestRunner.java b/src/test/java/io/bitsquare/msg/dhttest/DHTTestRunner.java index 6c1131aec9..443f64c5c4 100644 --- a/src/test/java/io/bitsquare/msg/dhttest/DHTTestRunner.java +++ b/src/test/java/io/bitsquare/msg/dhttest/DHTTestRunner.java @@ -17,7 +17,7 @@ package io.bitsquare.msg.dhttest; -import io.bitsquare.di.BitSquareModule; +import io.bitsquare.di.BitsquareModule; import io.bitsquare.util.ViewLoader; import com.google.inject.Guice; @@ -50,7 +50,7 @@ public class DHTTestRunner extends Application { @Override public void start(Stage primaryStage) throws IOException { - Injector injector = Guice.createInjector(new BitSquareModule()); + Injector injector = Guice.createInjector(new BitsquareModule()); ViewLoader.setInjector(injector); pane = new StackPane();