Fix tile placement added tests

Author: fransjacobs

src/main/java/jcs/commandStation/autopilot/AutoPilot.java

@@ -369,6 +369,16 @@ public static List<LocomotiveBean> getOnTrackLocomotives() {
     return new ArrayList<>(activeLocomotives);
   }
 
+  public static boolean isGostDetected() {
+    List<BlockBean> blocks = PersistenceFactory.getService().getBlocks();
+    for (BlockBean bb : blocks) {
+      if (BlockBean.BlockState.GHOST == bb.getBlockState()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private static void handleGhost(SensorEvent event) {
     Logger.warn("Ghost Detected! @ Sensor " + event.getId());
     //Switch power OFF!
@@ -552,7 +562,7 @@ public void run() {
         now = System.currentTimeMillis();
       }
 
-      Logger.trace((dispatchersRunning ? "Not " : "") + "All dispatchers stopped in " + ((now - start) / 1000) + " s. There are "+getRunningDispatcherCount()+" Still running...");
+      Logger.trace((dispatchersRunning ? "Not " : "") + "All dispatchers stopped in " + ((now - start) / 1000) + " s. There are " + getRunningDispatcherCount() + " Still running...");
 
       if (dispatchersRunning) {
         for (Dispatcher ld : dispatchers.values()) {

src/main/java/jcs/commandStation/autopilot/state/StateMachineThread.java

@@ -17,7 +17,6 @@
 
 import jcs.JCS;
 import jcs.commandStation.autopilot.AutoPilot;
-import jcs.commandStation.events.SensorEvent;
 import jcs.commandStation.events.SensorEventListener;
 import jcs.entities.BlockBean;
 import jcs.entities.LocomotiveBean;

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

@@ -36,6 +36,7 @@
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import jcs.JCS;
+import jcs.commandStation.autopilot.AutoPilot;
 import jcs.commandStation.events.DisconnectionEvent;
 import jcs.commandStation.events.DisconnectionEventListener;
 import jcs.commandStation.events.PowerEvent;
@@ -97,7 +98,6 @@ private void initJCS() {
 
       //Initialize the Touchbar for MacOS
       if (RunUtil.isMacOSX()) {
-        //JCS.showTouchbar(this);
         this.setTitle("");
       }
 
@@ -179,9 +179,11 @@ public void showSettings() {
   }
 
   public void showDesignLayoutPanel() {
-    CardLayout card = (CardLayout) this.centerPanel.getLayout();
-    card.show(this.centerPanel, "designPanel");
-    this.layoutPanel.loadLayout();
+    if (!AutoPilot.isAutoModeActive()) {
+      CardLayout card = (CardLayout) this.centerPanel.getLayout();
+      card.show(this.centerPanel, "designPanel");
+      this.layoutPanel.loadLayout();
+    }
   }
 
   public void stop() {

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

@@ -453,11 +453,14 @@ private void mousePressedAction(MouseEvent evt) {
         if (MouseEvent.BUTTON1 == evt.getButton() && tile == null) {
           //Only add a new tile when there is no tile on the selected snapPoint
           Logger.trace("Adding a new tile: " + tileType + " @ (" + snapPoint.x + ", " + snapPoint.y + ")");
+
           Tile addedTile = addTile(snapPoint);
-          selectedTiles.addAll(addedTile.getAllPoints());
+          if (addedTile != null) {
+            selectedTiles.addAll(addedTile.getAllPoints());
 
-          if ("false".equals(System.getProperty("batch.tile.persist", "true"))) {
-            this.saveTile(tile);
+            if ("false".equals(System.getProperty("batch.tile.persist", "true"))) {
+              this.saveTile(tile);
+            }
           }
         } else {
           if (tile != null) {
@@ -882,26 +885,47 @@ private Tile addTile(Point p) {
 
     Tile tile = TileFactory.createTile(tileType, orientation, direction, chkp, drawGrid);
 
-    tiles.put(chkp, tile);
-    //Alternative point(s) to be able to find all points
+    //Can the tile be placed, keeping in mind the extra points
+    boolean canBeAdded = true;
     if (!tile.getAltPoints().isEmpty()) {
-      Set<Point> alt = tile.getAltPoints();
-      for (Point ap : alt) {
-        this.altTiles.put(ap, tile);
+      //Check if the extra point positions are not occupied
+      Set<Point> tilePoints = tile.getAllPoints();
+
+      for (Point tp : tilePoints) {
+        if (tiles.containsKey(tp) || altTiles.containsKey(tp)) {
+          Logger.trace("Point " + p + " occupied by " + findTile(p).getId() + " Can't add new Tile: " + tile);
+          canBeAdded = false;
+        }
       }
     }
 
-    if ("false".equals(System.getProperty("batch.tile.persist", "true"))) {
-      this.saveTile(tile);
-    }
+    if (canBeAdded) {
+      tiles.put(chkp, tile);
+      //Alternative point(s) to be able to find all points
+      if (!tile.getAltPoints().isEmpty()) {
+        Set<Point> alt = tile.getAltPoints();
+        for (Point ap : alt) {
+          this.altTiles.put(ap, tile);
+        }
+      }
 
-    Logger.trace("Added Tile " + tile.getClass().getSimpleName() + " " + tile.getOrientation() + " @ " + tile.getCenter() + " Full repaint: " + fullRepaint);
-    Logger.trace("Added " + tile + " There are now " + this.tiles.size() + " tiles...");
+      if ("false".equals(System.getProperty("batch.tile.persist", "true"))) {
+        this.saveTile(tile);
+      }
+
+      Logger.trace("Added Tile " + tile.getClass().getSimpleName() + " " + tile.getOrientation() + " @ " + tile.getCenter() + " Full repaint: " + fullRepaint);
+      Logger.trace("Added " + tile + " There are now " + this.tiles.size() + " tiles...");
+    }
 
     if (fullRepaint) {
       this.repaint();
     }
-    return tile;
+
+    if (canBeAdded) {
+      return tile;
+    } else {
+      return null;
+    }
   }
 
   void removeTiles() {