Fix the appearance of the tiles

Author: fransjacobs

src/main/java/jcs/ui/layout/LayoutCanvas.java

@@ -108,6 +108,8 @@ public enum Mode {
 
   private RoutesDialog routesDialog;
 
+  private boolean showCenter;
+
   public LayoutCanvas() {
     this(false);
   }
@@ -118,9 +120,11 @@ public LayoutCanvas(boolean readonly) {
     setOpaque(true);
     setDoubleBuffered(true);
 
+    showCenter = "true".equalsIgnoreCase(System.getProperty("tile.show.center", "false"));
+
     this.readonly = readonly;
     drawGrid = !readonly;
-    this.executor = Executors.newSingleThreadExecutor();
+    this.executor = Executors.newCachedThreadPool();
 
     this.mode = Mode.SELECT;
     this.orientation = Orientation.EAST;
@@ -151,7 +155,7 @@ public void paint(Graphics g) {
           paintDotGrid(g);
         //default -> no grid
       }
-   }
+    }
 
     //long now = System.currentTimeMillis();
     //Logger.trace("Duration: " + (now - started) + " ms.");
@@ -232,23 +236,16 @@ void setDirection(Direction direction) {
   }
 
   void loadLayoutInBackground() {
-    this.executor.execute(() -> loadTiles());
-
-//    new Thread(new Runnable() {
-//      public void run() {
-//        final String text = readHugeFile();
-//        SwingUtilities.invokeLater(new Runnable() {
-//          public void run() {
-//            canvas.setTiles();
-//          }
-//        });
-//      }
-//    }).start();
-  }
+    executor.execute(() -> {
+      List<Tile> tiles = TileCache.loadTiles(readonly);
 
-  private void loadTiles() {
-    List<Tile> tiles = TileCache.loadTiles(readonly);
+      java.awt.EventQueue.invokeLater(() -> {
+        loadTiles(tiles);
+      });
+    });
+  }
 
+  private void loadTiles(List<Tile> tiles) {
     removeAll();
     selectedTile = null;
 
@@ -276,15 +273,14 @@ private void loadTiles() {
 
     for (Tile tile : tiles) {
       add(tile);
-      boolean showCenter = "true".equalsIgnoreCase(System.getProperty("tile.show.center", "false"));
       if (showCenter) {
         tile.setDrawCenterPoint(showCenter);
       }
     }
   }
 
   private void mouseMoveAction(MouseEvent evt) {
-    Point sp = LayoutUtil.snapToGrid(evt.getPoint());
+    //Point sp = LayoutUtil.snapToGrid(evt.getPoint());
     if (selectedTile != null) {
       setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
     } else {
@@ -343,10 +339,10 @@ private void mousePressedAction(MouseEvent evt) {
         }
       }
       case DELETE -> {
-        Tile toBeDeleted = (Tile) getComponentAt(snapPoint);
-        if (toBeDeleted != null) {
+        Component c = getComponentAt(snapPoint);
+        if (c != null && c instanceof Tile) {
+          Tile toBeDeleted = (Tile) c;
           removeTile(toBeDeleted);
-          //selectedTiles.clear();
           repaint(toBeDeleted.getTileBounds());
           selectedTile = null;
         }
@@ -478,7 +474,7 @@ private void executeControlActionForTile(Tile tile, Point p) {
         bcd.setVisible(true);
 
         Logger.trace("Block properties closed");
-        this.repaint(block.getTileBounds());
+        repaint(block.getTileBounds());
       }
       case SIGNAL -> {
         //this.executor.execute(() -> toggleSignal((Signal) tile));
@@ -547,6 +543,7 @@ private void editSelectedTileProperties() {
         default -> {
         }
       }
+      //TODO: only repaint the edited tile?
       repaint();
     }
   }
@@ -996,8 +993,9 @@ private void resetDispatcherMIActionPerformed(ActionEvent evt) {//GEN-FIRST:even
       Block block = (Block) selectedTile;
       LocomotiveBean locomotive = block.getBlockBean().getLocomotive();
 
-      this.executor.execute(() -> {
+      executor.execute(() -> {
         AutoPilot.resetDispatcher(locomotive);
+
         repaint();
       });
     }

src/main/java/jcs/ui/settings/CommandStationPanel.java

@@ -87,6 +87,8 @@
  * @author frans
  */
 public class CommandStationPanel extends JPanel implements TreeSelectionListener {
+
+  private static final long serialVersionUID = -6257688549267578845L;
 
   private ComboBoxModel<CommandStationBean> commandStationCBM;
   private ComboBoxModel<CommandStationBean> feedbackCBM;
@@ -809,6 +811,7 @@ private void createNodes(DefaultMutableTreeNode root) {
 
   }
 
+  //TODO
   public void valueChanged(TreeSelectionEvent e) {
     DefaultMutableTreeNode node = (DefaultMutableTreeNode) devicesTree.getLastSelectedPathComponent();