Merge branch 'v2' of https://github.com/iMoHax/Trader into v2

2015-12-27 13:43:25 +03:00
parent b685e62b0b 1f43571e37
commit bbdcc478c7
19 changed files with 490 additions and 40 deletions
--- a/client/src/main/java/ru/trader/controllers/MainController.java
+++ b/client/src/main/java/ru/trader/controllers/MainController.java
@@ -48,8 +48,6 @@ public class MainController {
    @FXML
    private ItemsController itemsController;
    @FXML
-    private RouterController routerController;
-    @FXML
    private TabPane tabs;
    @FXML
    private Tab track;
@@ -111,7 +109,6 @@ public class MainController {
    void init(){
        itemsController.init();
        offersController.init();
-        routerController.init();
        //TODO: add init all controllers
    }