fix sort items on change language
This commit is contained in:
@@ -8,6 +8,7 @@ import org.controlsfx.control.action.Action;
|
|||||||
import org.controlsfx.dialog.Dialog;
|
import org.controlsfx.dialog.Dialog;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import ru.trader.controllers.MainController;
|
||||||
import ru.trader.controllers.Screeners;
|
import ru.trader.controllers.Screeners;
|
||||||
import ru.trader.view.support.Localization;
|
import ru.trader.view.support.Localization;
|
||||||
|
|
||||||
@@ -36,8 +37,8 @@ public class Main extends Application {
|
|||||||
Main.primaryStage = primaryStage;
|
Main.primaryStage = primaryStage;
|
||||||
loadMainScene();
|
loadMainScene();
|
||||||
loadResources();
|
loadResources();
|
||||||
ServicesManager.runAll();
|
|
||||||
primaryStage.show();
|
primaryStage.show();
|
||||||
|
ServicesManager.runAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -61,6 +62,7 @@ public class Main extends Application {
|
|||||||
public static void changeLocale(Locale locale) throws IOException {
|
public static void changeLocale(Locale locale) throws IOException {
|
||||||
Localization.setLocale(locale);
|
Localization.setLocale(locale);
|
||||||
primaryStage.hide();
|
primaryStage.hide();
|
||||||
|
MainController.getWorld().refresh();
|
||||||
loadMainScene();
|
loadMainScene();
|
||||||
loadResources();
|
loadResources();
|
||||||
primaryStage.show();
|
primaryStage.show();
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import org.slf4j.LoggerFactory;
|
|||||||
import org.xml.sax.SAXException;
|
import org.xml.sax.SAXException;
|
||||||
import ru.trader.Main;
|
import ru.trader.Main;
|
||||||
import ru.trader.World;
|
import ru.trader.World;
|
||||||
import ru.trader.core.MarketFilter;
|
|
||||||
import ru.trader.maddavo.Parser;
|
import ru.trader.maddavo.Parser;
|
||||||
import ru.trader.model.*;
|
import ru.trader.model.*;
|
||||||
import ru.trader.view.support.Localization;
|
import ru.trader.view.support.Localization;
|
||||||
@@ -73,7 +72,6 @@ public class MainController {
|
|||||||
try {
|
try {
|
||||||
if (n != null) {
|
if (n != null) {
|
||||||
Main.changeLocale((Locale) n.getUserData());
|
Main.changeLocale((Locale) n.getUserData());
|
||||||
world.refresh();
|
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
LOG.error("Error on change locale to {}", n.getUserData());
|
LOG.error("Error on change locale to {}", n.getUserData());
|
||||||
@@ -239,9 +237,9 @@ public class MainController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void editStation(ActionEvent actionEvent) {
|
public void editStation(ActionEvent actionEvent) {
|
||||||
StationModel station = offersController.getStation();
|
StationModel station = profile.getStation();
|
||||||
if (station != null) {
|
if (station != null) {
|
||||||
Screeners.showEditStation(offersController.getStation());
|
Screeners.showEditStation(station);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -311,8 +309,6 @@ public class MainController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void reload(){
|
private void reload(){
|
||||||
if (world != null) world.getModeler().clear();
|
if (world != null) world.getModeler().clear();
|
||||||
world = new MarketModel(World.getMarket());
|
world = new MarketModel(World.getMarket());
|
||||||
|
|||||||
@@ -274,5 +274,6 @@ public class MarketModel {
|
|||||||
LOG.debug("Refresh names");
|
LOG.debug("Refresh names");
|
||||||
groups.get().forEach(GroupModel::updateName);
|
groups.get().forEach(GroupModel::updateName);
|
||||||
items.get().forEach(ItemModel::updateName);
|
items.get().forEach(ItemModel::updateName);
|
||||||
|
items.sort(ItemModel::compareTo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user