Orderbook, Mainview, refactorings

This commit is contained in:
Manfred Karrer 2014-09-15 00:05:40 +02:00
parent 870cd062f5
commit c30646a11c
72 changed files with 1995 additions and 1088 deletions

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.account;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class AccountSettingsUITestRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 630);
@ -67,7 +67,7 @@ public class AccountSettingsUITestRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/AccountSettingsView.fxml"), false);
try {
view = loader.load();

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.account;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class AccountUITestRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 630);
@ -67,7 +67,7 @@ public class AccountUITestRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/AccountView.fxml"), false);
try {
view = loader.load();

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.account;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class RegistrationUITestRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 630);
@ -67,7 +67,7 @@ public class RegistrationUITestRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/content/RegistrationView.fxml"), false);
try {
view = loader.load();

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.account;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class SetupUITestRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 630);
@ -67,7 +67,7 @@ public class SetupUITestRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/setup/SetupView.fxml"), false);
try {
view = loader.load();

View file

@ -1,7 +1,7 @@
package io.bitsquare.gui.main.account.registration.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -37,7 +37,7 @@ public class FundRegistrationWalletUIMockRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 650);
@ -50,7 +50,7 @@ public class FundRegistrationWalletUIMockRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletViewUIMock.fxml"), false);
try {

View file

@ -1,7 +1,7 @@
package io.bitsquare.gui.main.account.registration.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -37,7 +37,7 @@ public class RegistrationUIMockRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 660);
@ -50,7 +50,7 @@ public class RegistrationUIMockRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/registration/uimock/RegistrationViewUIMock.fxml"), false);
try {

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.settings;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class FiatAccountUITestRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 630);
@ -67,7 +67,7 @@ public class FiatAccountUITestRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/content/FiatAccountView.fxml"), false);
try {
view = loader.load();

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.settings;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class PasswordUITestRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 630);
@ -67,7 +67,7 @@ public class PasswordUITestRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/content/PasswordView.fxml"), false);
try {
view = loader.load();

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.settings;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class RegistrationUITestRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 530);
@ -67,7 +67,7 @@ public class RegistrationUITestRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/content/RegistrationView.fxml"), false);
try {
view = loader.load();

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.settings;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class RestrictionsUITestRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 530);
@ -67,7 +67,7 @@ public class RestrictionsUITestRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/content/RestrictionsView.fxml"), false);
try {
view = loader.load();

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.settings;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class SeedWordsUITestRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 630);
@ -67,7 +67,7 @@ public class SeedWordsUITestRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/account/content/SeedWordsView.fxml"), false);
try {
view = loader.load();

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.settings.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class BankAccountSettingsUIMockRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 1200);
@ -67,7 +67,7 @@ public class BankAccountSettingsUIMockRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/settings/uimock/BankAccountSettingsViewUIMock.fxml"), false);
try {

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.settings.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class RestrictionSettingsUIMockRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 1200);
@ -67,7 +67,7 @@ public class RestrictionSettingsUIMockRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/settings/uimock/RestrictionSettingsViewUIMock.fxml"), false);
try {

View file

@ -1,7 +1,7 @@
package io.bitsquare.gui.main.settings.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -37,7 +37,7 @@ public class SeedWordsUIMockRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 1200);
@ -50,7 +50,7 @@ public class SeedWordsUIMockRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/settings/uimock/SeedWordsViewUIMock.fxml"), false);
try {

View file

@ -1,7 +1,7 @@
package io.bitsquare.gui.main.settings.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -37,7 +37,7 @@ public class SetPasswordUIMockRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 1200);
@ -50,7 +50,7 @@ public class SetPasswordUIMockRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/settings/uimock/SetPasswordViewUIMock.fxml"), false);
try {

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class CreateOfferUITestRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 630);
@ -67,7 +67,7 @@ public class CreateOfferUITestRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml"), false);
try {
view = loader.load();

View file

@ -18,7 +18,7 @@
package io.bitsquare.gui.main.trade.createoffer.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
import io.bitsquare.util.ViewLoader;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -54,7 +54,7 @@ public class CreateOfferUIMockRunner extends Application {
@Override
public void start(Stage primaryStage) throws IOException {
Injector injector = Guice.createInjector(new BitSquareModule());
BSFXMLLoader.setInjector(injector);
ViewLoader.setInjector(injector);
pane = new StackPane();
scene = new Scene(pane, 1000, 630);
@ -67,7 +67,7 @@ public class CreateOfferUIMockRunner extends Application {
public void loadMainWindow() {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
ViewLoader loader = new ViewLoader(
getUrl("/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferViewUIMock.fxml"), false);
try {