From 4170d5d4e7f79142767e5b19be5d2bee15dc8b67 Mon Sep 17 00:00:00 2001 From: iMoHax Date: Wed, 5 Oct 2016 15:54:27 +0300 Subject: [PATCH] add EDDN settings --- client/src/main/java/ru/trader/Settings.java | 16 ---------- .../controllers/SettingsController.java | 31 ++++++------------- .../resources/lang/locale_en_US.properties | 2 +- .../resources/lang/locale_ru_RU.properties | 2 +- client/src/main/resources/view/settings.fxml | 10 +++--- utils/src/main/java/ru/trader/emdn/EMDN.java | 1 + 6 files changed, 17 insertions(+), 45 deletions(-) diff --git a/client/src/main/java/ru/trader/Settings.java b/client/src/main/java/ru/trader/Settings.java index c8a7d98..fe19b3e 100644 --- a/client/src/main/java/ru/trader/Settings.java +++ b/client/src/main/java/ru/trader/Settings.java @@ -93,22 +93,6 @@ public class Settings { return values.getProperty("emdn.sub","tcp://eddn-relay.elite-markets.net:9500"); } - public void setEMDNUpdateOnly(boolean updateOnly){ - values.setProperty("emdn.updateOnly", updateOnly ? "1":"0"); - } - - public boolean getEMDNUpdateOnly(){ - return !"0".equals(values.getProperty("emdn.updateOnly","1")); - } - - public void setEMDNAutoUpdate(long autoUpdate){ - values.setProperty("emdn.auto", String.valueOf(autoUpdate)); - } - - public long getEMDNAutoUpdate(){ - return Long.valueOf(values.getProperty("emdn.auto", "0")); - } - public void setBalance(double balance){ profile.setBalance(balance); } diff --git a/client/src/main/java/ru/trader/controllers/SettingsController.java b/client/src/main/java/ru/trader/controllers/SettingsController.java index 491ce4f..1fd8999 100644 --- a/client/src/main/java/ru/trader/controllers/SettingsController.java +++ b/client/src/main/java/ru/trader/controllers/SettingsController.java @@ -10,6 +10,7 @@ import javafx.stage.DirectoryChooser; import javafx.stage.FileChooser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ru.trader.EMDNUpdater; import ru.trader.Main; import ru.trader.core.Profile; import ru.trader.view.support.Localization; @@ -27,10 +28,6 @@ public class SettingsController { private CheckBox emdnOn; @FXML private TextField emdnSubServ; - @FXML - private CheckBox emdnUpdateOnly; - @FXML - private NumberField emdnUpdateTime; @FXML private NumberField jumps; @@ -92,13 +89,6 @@ public class SettingsController { } private void init(){ -/* - emdnSubServ.setText(Main.SETTINGS.getEMDNSub()); - emdnOn.setSelected(Main.SETTINGS.getEMDNActive()); - emdnUpdateOnly.setSelected(Main.SETTINGS.getEMDNUpdateOnly()); - emdnUpdateTime.setValue(Main.SETTINGS.getEMDNAutoUpdate()); -*/ - Profile profile =Main.SETTINGS.getProfile(); jumps.setValue(profile.getJumps()); lands.setValue(profile.getLands()); @@ -114,6 +104,9 @@ public class SettingsController { edceActive.setSelected(Main.SETTINGS.edce().isActive()); edceInterval.setValue(Main.SETTINGS.edce().getInterval()); + emdnSubServ.setText(Main.SETTINGS.getEMDNSub()); + emdnOn.setSelected(Main.SETTINGS.getEMDNActive()); + edLogActive.setSelected(Main.SETTINGS.edlog().isActive()); edLogDir.setText(Main.SETTINGS.edlog().getLogDir()); @@ -137,17 +130,6 @@ public class SettingsController { } private void save() { -/* - Main.SETTINGS.setEMDNSub(emdnSubServ.getText()); - EMDNUpdater.setSub(emdnSubServ.getText()); - Main.SETTINGS.setEMDNActive(emdnOn.isSelected()); - EMDNUpdater.setActivate(emdnOn.isSelected()); - Main.SETTINGS.setEMDNUpdateOnly(emdnUpdateOnly.isSelected()); - EMDNUpdater.setUpdateOnly(emdnUpdateOnly.isSelected()); - Main.SETTINGS.setEMDNAutoUpdate(emdnUpdateTime.getValue().longValue()); - EMDNUpdater.setInterval(emdnUpdateTime.getValue().longValue()); -*/ - Profile profile =Main.SETTINGS.getProfile(); profile.setJumps(jumps.getValue().intValue()); profile.setLands(lands.getValue().intValue()); @@ -163,6 +145,11 @@ public class SettingsController { Main.SETTINGS.edce().setActive(edceActive.isSelected()); Main.SETTINGS.edce().setInterval(edceInterval.getValue().intValue()); + Main.SETTINGS.setEMDNSub(emdnSubServ.getText()); + EMDNUpdater.setSub(emdnSubServ.getText()); + Main.SETTINGS.setEMDNActive(emdnOn.isSelected()); + EMDNUpdater.setActivate(emdnOn.isSelected()); + if (edLogActive.isSelected()){ Main.SETTINGS.edlog().setLogDir(edLogDir.getText()); Main.SETTINGS.edlog().setActive(edLogActive.isSelected()); diff --git a/client/src/main/resources/lang/locale_en_US.properties b/client/src/main/resources/lang/locale_en_US.properties index 7b5313e..9958abe 100644 --- a/client/src/main/resources/lang/locale_en_US.properties +++ b/client/src/main/resources/lang/locale_en_US.properties @@ -179,7 +179,7 @@ router.pane.includeStations=Included stations # settings.fxml settings.title=Settings -settings.emdn=Elite Market Data Network +settings.emdn=Elite Dangerous Data Network settings.emdn.on=Active settings.emdn.sub=Server SUB: settings.emdn.updateOnly=Update price only: diff --git a/client/src/main/resources/lang/locale_ru_RU.properties b/client/src/main/resources/lang/locale_ru_RU.properties index 3b196ea..e7730d8 100644 --- a/client/src/main/resources/lang/locale_ru_RU.properties +++ b/client/src/main/resources/lang/locale_ru_RU.properties @@ -178,7 +178,7 @@ router.pane.includeStations=\u041F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u04 # settings.fxml settings.title=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B -settings.emdn=Elite Market Data Network +settings.emdn=Elite Dangerous Data Network settings.emdn.on=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C settings.emdn.sub=\u0421\u0435\u0440\u0432\u0435\u0440 SUB: settings.emdn.updateOnly=\u0422\u043E\u043B\u044C\u043A\u043E \u043E\u0431\u043D\u043E\u0432\u043B\u044F\u0442\u044C \u0446\u0435\u043D\u044B: diff --git a/client/src/main/resources/view/settings.fxml b/client/src/main/resources/view/settings.fxml index 10bea93..2ad7f63 100644 --- a/client/src/main/resources/view/settings.fxml +++ b/client/src/main/resources/view/settings.fxml @@ -9,11 +9,6 @@