Locomotives are now refreshed in the main screen when added via locomotives dialog

Author: fransjacobs

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

@@ -122,11 +122,13 @@ public final boolean connectInBackground() {
     executor.execute(() -> connect());
 
     long now = System.currentTimeMillis();
-    long timemax = now + 2000;
+    long timemax = now + 3000;
 
-    boolean con;
+    boolean con = false;
     synchronized (this) {
-      con = decoderController.isConnected();
+      if (decoderController != null) {
+        con = decoderController.isConnected();
+      }
       while (!con && timemax < now) {
         try {
           wait(500);

src/main/java/jcs/entities/SensorBean.java

@@ -371,18 +371,11 @@ public boolean equalsId(Object obj) {
 
   @Override
   public String toString() {
-    //return name;
-    return toLogString();
+    return name;
+    //return toLogString();
   }
 
   public String toLogString() {
-//    String ids;
-//    if (id == null) {
-//      ids = "(" + generateId() + ")";
-//    } else {
-//      ids = id;
-//    }
-
     return "SensorBean{"
             + "id="
             + id

src/main/java/jcs/persistence/H2PersistenceService.java

@@ -251,7 +251,7 @@ public FunctionBean getLocomotiveFunction(LocomotiveBean locomotive, Integer num
 
   @Override
   public FunctionBean getLocomotiveFunction(Long locomotiveId, Integer number) {
-    String commandStationId = getDefaultCommandStation().getId();
+    //String commandStationId = getDefaultCommandStation().getId();
 
     FunctionBean fb = database.where("locomotive_id=? and f_number=?", locomotiveId, number).first(FunctionBean.class);
     if (fb != null) {
@@ -970,15 +970,15 @@ public synchronized BlockBean persist(BlockBean block) {
       database.insert(block);
     }
 
-    changeSupport.firePropertyChange("data.blockr", prev, block);
+    changeSupport.firePropertyChange("data.block", prev, block);
     return block;
   }
 
   @Override
   public synchronized void remove(BlockBean block) {
-    int rows = this.database.delete(block).getRowsAffected();
+    int rows = database.delete(block).getRowsAffected();
     Logger.trace(rows + " rows deleted");
-    changeSupport.firePropertyChange("data.sblock.deleted", block, null);
+    changeSupport.firePropertyChange("data.block.deleted", block, null);
   }
 
   @Override
@@ -990,7 +990,6 @@ public synchronized void removeAllBlocks() {
 
   @Override
   public List<CommandStationBean> getCommandStations() {
-    //List<CommandStationBean> commandStationBeans = database.where("enabled=true").results(CommandStationBean.class);
     List<CommandStationBean> commandStationBeans = database.results(CommandStationBean.class);
     return commandStationBeans;
   }

src/main/java/jcs/ui/DispatcherStatusPanel.java

@@ -17,13 +17,12 @@
 
 import javax.swing.JPanel;
 import jcs.commandStation.events.RefreshEvent;
-import jcs.commandStation.events.RefreshEventListener;
 import jcs.ui.util.LocomotiveSelectionChangedListener;
 
 /**
  *
  */
-public class DispatcherStatusPanel extends JPanel implements RefreshEventListener {
+public class DispatcherStatusPanel extends JPanel { //implements RefreshEventListener {
 
   private static final long serialVersionUID = 6158244271104499799L;
 
@@ -43,15 +42,14 @@ public void refresh() {
     locomotiveTablePanel.refresh();
   }
 
-  @Override
-  public void onChange(RefreshEvent event) {
-    locomotiveTablePanel.onChange(event);
-  }
+//  @Override
+//  public void onChange(RefreshEvent event) {
+//    locomotiveTablePanel.onChange(event);
+//  }
 
   public void addLocomotiveSelectionChangeListener(LocomotiveSelectionChangedListener listener) {
     locomotiveTablePanel.addLocomotiveSelectionChangeListener(listener);
     dispatcherTablePanel.addLocomotiveSelectionChangeListener(listener);
-
   }
 
   public void removeLocomotiveSelectionChangeListener(LocomotiveSelectionChangedListener listener) {

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

@@ -220,6 +220,10 @@ private void showLocomotives() {
       locomotiveDialog.setLocationRelativeTo(null);
     }
     locomotiveDialog.setVisible(true);
+    
+    //Should add a listener here?
+    
+    
   }
 
   private void showAccessories() {
@@ -969,20 +973,16 @@ public void connect(boolean connect) {
     if (JCS.getJcsCommandStation() != null) {
       if (connect) {
         String ip = JCS.getJcsCommandStation().getCommandStationBean().getIpAddress();
+        String name = JCS.getJcsCommandStation().getCommandStationBean().getDescription();
         if (Ping.IsReachable(ip)) {
           if ("AWT-EventQueue-0".equals(Thread.currentThread().getName())) {
             JCS.getJcsCommandStation().connectInBackground();
           } else {
-
             JCS.getJcsCommandStation().connect();
           }
         } else {
           Logger.debug("Can't reach ip " + ip + "...");
-          
-          
-                JOptionPane.showMessageDialog(this, "Can't connect. "+ip+" is not reachable.", "Can't Connect", JOptionPane.ERROR_MESSAGE, null);
-
-          
+          JOptionPane.showMessageDialog(this, "Can't connect to " + name + ", " + ip + " is not reachable.", "Can't Connect", JOptionPane.ERROR_MESSAGE, null);
         }
 
         InfoBean info = JCS.getJcsCommandStation().getCommandStationInfo();
@@ -1207,6 +1207,14 @@ public void powerChanged(PowerEvent event) {
     powerButton.setSelected(event.isPower());
   }
 
+  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;

src/main/java/jcs/ui/KeyboardSensorPanel.java

@@ -24,7 +24,6 @@
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JFrame;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;

src/main/java/jcs/ui/VNCPanel.java

@@ -53,18 +53,20 @@
  * In hind site I think is a welcome addition, hance this is added into the main frame
  *
  */
-public class VNCPanel extends javax.swing.JPanel {
-  
+public class VNCPanel extends JPanel {
+
+  private static final long serialVersionUID = -2967801064769591519L;
+
   private Image lastFrame;
   private VernacularConfig config;
   private VernacularClient client;
   private static final int DEFAULT_VNC_PORT = 5900;
-  
+
   public VNCPanel() {
     initComponents();
     initVnc();
   }
-  
+
   private void initVnc() {
     try {
       if (JCS.getJcsCommandStation() != null) {
@@ -75,22 +77,23 @@ private void initVnc() {
           if (JCS.getJcsCommandStation().isConnected()) {
             String ip = JCS.getJcsCommandStation().getCommandStationInfo().getIpAddress();
             int port = DEFAULT_VNC_PORT;
-            
-            if(Ping.IsReachable(ip)) {
+
+            if (Ping.IsReachable(ip)) {
               connect(ip, port);
             } else {
-              Logger.trace("Can't reach "+ip+" ...");
-            }  
+              Logger.trace("Can't reach " + ip + " ...");
+            }
           }
         }
       }
     } catch (Exception e) {
       Logger.warn("Error during init " + e.getMessage());
     }
   }
-  
+
   private void addDrawingSurface() {
     this.viewerPanel.add(new JPanel() {
+      private static final long serialVersionUID = -1852494391952623917L;
       @Override
       public void paintComponent(Graphics g) {
         super.paintComponent(g);
@@ -112,7 +115,7 @@ public void paintComponent(Graphics g) {
       }
     }, CENTER);
   }
-  
+
   private void initialiseVernacularClient() {
     config = new VernacularConfig();
     config.setColorDepth(BPP_24_TRUE);
@@ -128,27 +131,27 @@ private void initialiseVernacularClient() {
     config.setRemoteClipboardListener(t -> getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(t), null));
     //config.setUseLocalMousePointer(localCursorMenuItem.isSelected());
     config.setUseLocalMousePointer(true);
-    
+
     config.setEnableCopyrectEncoding(true);
     config.setEnableRreEncoding(true);
     config.setEnableHextileEncoding(true);
     config.setEnableZLibEncoding(false);
-    
+
     client = new VernacularClient(config);
   }
-  
+
   private boolean resizeRequired(Image frame) {
     return lastFrame == null || lastFrame.getWidth(null) != frame.getWidth(null) || lastFrame.getHeight(null) != frame.getHeight(null);
   }
-  
+
   private void renderFrame(Image frame) {
     if (resizeRequired(frame)) {
       resizeWindow(frame);
     }
     lastFrame = frame;
     repaint();
   }
-  
+
   private void resizeWindow(Image frame) {
     int remoteWidth = frame.getWidth(null);
     int remoteHeight = frame.getHeight(null);
@@ -160,7 +163,7 @@ private void resizeWindow(Image frame) {
     int paddingTop = getHeight() - this.viewerPanel.getHeight();
     int paddingSides = getWidth() - this.viewerPanel.getWidth();
     int maxWidth = (int) screenSize.getWidth() - paddingSides;
-    
+
     int maxHeight = (int) screenSize.getHeight() - paddingTop;
     if (remoteWidth <= maxWidth && remoteHeight < maxHeight) {
       setWindowSize(remoteWidth, remoteHeight);
@@ -171,40 +174,40 @@ private void resizeWindow(Image frame) {
       setWindowSize(scaledWidth, scaledHeight);
     }
   }
-  
+
   private void setWindowSize(int width, int height) {
     this.viewerPanel.setPreferredSize(new Dimension(width, height));
   }
-  
+
   private void resetUI() {
     setCursor(getDefaultCursor());
     lastFrame = null;
     repaint();
   }
-  
+
   private boolean connected() {
     return client != null && client.isRunning();
   }
-  
+
   private void connect(String host, int port) {
     lastFrame = null;
     client.start(host, port);
   }
-  
+
   private void disconnect() {
     if (connected()) {
       client.stop();
     }
     resetUI();
   }
-  
+
   private int scaleMouseX(int x) {
     if (lastFrame == null) {
       return x;
     }
     return (int) (x * ((double) lastFrame.getWidth(null) / this.viewerPanel.getWidth()));
   }
-  
+
   private int scaleMouseY(int y) {
     if (lastFrame == null) {
       return y;
@@ -375,19 +378,19 @@ public static void main(String args[]) {
     } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex) {
       Logger.error("Can't set the LookAndFeel: " + ex);
     }
-    
+
     java.awt.EventQueue.invokeLater(() -> {
       VNCPanel vncPanel = new VNCPanel();
       JFrame testFrame = new JFrame("VNCPanel Tester");
-      
+
       URL iconUrl = KeyboardSensorPanel.class.getResource("/media/jcs-train-64.png");
       if (iconUrl != null) {
         testFrame.setIconImage(new ImageIcon(iconUrl).getImage());
       }
-      
+
       JFrame.setDefaultLookAndFeelDecorated(true);
       testFrame.add(vncPanel);
-      
+
       testFrame.addWindowListener(new java.awt.event.WindowAdapter() {
         @Override
         public void windowClosing(java.awt.event.WindowEvent e) {
@@ -402,5 +405,5 @@ public void windowClosing(java.awt.event.WindowEvent e) {
       testFrame.setVisible(true);
     });
   }
-  
+
 }

src/main/java/jcs/ui/panel/DispatcherTablePanel.java

@@ -93,6 +93,10 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
     }
   }
 
+  public void refresh() {
+    locomotiveDispatcherTableModel.refresh();
+  }
+
   /**
    * This method is called from within the constructor to initialize the form. WARNING: Do NOT modify this code. The content of this method is always regenerated by the Form Editor.
    */