Add check for DCC address used in more than one running warrant

JMRI · Mar 26, 2019 · bd44c0a · bd44c0a
1 parent 6304ec7
commit bd44c0a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/java/src/jmri/jmrit/logix/Warrant.java b/java/src/jmri/jmrit/logix/Warrant.java
@@ -432,7 +432,7 @@ public void setRunBlind(boolean runBlind) {
      */
     @jmri.InvokeOnLayoutThread
     protected void fireRunStatus(String property, Object old, Object status) {
-//        jmri.util.ThreadingUtil.runOnLayout(() -> {   Will hang GUI!
+//        jmri.util.ThreadingUtil.runOnLayout(() -> {   // Will hang GUI!
         ThreadingUtil.runOnLayoutEventually(() -> { // OK but can be quite late in reporting speed changes
             firePropertyChange(property, old, status);
         });
@@ -967,9 +967,8 @@ public boolean controlRunTrain(int idx) {
                     }
                     break;
                 case DEBUG:
-                    if (log.isDebugEnabled()) {
-                        debugInfo();
-                    }
+                    ret = debugInfo();
+                    fireRunStatus("SpeedChange", null, idx);
                     break;
                 default:
             }
@@ -1067,7 +1066,8 @@ idx, CNTRL_CMDS[idx], getTrainName(), RUN_STATE[runState],
                     break;
                 case DEBUG:
                     ret = debugInfo();
-                    break;
+                    fireRunStatus("SpeedChange", null, idx);
+                    return ret;
                 default:
             }
         }

diff --git a/java/src/jmri/jmrit/logix/WarrantTableFrame.java b/java/src/jmri/jmrit/logix/WarrantTableFrame.java
@@ -33,6 +33,8 @@
 import javax.swing.JTextField;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
+
+import jmri.DccLocoAddress;
 import jmri.InstanceManager;
 import jmri.util.swing.XTableColumnModel;
 import jmri.util.table.ButtonEditor;
@@ -451,7 +453,6 @@ public Component getTableCellEditorComponent(JTable table, Object value,
         }
     }
 
-
     /**
      * Return error message if warrant cannot be run.
      *
@@ -460,12 +461,16 @@ public Component getTableCellEditorComponent(JTable table, Object value,
      * @return null if warrant is started
      */
     public String runTrain(Warrant w, int mode) {
+        w.deAllocate();
         String msg = null;
         if (w.getRunMode() != Warrant.MODE_NONE) {
             msg = w.getRunModeMessage();
         }
         if (msg == null) {
-            w.deAllocate();
+            msg = _model.checkAddressInUse(w);
+        }
+
+        if (msg == null) {
             msg = w.setRoute(false, null);
             if (msg == null) {
                 msg = w.setRunMode(mode, null, null, null, w.getRunBlind());

diff --git a/java/src/jmri/jmrit/logix/WarrantTableModel.java b/java/src/jmri/jmrit/logix/WarrantTableModel.java
@@ -359,8 +359,9 @@ public int getPreferredWidth(int col) {
 
     @Override
     public Object getValueAt(int row, int col) {
-        // if (log.isDebugEnabled())
-        // log.debug("getValueAt: row= "+row+", column= "+col);
+//        if (log.isTraceEnabled()) {
+//            log.debug("getValueAt: row= "+row+", column= "+col);
+//        }
         Warrant w = getWarrantAt(row);
         // some error checking
         if (w == null) {
@@ -442,7 +443,7 @@ public Object getValueAt(int row, int col) {
                     "off");
         case CONTROL_COLUMN:
             String msg = w.getRunningMessage();
-            log.debug("getValueAt: warrant= {}, getRunningMessage= \"{}\"", w.getDisplayName(), msg);
+//            log.debug("getValueAt: warrant= {}, getRunningMessage= \"{}\"", w.getDisplayName(), msg);
             return msg;
         case EDIT_COLUMN:
             return Bundle.getMessage("ButtonEdit");
@@ -457,7 +458,7 @@ public Object getValueAt(int row, int col) {
 
     @Override
     public void setValueAt(Object value, int row, int col) {
-//        if (log.isDebugEnabled())
+//        if (log.isTraceEnabled())
 //            log.debug("setValueAt: row= " + row + ", column= " + col
 //                    + ", value= " + (value==null ? value : (value.toString()==null ? value.getClass().getName() :value.toString())));
         Warrant w = getWarrantAt(row);
@@ -539,7 +540,7 @@ public void setValueAt(Object value, int row, int col) {
             // a warrant change. fireTableRows then causes getValueAt() which
             // calls getRunningMessage()
             int mode = w.getRunMode();
-            if (log.isDebugEnabled()) {
+            if (log.isTraceEnabled()) {
                 log.debug("setValueAt({}) for warrant {}", value, w.getDisplayName());
             }
             if (mode == Warrant.MODE_LEARN) {
@@ -560,7 +561,7 @@ public void setValueAt(Object value, int row, int col) {
                         s = Warrant.ABORT;
                     } else if (setting.equals(WarrantTableFrame.ramp)) {
                         s = Warrant.RAMP_HALT;
-                    } else if (setting.equals("Debug")) {
+                    } else /*if (setting.equals("Debug"))*/ {
                         s = Warrant.DEBUG;
                     }
                     w.controlRunTrain(s);
@@ -636,7 +637,7 @@ public void propertyChange(java.beans.PropertyChangeEvent e) {
         } else if (e.getSource() instanceof Warrant) {
             // a value changed. Find it, to avoid complete redraw
             Warrant bean = (Warrant) e.getSource();
-//            log.debug("source is warrant "+bean.getDisplayName());
+            log.debug("source is warrant "+bean.getDisplayName());
             for (int i = 0; i < _warList.size(); i++) {
                 if (bean.equals(_warList.get(i))) {