Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-20 21:04:28 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/bitsquare/bitsquare

Browse source
This commit is contained in:
Manfred Karrer 2014-10-05 18:59:52 +02:00
commit c9b55c549f
13 changed files with 357 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/io/bitsquare/BitSquare.java
View file

@ -50,6 +50,7 @@ import javafx.stage.Stage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import akka.actor.ActorSystem;
import lighthouse.files.AppDirectory;
public class BitSquare extends Application {
@ -120,11 +121,11 @@ public class BitSquare extends Application {
log.error(e.getMessage());
}
// currently there is not SystemTray support for java fx (planned for version 3) so we use the old AWT
AWTSystemTray.createSystemTray(primaryStage);
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));
walletFacade = injector.getInstance(WalletFacade.class);
messageFacade = injector.getInstance(MessageFacade.class);
Profiler.printMsgWithTime("BitSquare: messageFacade, walletFacade created");