add EDDN settings

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);
     }

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());

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:

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:

client/src/main/resources/view/settings.fxml

@@ -9,11 +9,6 @@
             <ColumnConstraints minWidth="260"  maxWidth="260"/>
         </columnConstraints>
 <!--
-        <Label text="%settings.emdn" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"/>
-        <Label text="%settings.emdn.on" GridPane.rowIndex="1"/>
-        <CheckBox fx:id="emdnOn" GridPane.columnIndex="1" GridPane.rowIndex="1" disable="true"/>
-        <Label text="%settings.emdn.sub" GridPane.rowIndex="2" />
-        <TextField fx:id="emdnSubServ" GridPane.columnIndex="1" GridPane.rowIndex="2" />
         <Label text="%settings.emdn.updateOnly" GridPane.rowIndex="3" />
         <CheckBox fx:id="emdnUpdateOnly" GridPane.columnIndex="1" GridPane.rowIndex="3" />
         <Label text="%settings.emdn.auto" GridPane.rowIndex="4" />
@@ -58,6 +53,11 @@
         <Button minWidth="30" minHeight="25" onAction="#selectLogDir"><graphic><Glyph text="FontAwesome|FOLDER_OPEN"/></graphic></Button>
 
     </HBox>
+    <Label text="%settings.emdn" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2" GridPane.rowIndex="20"/>
+    <Label text="%settings.emdn.on" GridPane.rowIndex="21"/>
+    <CheckBox fx:id="emdnOn" GridPane.columnIndex="1" GridPane.rowIndex="21"/>
+    <Label text="%settings.emdn.sub" GridPane.rowIndex="22" />
+    <TextField fx:id="emdnSubServ" GridPane.columnIndex="1" GridPane.rowIndex="22" />
 
 </GridPane>
 

utils/src/main/java/ru/trader/emdn/EMDN.java

@@ -29,6 +29,7 @@ public class EMDN {
 
     public void start(){
         if (isActive()) return;
+        LOG.info("Start EMDN client");
         if (executor == null) {
             executor = Executors.newSingleThreadExecutor();
         }