Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-05-23 00:41:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

Refactor viewfx package

Browse source
This commit is contained in:
Manfred Karrer 2015-03-13 16:01:32 +01:00
parent bb14db3b8d
commit c8e79bab58
97 changed files with 260 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gui/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
View file

@ -34,10 +34,10 @@ import com.google.inject.Injector;
import java.io.IOException; import java.io.IOException;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import viewfx.view.support.guice.InjectorViewFactory; import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
import javafx.application.Application; import javafx.application.Application;
import javafx.scene.*; import javafx.scene.*;

10
gui/src/main/java/io/bitsquare/gui/GuiModule.java
View file

@ -35,11 +35,11 @@ import com.google.inject.name.Names;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import viewfx.view.ViewFactory; import io.bitsquare.viewfx.view.ViewFactory;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import viewfx.view.support.fxml.FxmlViewLoader; import io.bitsquare.viewfx.view.fxml.FxmlViewLoader;
import viewfx.view.support.guice.InjectorViewFactory; import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
import javafx.stage.Stage; import javafx.stage.Stage;

4
gui/src/main/java/io/bitsquare/gui/Navigation.java
View file

@ -29,8 +29,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewPath; import io.bitsquare.viewfx.view.ViewPath;
public class Navigation { public class Navigation {

10
gui/src/main/java/io/bitsquare/gui/main/MainView.java
View file

@ -36,11 +36,11 @@ import io.bitsquare.gui.util.Transitions;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import viewfx.view.support.InitializableView; import io.bitsquare.viewfx.view.InitializableView;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.geometry.Insets; import javafx.geometry.Insets;

2
gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
View file

@ -50,7 +50,7 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;

10
gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
View file

@ -25,11 +25,11 @@ import io.bitsquare.gui.main.account.setup.AccountSetupWizard;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.support.ActivatableView; import io.bitsquare.viewfx.view.ActivatableView;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML; import javafx.fxml.FXML;

2
gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
View file

@ -21,7 +21,7 @@ import io.bitsquare.user.User;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
class AccountViewModel implements ViewModel { class AccountViewModel implements ViewModel {

10
gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
View file

@ -21,11 +21,11 @@ import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrat
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.support.AbstractView; import io.bitsquare.viewfx.view.AbstractView;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.*; import javafx.scene.*;

10
gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
View file

@ -30,11 +30,11 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.support.ActivatableView; import io.bitsquare.viewfx.view.ActivatableView;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

4
gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
View file

@ -22,8 +22,8 @@ import io.bitsquare.gui.util.BSFormatter;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.AbstractView; import io.bitsquare.viewfx.view.AbstractView;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

4
gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
View file

@ -44,8 +44,8 @@ import java.util.Locale;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.ActivatableView; import io.bitsquare.viewfx.view.ActivatableView;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.fxml.FXML; import javafx.fxml.FXML;

6
gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
View file

@ -22,9 +22,9 @@ import io.bitsquare.gui.main.help.HelpId;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import viewfx.view.support.InitializableView; import io.bitsquare.viewfx.view.InitializableView;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

2
gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
View file

@ -22,7 +22,7 @@ import io.bitsquare.gui.util.validation.PasswordValidator;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

4
gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
View file

@ -31,8 +31,8 @@ import com.google.inject.Inject;
import java.util.Currency; import java.util.Currency;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;

6
gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
View file

@ -35,9 +35,9 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.collections.ListChangeListener; import javafx.collections.ListChangeListener;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;

4
gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
View file

@ -29,8 +29,8 @@ import com.google.inject.Inject;
import java.util.Currency; import java.util.Currency;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;

4
gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
View file

@ -41,8 +41,8 @@ import java.util.Currency;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleObjectProperty;

6
gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
View file

@ -28,9 +28,9 @@ import java.util.Currency;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.fxml.FXML; import javafx.fxml.FXML;

4
gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
View file

@ -26,8 +26,8 @@ import com.google.inject.Inject;
import java.util.Currency; import java.util.Currency;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;

6
gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
View file

@ -22,9 +22,9 @@ import io.bitsquare.gui.main.help.HelpId;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import viewfx.view.support.InitializableView; import io.bitsquare.viewfx.view.InitializableView;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

2
gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
View file

@ -22,7 +22,7 @@ import io.bitsquare.gui.util.validation.PasswordValidator;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

2
gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
View file

@ -34,7 +34,7 @@ import com.google.inject.Inject;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

6
gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
View file

@ -30,9 +30,9 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import viewfx.view.support.InitializableView; import io.bitsquare.viewfx.view.InitializableView;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;

4
gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
View file

@ -26,8 +26,8 @@ import org.bitcoinj.core.Coin;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.WithDataModel; import io.bitsquare.viewfx.model.WithDataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;

4
gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
View file

@ -39,8 +39,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;

12
gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
View file

@ -29,12 +29,12 @@ import java.util.Locale;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.*; import javafx.scene.*;

4
gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
View file

@ -25,8 +25,8 @@ import com.google.inject.Inject;
import java.util.Locale; import java.util.Locale;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

6
gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
View file

@ -22,9 +22,9 @@ import io.bitsquare.gui.main.help.HelpId;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import viewfx.view.support.InitializableView; import io.bitsquare.viewfx.view.InitializableView;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

2
gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
View file

@ -24,7 +24,7 @@ import com.google.inject.Inject;
import java.util.List; import java.util.List;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty; import javafx.beans.property.StringProperty;

14
gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
View file

@ -30,13 +30,13 @@ import io.bitsquare.gui.util.Colors;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.ViewPath; import io.bitsquare.viewfx.view.ViewPath;
import viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.geometry.Pos; import javafx.geometry.Pos;

12
gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
View file

@ -28,12 +28,12 @@ import io.bitsquare.gui.main.trade.BuyView;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.Wizard; import io.bitsquare.viewfx.view.Wizard;
import viewfx.view.support.ActivatableView; import io.bitsquare.viewfx.view.ActivatableView;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.geometry.Insets; import javafx.geometry.Insets;

4
gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
View file

@ -62,8 +62,8 @@ import java.util.Arrays;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.InitializableView; import io.bitsquare.viewfx.view.InitializableView;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;

12
gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
View file

@ -24,12 +24,12 @@ import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML; import javafx.fxml.FXML;

4
gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
View file

@ -29,8 +29,8 @@ import java.util.stream.Collectors;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;

4
gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
View file

@ -38,8 +38,8 @@ import java.util.stream.Collectors;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;

4
gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java
View file

@ -17,8 +17,8 @@
package io.bitsquare.gui.main.home; package io.bitsquare.gui.main.home;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.AbstractView; import io.bitsquare.viewfx.view.AbstractView;
// home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home, // 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, news, charts,... -> low prio // probably overview, event history, news, charts,... -> low prio

4
gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
View file

@ -17,8 +17,8 @@
package io.bitsquare.gui.main.msg; package io.bitsquare.gui.main.msg;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.AbstractView; import io.bitsquare.viewfx.view.AbstractView;
// will be probably only used for arbitration communication, will be renamed and the icon changed // will be probably only used for arbitration communication, will be renamed and the icon changed
@FxmlView @FxmlView

12
gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
View file

@ -26,12 +26,12 @@ import io.bitsquare.trade.TradeManager;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML; import javafx.fxml.FXML;

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
View file

@ -25,8 +25,8 @@ import io.bitsquare.user.User;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.MapChangeListener; import javafx.collections.MapChangeListener;

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
View file

@ -21,8 +21,8 @@ import io.bitsquare.gui.components.Popups;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.fxml.FXML; import javafx.fxml.FXML;

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
View file

@ -21,8 +21,8 @@ import io.bitsquare.gui.util.BSFormatter;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
View file

@ -29,8 +29,8 @@ import com.google.inject.Inject;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.MapChangeListener; import javafx.collections.MapChangeListener;

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
View file

@ -22,8 +22,8 @@ import io.bitsquare.util.Utilities;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.fxml.FXML; import javafx.fxml.FXML;

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
View file

@ -22,8 +22,8 @@ import io.bitsquare.gui.util.BSFormatter;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
View file

@ -39,8 +39,8 @@ import com.google.inject.Inject;
import java.util.Optional; import java.util.Optional;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleObjectProperty;

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
View file

@ -43,8 +43,8 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
View file

@ -30,8 +30,8 @@ import com.google.inject.Inject;
import java.util.Date; import java.util.Date;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.InvalidationListener; import javafx.beans.InvalidationListener;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;

12
gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
View file

@ -25,12 +25,12 @@ import io.bitsquare.settings.Preferences;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import viewfx.view.support.CachingViewLoader; import io.bitsquare.viewfx.view.CachingViewLoader;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML; import javafx.fxml.FXML;

4
gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
View file

@ -21,8 +21,8 @@ import io.bitsquare.settings.Preferences;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;

4
gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
View file

@ -19,8 +19,8 @@ package io.bitsquare.gui.main.settings.application;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

4
gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
View file

@ -19,8 +19,8 @@ package io.bitsquare.gui.main.settings.application;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.StringProperty; import javafx.beans.property.StringProperty;

4
gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
View file

@ -22,8 +22,8 @@ import io.bitsquare.network.ClientNode;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.InitializableView; import io.bitsquare.viewfx.view.InitializableView;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;

4
gui/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
View file

@ -21,8 +21,8 @@ import io.bitsquare.gui.Navigation;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
@FxmlView @FxmlView
public class BuyView extends TradeView { public class BuyView extends TradeView {

4
gui/src/main/java/io/bitsquare/gui/main/trade/SellView.java
View file

@ -21,8 +21,8 @@ import io.bitsquare.gui.Navigation;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
@FxmlView @FxmlView
public class SellView extends TradeView { public class SellView extends TradeView {

6
gui/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
View file

@ -32,9 +32,9 @@ import org.bitcoinj.utils.Fiat;
import java.util.List; import java.util.List;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.support.ActivatableView; import io.bitsquare.viewfx.view.ActivatableView;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.collections.ListChangeListener; import javafx.collections.ListChangeListener;

4
gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
View file

@ -41,8 +41,8 @@ import com.google.inject.Inject;
import java.util.Locale; import java.util.Locale;
import java.util.UUID; import java.util.UUID;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;

4
gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
View file

@ -45,8 +45,8 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;

4
gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
View file

@ -31,8 +31,8 @@ import org.bitcoinj.utils.Fiat;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.Observable; import javafx.beans.Observable;
import javafx.beans.binding.Bindings; import javafx.beans.binding.Bindings;

4
gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
View file

@ -36,8 +36,8 @@ import org.bitcoinj.utils.Fiat;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleObjectProperty;

4
gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
View file

@ -39,8 +39,8 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyObjectWrapper;

4
gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
View file

@ -31,8 +31,8 @@ import org.bitcoinj.utils.Fiat;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty; import javafx.beans.property.StringProperty;

4
gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
View file

@ -33,8 +33,8 @@ import org.bitcoinj.utils.Fiat;
import com.google.inject.Inject; import com.google.inject.Inject;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import viewfx.model.DataModel; import io.bitsquare.viewfx.model.DataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;

4
gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
View file

@ -43,8 +43,8 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.FxmlView;
import viewfx.view.support.ActivatableViewAndModel; import io.bitsquare.viewfx.view.ActivatableViewAndModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;

4
gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
View file

@ -30,8 +30,8 @@ import org.bitcoinj.core.Coin;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.model.ViewModel; import io.bitsquare.viewfx.model.ViewModel;
import viewfx.model.support.ActivatableWithDataModel; import io.bitsquare.viewfx.model.ActivatableWithDataModel;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;

2
gui/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java
View file

@ -301,7 +301,7 @@ public class TomP2PNode implements ClientNode {
else { else {
throw new RuntimeException("Received msg from myself. That must never happen."); throw new RuntimeException("Received msg from myself. That must never happen.");
} }
return null; return true;
}); });
} }

5
gui/src/main/java/io/bitsquare/trade/TradeManager.java
View file

@ -30,6 +30,7 @@ import io.bitsquare.offer.OfferBookService;
import io.bitsquare.offer.OpenOffer; import io.bitsquare.offer.OpenOffer;
import io.bitsquare.persistence.Persistence; import io.bitsquare.persistence.Persistence;
import io.bitsquare.trade.handlers.TransactionResultHandler; import io.bitsquare.trade.handlers.TransactionResultHandler;
import io.bitsquare.trade.listeners.MessageHandler;
import io.bitsquare.trade.listeners.SendMessageListener; import io.bitsquare.trade.listeners.SendMessageListener;
import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel; import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel;
import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityProtocol; import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityProtocol;
@ -80,6 +81,7 @@ public class TradeManager {
private final ObservableMap<String, OpenOffer> openOffers = FXCollections.observableHashMap(); private final ObservableMap<String, OpenOffer> openOffers = FXCollections.observableHashMap();
private final ObservableMap<String, Trade> pendingTrades = FXCollections.observableHashMap(); private final ObservableMap<String, Trade> pendingTrades = FXCollections.observableHashMap();
private final ObservableMap<String, Trade> closedTrades = FXCollections.observableHashMap(); private final ObservableMap<String, Trade> closedTrades = FXCollections.observableHashMap();
private final MessageHandler messageHandler;
private Trade currentPendingTrade; private Trade currentPendingTrade;
@ -116,8 +118,9 @@ public class TradeManager {
if (closedTradesObject instanceof Map) { if (closedTradesObject instanceof Map) {
closedTrades.putAll((Map<String, Trade>) closedTradesObject); closedTrades.putAll((Map<String, Trade>) closedTradesObject);
} }
messageHandler = this::handleMessage;
tradeMessageService.addMessageHandler(this::handleMessage); tradeMessageService.addMessageHandler(messageHandler);
} }

16
gui/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
View file

@ -20,11 +20,14 @@ package io.bitsquare.trade.protocol.availability;
import io.bitsquare.network.Message; import io.bitsquare.network.Message;
import io.bitsquare.network.Peer; import io.bitsquare.network.Peer;
import io.bitsquare.offer.Offer; import io.bitsquare.offer.Offer;
import io.bitsquare.trade.listeners.MessageHandler;
import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailabilityMessage; import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailabilityMessage;
import io.bitsquare.trade.protocol.availability.tasks.GetPeerAddress; import io.bitsquare.trade.protocol.availability.tasks.GetPeerAddress;
import io.bitsquare.trade.protocol.availability.tasks.RequestIsOfferAvailable; import io.bitsquare.trade.protocol.availability.tasks.RequestIsOfferAvailable;
import io.bitsquare.util.tasks.TaskRunner; import io.bitsquare.util.tasks.TaskRunner;
import javafx.application.Platform;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -33,7 +36,9 @@ import static io.bitsquare.util.Validator.nonEmptyStringOf;
public class CheckOfferAvailabilityProtocol { public class CheckOfferAvailabilityProtocol {
private static final Logger log = LoggerFactory.getLogger(CheckOfferAvailabilityProtocol.class); private static final Logger log = LoggerFactory.getLogger(CheckOfferAvailabilityProtocol.class);
private CheckOfferAvailabilityModel model; private final CheckOfferAvailabilityModel model;
private final MessageHandler messageHandler;
private boolean isCanceled; private boolean isCanceled;
private TaskRunner<CheckOfferAvailabilityModel> sequence; private TaskRunner<CheckOfferAvailabilityModel> sequence;
@ -44,10 +49,12 @@ public class CheckOfferAvailabilityProtocol {
public CheckOfferAvailabilityProtocol(CheckOfferAvailabilityModel model) { public CheckOfferAvailabilityProtocol(CheckOfferAvailabilityModel model) {
this.model = model; this.model = model;
messageHandler = this::handleMessage;
} }
public void cleanup() { public void cleanup() {
model.getTradeMessageService().removeMessageHandler(this::handleMessage); // cannot remove listener in same execution cycle, so we delay it
Platform.runLater(() -> model.getTradeMessageService().removeMessageHandler(messageHandler));
} }
@ -56,7 +63,7 @@ public class CheckOfferAvailabilityProtocol {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public void checkOfferAvailability() { public void checkOfferAvailability() {
model.getTradeMessageService().addMessageHandler(this::handleMessage); model.getTradeMessageService().addMessageHandler(messageHandler);
sequence = new TaskRunner<>(model, sequence = new TaskRunner<>(model,
() -> { () -> {
@ -95,8 +102,7 @@ public class CheckOfferAvailabilityProtocol {
model.getOffer().setState(Offer.State.OFFER_NOT_AVAILABLE); model.getOffer().setState(Offer.State.OFFER_NOT_AVAILABLE);
} }
} }
model.getResultHandler().handleResult();
} }
model.getResultHandler().handleResult();
} }
} }

10
gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
View file

@ -19,6 +19,7 @@ package io.bitsquare.trade.protocol.trade.offerer;
import io.bitsquare.network.Message; import io.bitsquare.network.Message;
import io.bitsquare.network.Peer; import io.bitsquare.network.Peer;
import io.bitsquare.trade.listeners.MessageHandler;
import io.bitsquare.trade.protocol.trade.TradeMessage; import io.bitsquare.trade.protocol.trade.TradeMessage;
import io.bitsquare.trade.protocol.trade.offerer.tasks.CreateDepositTx; import io.bitsquare.trade.protocol.trade.offerer.tasks.CreateDepositTx;
import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessPayoutTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.tasks.ProcessPayoutTxPublishedMessage;
@ -50,7 +51,7 @@ public class BuyerAsOffererProtocol {
private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererProtocol.class); private static final Logger log = LoggerFactory.getLogger(BuyerAsOffererProtocol.class);
private BuyerAsOffererModel model; private BuyerAsOffererModel model;
private final MessageHandler messageHandler;
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Constructor // Constructor
@ -58,8 +59,9 @@ public class BuyerAsOffererProtocol {
public BuyerAsOffererProtocol(BuyerAsOffererModel model) { public BuyerAsOffererProtocol(BuyerAsOffererModel model) {
this.model = model; this.model = model;
messageHandler = this::handleMessage;
model.getTradeMessageService().addMessageHandler(this::handleMessage); model.getTradeMessageService().addMessageHandler(messageHandler);
} }
@ -68,7 +70,9 @@ public class BuyerAsOffererProtocol {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public void cleanup() { public void cleanup() {
model.getTradeMessageService().removeMessageHandler(this::handleMessage); model.getTradeMessageService().removeMessageHandler(messageHandler);
// cannot remove listener in same execution cycle, so we delay it
//Platform.runLater(() -> model.getTradeMessageService().removeMessageHandler(messageHandler));
} }

18
gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
View file

@ -20,6 +20,7 @@ package io.bitsquare.trade.protocol.trade.taker;
import io.bitsquare.network.Message; import io.bitsquare.network.Message;
import io.bitsquare.network.Peer; import io.bitsquare.network.Peer;
import io.bitsquare.trade.Trade; import io.bitsquare.trade.Trade;
import io.bitsquare.trade.listeners.MessageHandler;
import io.bitsquare.trade.protocol.trade.TradeMessage; import io.bitsquare.trade.protocol.trade.TradeMessage;
import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferStartedMessage; import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferStartedMessage;
import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage; import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage;
@ -29,16 +30,16 @@ import io.bitsquare.trade.protocol.trade.taker.tasks.CreateAndSignContract;
import io.bitsquare.trade.protocol.trade.taker.tasks.GetPeerAddress; import io.bitsquare.trade.protocol.trade.taker.tasks.GetPeerAddress;
import io.bitsquare.trade.protocol.trade.taker.tasks.PayDeposit; import io.bitsquare.trade.protocol.trade.taker.tasks.PayDeposit;
import io.bitsquare.trade.protocol.trade.taker.tasks.PayTakeOfferFee; import io.bitsquare.trade.protocol.trade.taker.tasks.PayTakeOfferFee;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessBankTransferInitedMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRespondToTakeOfferRequestMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessTakerDepositPaymentRequestMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.RequestTakeOffer; import io.bitsquare.trade.protocol.trade.taker.tasks.RequestTakeOffer;
import io.bitsquare.trade.protocol.trade.taker.tasks.SendPayoutTxToOfferer; import io.bitsquare.trade.protocol.trade.taker.tasks.SendPayoutTxToOfferer;
import io.bitsquare.trade.protocol.trade.taker.tasks.SendSignedTakerDepositTxAsHex; import io.bitsquare.trade.protocol.trade.taker.tasks.SendSignedTakerDepositTxAsHex;
import io.bitsquare.trade.protocol.trade.taker.tasks.SendTakeOfferFeePayedMessage; import io.bitsquare.trade.protocol.trade.taker.tasks.SendTakeOfferFeePayedMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.SignAndPublishPayoutTx; import io.bitsquare.trade.protocol.trade.taker.tasks.SignAndPublishPayoutTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx; import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessBankTransferInitedMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessDepositTxPublishedMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessRespondToTakeOfferRequestMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.ProcessTakerDepositPaymentRequestMessage;
import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment; import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment;
import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount; import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount;
@ -51,7 +52,7 @@ public class SellerAsTakerProtocol {
private static final Logger log = LoggerFactory.getLogger(SellerAsTakerProtocol.class); private static final Logger log = LoggerFactory.getLogger(SellerAsTakerProtocol.class);
private final SellerAsTakerModel model; private final SellerAsTakerModel model;
private final MessageHandler messageHandler;
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Constructor // Constructor
@ -59,6 +60,7 @@ public class SellerAsTakerProtocol {
public SellerAsTakerProtocol(SellerAsTakerModel model) { public SellerAsTakerProtocol(SellerAsTakerModel model) {
this.model = model; this.model = model;
messageHandler = this::handleMessage;
} }
@ -67,7 +69,7 @@ public class SellerAsTakerProtocol {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public void takeOffer() { public void takeOffer() {
model.getTradeMessageService().addMessageHandler(this::handleMessage); model.getTradeMessageService().addMessageHandler(messageHandler);
SellerAsTakerTaskRunner<SellerAsTakerModel> sequence = new SellerAsTakerTaskRunner<>(model, SellerAsTakerTaskRunner<SellerAsTakerModel> sequence = new SellerAsTakerTaskRunner<>(model,
() -> { () -> {
@ -85,7 +87,9 @@ public class SellerAsTakerProtocol {
} }
public void cleanup() { public void cleanup() {
model.getTradeMessageService().removeMessageHandler(this::handleMessage); model.getTradeMessageService().removeMessageHandler(messageHandler);
// cannot remove listener in same execution cycle, so we delay it
// Platform.runLater(() -> model.getTradeMessageService().removeMessageHandler(messageHandler));
} }

6
gui/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
View file

@ -134,11 +134,13 @@ public class TomP2PTradeMessageService implements TradeMessageService {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public void addMessageHandler(MessageHandler listener) { public void addMessageHandler(MessageHandler listener) {
messageHandlers.add(listener); if (!messageHandlers.add(listener))
throw new RuntimeException("Add listener did not change list. Probably listener has been already added.");
} }
public void removeMessageHandler(MessageHandler listener) { public void removeMessageHandler(MessageHandler listener) {
messageHandlers.remove(listener); if (!messageHandlers.remove(listener))
throw new RuntimeException("Try to remove listener which was never added.");
} }

2
gui/src/main/java/viewfx/ViewfxException.java → gui/src/main/java/io/bitsquare/viewfx/ViewfxException.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx; package io.bitsquare.viewfx;
import static java.lang.String.format; import static java.lang.String.format;

2
gui/src/main/java/viewfx/model/Activatable.java → gui/src/main/java/io/bitsquare/viewfx/model/Activatable.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.model; package io.bitsquare.viewfx.model;
public interface Activatable { public interface Activatable {

4
gui/src/main/java/viewfx/model/support/ActivatableWithDataModel.java → gui/src/main/java/io/bitsquare/viewfx/model/ActivatableWithDataModel.java
View file

@ -15,9 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.model.support; package io.bitsquare.viewfx.model;
import viewfx.model.Activatable;
public abstract class ActivatableWithDataModel<D extends Activatable> extends WithDataModel<D> implements Activatable { public abstract class ActivatableWithDataModel<D extends Activatable> extends WithDataModel<D> implements Activatable {

2
gui/src/main/java/viewfx/model/DataModel.java → gui/src/main/java/io/bitsquare/viewfx/model/DataModel.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.model; package io.bitsquare.viewfx.model;
public interface DataModel extends Model { public interface DataModel extends Model {
} }

2
gui/src/main/java/viewfx/model/Model.java → gui/src/main/java/io/bitsquare/viewfx/model/Model.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.model; package io.bitsquare.viewfx.model;
public interface Model { public interface Model {
} }

2
gui/src/main/java/viewfx/model/ViewModel.java → gui/src/main/java/io/bitsquare/viewfx/model/ViewModel.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.model; package io.bitsquare.viewfx.model;
public interface ViewModel extends Model { public interface ViewModel extends Model {
} }

2
gui/src/main/java/viewfx/model/support/WithDataModel.java → gui/src/main/java/io/bitsquare/viewfx/model/WithDataModel.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.model.support; package io.bitsquare.viewfx.model;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;

4
gui/src/main/java/viewfx/view/support/AbstractView.java → gui/src/main/java/io/bitsquare/viewfx/view/AbstractView.java
View file

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view.support; package io.bitsquare.viewfx.view;
import viewfx.view.View; import io.bitsquare.viewfx.view.View;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.*; import javafx.scene.*;

2
gui/src/main/java/viewfx/view/support/ActivatableView.java → gui/src/main/java/io/bitsquare/viewfx/view/ActivatableView.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view.support; package io.bitsquare.viewfx.view;
import javafx.scene.*; import javafx.scene.*;

4
gui/src/main/java/viewfx/view/support/ActivatableViewAndModel.java → gui/src/main/java/io/bitsquare/viewfx/view/ActivatableViewAndModel.java
View file

@ -15,9 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view.support; package io.bitsquare.viewfx.view;
import viewfx.model.Activatable; import io.bitsquare.viewfx.model.Activatable;
import javafx.scene.*; import javafx.scene.*;

7
gui/src/main/java/viewfx/view/support/CachingViewLoader.java → gui/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java
View file

@ -15,14 +15,15 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view.support; package io.bitsquare.viewfx.view;
import io.bitsquare.viewfx.view.View;
import java.util.HashMap; import java.util.HashMap;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.view.View; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.ViewLoader;
public class CachingViewLoader implements ViewLoader { public class CachingViewLoader implements ViewLoader {

2
gui/src/main/java/viewfx/view/DefaultPathConvention.java → gui/src/main/java/io/bitsquare/viewfx/view/DefaultPathConvention.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view; package io.bitsquare.viewfx.view;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;

2
gui/src/main/java/viewfx/view/FxmlView.java → gui/src/main/java/io/bitsquare/viewfx/view/FxmlView.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view; package io.bitsquare.viewfx.view;
import java.util.function.Function; import java.util.function.Function;

2
gui/src/main/java/viewfx/view/support/InitializableView.java → gui/src/main/java/io/bitsquare/viewfx/view/InitializableView.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view.support; package io.bitsquare.viewfx.view;
import java.net.URL; import java.net.URL;

2
gui/src/main/java/viewfx/view/View.java → gui/src/main/java/io/bitsquare/viewfx/view/View.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view; package io.bitsquare.viewfx.view;
import javafx.scene.*; import javafx.scene.*;

2
gui/src/main/java/viewfx/view/ViewFactory.java → gui/src/main/java/io/bitsquare/viewfx/view/ViewFactory.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view; package io.bitsquare.viewfx.view;
import javafx.util.Callback; import javafx.util.Callback;

2
gui/src/main/java/viewfx/view/ViewLoader.java → gui/src/main/java/io/bitsquare/viewfx/view/ViewLoader.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view; package io.bitsquare.viewfx.view;
public interface ViewLoader { public interface ViewLoader {
View load(Class<? extends View> viewClass); View load(Class<? extends View> viewClass);

2
gui/src/main/java/viewfx/view/ViewPath.java → gui/src/main/java/io/bitsquare/viewfx/view/ViewPath.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view; package io.bitsquare.viewfx.view;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

2
gui/src/main/java/viewfx/view/Wizard.java → gui/src/main/java/io/bitsquare/viewfx/view/Wizard.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view; package io.bitsquare.viewfx.view;
public interface Wizard extends View { public interface Wizard extends View {
void nextStep(Step currentStep); void nextStep(Step currentStep);

13
gui/src/main/java/viewfx/view/support/fxml/FxmlViewLoader.java → gui/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
View file

@ -15,7 +15,11 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view.support.fxml; package io.bitsquare.viewfx.view.fxml;
import io.bitsquare.viewfx.ViewfxException;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View;
import java.io.IOException; import java.io.IOException;
@ -25,11 +29,8 @@ import java.util.ResourceBundle;
import javax.inject.Inject; import javax.inject.Inject;
import viewfx.ViewfxException; import io.bitsquare.viewfx.view.ViewFactory;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.View;
import viewfx.view.ViewFactory;
import viewfx.view.ViewLoader;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;

4
gui/src/main/java/viewfx/view/support/guice/InjectorViewFactory.java → gui/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java
View file

@ -15,13 +15,13 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view.support.guice; package io.bitsquare.viewfx.view.guice;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.inject.Injector; import com.google.inject.Injector;
import viewfx.view.ViewFactory; import io.bitsquare.viewfx.view.ViewFactory;
public class InjectorViewFactory implements ViewFactory { public class InjectorViewFactory implements ViewFactory {

0
gui/src/test/java/viewfx/view/support/fxml/FxmlViewLoaderTests$Malformed.fxml → gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml
View file

0
gui/src/test/java/viewfx/view/support/fxml/FxmlViewLoaderTests$MissingFxController.fxml → gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml
View file

2
gui/src/test/java/viewfx/view/support/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml → gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml
View file

@ -16,6 +16,6 @@
--> -->
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="viewfx.view.support.fxml.FxmlViewLoaderTests$MissingFxmlViewAnnotation" <AnchorPane fx:id="root" fx:controller="io.bitsquare.viewfx.view.fxml.FxmlViewLoaderTests$MissingFxmlViewAnnotation"
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
</AnchorPane> </AnchorPane>

2
gui/src/test/java/viewfx/view/support/fxml/FxmlViewLoaderTests$WellFormed.fxml → gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml
View file

@ -16,6 +16,6 @@
--> -->
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="viewfx.view.support.fxml.FxmlViewLoaderTests$WellFormed" <AnchorPane fx:id="root" fx:controller="io.bitsquare.viewfx.view.fxml.FxmlViewLoaderTests$WellFormed"
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
</AnchorPane> </AnchorPane>

15
gui/src/test/java/viewfx/view/support/fxml/FxmlViewLoaderTests.java → gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java
View file

@ -15,16 +15,17 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view.support.fxml; package io.bitsquare.viewfx.view.fxml;
import io.bitsquare.viewfx.ViewfxException;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import viewfx.ViewfxException; import io.bitsquare.viewfx.view.ViewFactory;
import viewfx.view.FxmlView; import io.bitsquare.viewfx.view.ViewLoader;
import viewfx.view.View; import io.bitsquare.viewfx.view.AbstractView;
import viewfx.view.ViewFactory;
import viewfx.view.ViewLoader;
import viewfx.view.support.AbstractView;
import javafx.fxml.LoadException; import javafx.fxml.LoadException;

6
gui/src/test/java/viewfx/view/support/CachingViewLoaderTests.java → gui/src/test/java/io/bitsquare/viewfx/view/support/CachingViewLoaderTests.java
View file

@ -15,9 +15,11 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>. * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/ */
package viewfx.view.support; package io.bitsquare.viewfx.view.support;
import viewfx.view.ViewLoader; import io.bitsquare.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.ViewLoader;
import org.junit.Test; import org.junit.Test;