Fixes

Author: fransjacobs

src/main/java/jcs/JCS.java

@@ -68,9 +68,7 @@ public class JCS extends Thread {
 
   private static UICallback uiCallback;
 
-  //private final List<RefreshEventListener> refreshEventListeners;
   private JCS() {
-    //refreshEventListeners = new ArrayList<>();
   }
 
   public static void logProgress(String message) {
@@ -237,6 +235,12 @@ public static void main(String[] args) {
       JCS jcs = JCS.getInstance();
 
       jcs.startGui();
+
+      //check the connection to the command station
+      if (!JCS.getJcsCommandStation().isConnected()) {
+        JCS.getJcsCommandStation().connectInBackground();
+      }
+
     } else {
       Logger.error("Could not obtain a Persistent store. Quitting....");
       logProgress("Error! Can't Obtain a Persistent store!");
@@ -286,8 +290,6 @@ private void startGui() {
       jcsFrame.setVisible(true);
       jcsFrame.toFront();
       jcsFrame.showOverviewPanel();
-      boolean con = "true".equalsIgnoreCase(System.getProperty("controller.autoconnect", "true"));
-      jcsFrame.connect(con);
     });
 
     JCS.logProgress("JCS started...");

src/main/java/jcs/commandStation/JCSCommandStation.java

@@ -118,29 +118,36 @@ private JCSCommandStation(boolean autoConnectController) {
     }
   }
 
-  public final boolean connectInBackground() {
-    executor.execute(() -> connect());
-
+  public final synchronized boolean connectInBackground() {
     long now = System.currentTimeMillis();
+    long start = now;
     long timemax = now + 3000;
 
+    executor.execute(() -> connect());
+
     boolean con = false;
-    synchronized (this) {
-      if (decoderController != null) {
-        con = decoderController.isConnected();
-      }
-      while (!con && timemax < now) {
-        try {
-          wait(500);
-        } catch (InterruptedException ex) {
-          Logger.trace(ex);
-        }
-        now = System.currentTimeMillis();
-      }
-      if (!(timemax < now)) {
-        Logger.trace("Timeout connecting...");
+    if (decoderController != null) {
+      con = decoderController.isConnected();
+    } else {
+      Logger.trace("Can't connect as there is no DecoderController configured !");
+    }
+
+    while (!con && now < timemax) {
+      try {
+        wait(500);
+      } catch (InterruptedException ex) {
+        Logger.trace(ex);
       }
+      now = System.currentTimeMillis();
+      con = decoderController.isConnected();
     }
+
+    if (con) {
+      Logger.trace("Connected to " + decoderController.getCommandStationBean().getDescription() + " in " + (now - start) + " ms");
+    } else {
+      Logger.trace("Timeout connecting...");
+    }
+
     return con;
   }
 

src/main/java/jcs/entities/LocomotiveBean.java

@@ -54,6 +54,11 @@ public class LocomotiveBean implements Serializable {
   private String dispatcherDirection;
   private String locomotiveDirection;
 
+  private Integer speedOne;
+  private Integer speedTwo;
+  private Integer speedThree;
+  private Integer speedFour;
+
   private Image locIcon;
   private CommandStationBean commandStationBean;
 
@@ -321,6 +326,42 @@ public void setCommandStationId(String commandStationId) {
     this.commandStationId = commandStationId;
   }
 
+  @Column(name = "speed_1")
+  public Integer getSpeedOne() {
+    return speedOne;
+  }
+
+  public void setSpeedOne(Integer speedOne) {
+    this.speedOne = speedOne;
+  }
+
+  @Column(name = "speed_2")
+  public Integer getSpeedTwo() {
+    return speedTwo;
+  }
+
+  public void setSpeedTwo(Integer speedTwo) {
+    this.speedTwo = speedTwo;
+  }
+
+  @Column(name = "speed_3")
+  public Integer getSpeedThree() {
+    return speedThree;
+  }
+
+  public void setSpeedThree(Integer speedThree) {
+    this.speedThree = speedThree;
+  }
+
+  @Column(name = "speed_4")
+  public Integer getSpeedFour() {
+    return speedFour;
+  }
+
+  public void setSpeedFour(Integer speedFour) {
+    this.speedFour = speedFour;
+  }
+
   @Transient
   public CommandStationBean getCommandStationBean() {
     return commandStationBean;

src/main/java/jcs/ui/JCSFrame.java

@@ -220,10 +220,8 @@ private void showLocomotives() {
       locomotiveDialog.setLocationRelativeTo(null);
     }
     locomotiveDialog.setVisible(true);
-    
+
     //Should add a listener here?
-    
-    
   }
 
   private void showAccessories() {
@@ -1147,7 +1145,7 @@ private void startAllLocomotives() {
   private String getTitleString() {
     String jcsVersion = VersionInfo.getVersion();
 
-    if (JCS.getJcsCommandStation() != null && JCS.getJcsCommandStation().getCommandStationInfo() != null) {
+    if (JCS.getJcsCommandStation() != null && JCS.getJcsCommandStation().getCommandStationInfo() != null && JCS.getJcsCommandStation().getCommandStationInfo().getProductName() != null) {
       InfoBean info = JCS.getJcsCommandStation().getCommandStationInfo();
       return "JCS " + "Connected to " + info.getProductName();
     } else {
@@ -1210,11 +1208,11 @@ public void powerChanged(PowerEvent event) {
   public void refreshData() {
     Logger.trace("Refresh data due to settings change...");
   }
-  
+
   public void refreshLocomotives() {
     this.dispatcherStatusPanel.refresh();
   }
-  
+
 
   // Variables declaration - do not modify//GEN-BEGIN:variables
   private JMenuItem aboutMI;