Archived
0

fix sort items on change language

This commit is contained in:
Mo
2015-08-08 18:38:49 +03:00
parent 60962b4958
commit 9ec60b7c89
3 changed files with 6 additions and 7 deletions

View File

@@ -8,6 +8,7 @@ import org.controlsfx.control.action.Action;
import org.controlsfx.dialog.Dialog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.trader.controllers.MainController;
import ru.trader.controllers.Screeners;
import ru.trader.view.support.Localization;
@@ -36,8 +37,8 @@ public class Main extends Application {
Main.primaryStage = primaryStage;
loadMainScene();
loadResources();
ServicesManager.runAll();
primaryStage.show();
ServicesManager.runAll();
}
@@ -61,6 +62,7 @@ public class Main extends Application {
public static void changeLocale(Locale locale) throws IOException {
Localization.setLocale(locale);
primaryStage.hide();
MainController.getWorld().refresh();
loadMainScene();
loadResources();
primaryStage.show();

View File

@@ -15,7 +15,6 @@ import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
import ru.trader.Main;
import ru.trader.World;
import ru.trader.core.MarketFilter;
import ru.trader.maddavo.Parser;
import ru.trader.model.*;
import ru.trader.view.support.Localization;
@@ -73,7 +72,6 @@ public class MainController {
try {
if (n != null) {
Main.changeLocale((Locale) n.getUserData());
world.refresh();
}
} catch (IOException e) {
LOG.error("Error on change locale to {}", n.getUserData());
@@ -239,9 +237,9 @@ public class MainController {
}
public void editStation(ActionEvent actionEvent) {
StationModel station = offersController.getStation();
StationModel station = profile.getStation();
if (station != null) {
Screeners.showEditStation(offersController.getStation());
Screeners.showEditStation(station);
}
}
@@ -311,8 +309,6 @@ public class MainController {
}
}
private void reload(){
if (world != null) world.getModeler().clear();
world = new MarketModel(World.getMarket());

View File

@@ -274,5 +274,6 @@ public class MarketModel {
LOG.debug("Refresh names");
groups.get().forEach(GroupModel::updateName);
items.get().forEach(ItemModel::updateName);
items.sort(ItemModel::compareTo);
}
}