Voomra/trader
Archived
0
Fork 0
Code Activity

fix update controllers on change market

Browse Source
This commit is contained in:
iMoHax
2014-09-03 16:35:49 +04:00
parent 14364b7998
commit dde8d417e7
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/main/java/ru/trader/controllers/MainController.java
View File

@@ -44,8 +44,8 @@ public class MainController {
private OffersController offersController; private OffersController offersController;
@FXML @FXML
private ItemsController itemsController; private ItemsController itemsController;
@FXML
private RouterController routerController;
@FXML @FXML
private void initialize() { private void initialize() {
@@ -56,7 +56,7 @@ public class MainController {
ToggleGroup toggleGroup = new ToggleGroup(); ToggleGroup toggleGroup = new ToggleGroup();
for (Locale locale : Localization.getLocales()) { for (Locale locale : Localization.getLocales()) {
ResourceBundle rb = Localization.getResources(locale); ResourceBundle rb = Localization.getResources(locale);
RadioMenuItem mi = new RadioMenuItem(rb.getString("main.menu.file.language.item")); RadioMenuItem mi = new RadioMenuItem(rb.getString("main.menu.settings.language.item"));
mi.setToggleGroup(toggleGroup); mi.setToggleGroup(toggleGroup);
mi.setUserData(locale); mi.setUserData(locale);
if (locale.equals(Localization.getCurrentLocale())) mi.setSelected(true); if (locale.equals(Localization.getCurrentLocale())) mi.setSelected(true);
@@ -93,6 +93,13 @@ public class MainController {
MarketModel old = MainController.market; MarketModel old = MainController.market;
MainController.market = market; MainController.market = market;
MainController.market.addAllListener(old.getListeners()); MainController.market.addAllListener(old.getListeners());
Screeners.reinitAll();
}
void init(){
itemsController.init();
offersController.init();
routerController.init();
} }
public void save(ActionEvent actionEvent) { public void save(ActionEvent actionEvent) {
@@ -149,7 +156,6 @@ public class MainController {
private void reload(){ private void reload(){
world = new MarketModel(World.getMarket()); world = new MarketModel(World.getMarket());
market = world; market = world;
itemsController.init(); Screeners.reinitAll();
offersController.init();
} }
} }

6
client/src/main/java/ru/trader/controllers/Screeners.java
View File

@@ -8,6 +8,7 @@ import javafx.scene.Scene;
import javafx.stage.Stage; import javafx.stage.Stage;
import org.controlsfx.control.action.Action; import org.controlsfx.control.action.Action;
import org.controlsfx.dialog.Dialogs; import org.controlsfx.dialog.Dialogs;
import ru.trader.EMDNUpdater;
import ru.trader.model.*; import ru.trader.model.*;
import ru.trader.view.support.CustomBuilderFactory; import ru.trader.view.support.CustomBuilderFactory;
import ru.trader.view.support.Localization; import ru.trader.view.support.Localization;
@@ -179,4 +180,9 @@ public class Screeners {
public static void showSettings() { public static void showSettings() {
settingsController.showDialog(mainScreen, settingsScreen); settingsController.showDialog(mainScreen, settingsScreen);
} }
public static void reinitAll() {
mainController.init();
EMDNUpdater.setMarket(MainController.getMarket());
}
} }