Remove unused variable

JMRI · Apr 2, 2019 · 723aacd · 723aacd
1 parent 506bb94
commit 723aacd
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 30 deletions.
diff --git a/java/src/jmri/jmrit/logix/Engineer.java b/java/src/jmri/jmrit/logix/Engineer.java
@@ -989,11 +989,24 @@ private void runWarrant(ThrottleSetting ts) {
         java.awt.Color color = java.awt.Color.red;
 
         if (msg == null) {
-            cmdBlockIdx = 0;    // reset block command number  
-            Thread checker = new checkForTermination(_warrant, warrant, num);
-            checker.start();
-            if (log.isDebugEnabled()) log.debug("Exit runWarrant");
-            return;
+            if (_warrant.getSpeedUtil().getDccAddress().equals(warrant.getSpeedUtil().getDccAddress())) {
+                cmdBlockIdx = 0;    // reset block command number  
+                Thread checker = new checkForTermination(_warrant, warrant, num);
+                checker.start();
+                if (log.isDebugEnabled()) log.debug("Exit runWarrant");
+                return;
+            } else {
+                msg = WarrantTableFrame.getDefault().runTrain(warrant, Warrant.MODE_RUN);
+                if (msg != null) {
+                    msg = Bundle.getMessage("CannotRun", warrant.getDisplayName(), msg);
+                } else {
+                    msg = Bundle.getMessage("linkedLaunch",
+                            warrant.getDisplayName(), _warrant.getDisplayName(),
+                            warrant.getfirstOrder().getBlock().getDisplayName(),
+                            _warrant.getfirstOrder().getBlock().getDisplayName());
+                    color = WarrantTableModel.myGreen;
+               }
+            }
         } else {
             msg = Bundle.getMessage("CannotRun", warrant.getDisplayName(), msg);
         }
@@ -1046,35 +1059,22 @@ public void run() {
             if (log.isDebugEnabled()) log.debug("checkForTermination waited {}ms. runMode={} ", time, oldWarrant.getRunMode());
 
             java.awt.Color color = java.awt.Color.red;
-            if (oldWarrant.getSpeedUtil().getDccAddress().equals(newWarrant.getSpeedUtil().getDccAddress())) {
-                msg = newWarrant.setRoute(false, null);
-                if (msg == null) {
-                    msg = newWarrant.setRunMode(Warrant.MODE_RUN, null, null, null, false);
-                }
-                if (msg != null) {
-                    msg = Bundle.getMessage("CannotRun", newWarrant.getDisplayName(), msg);
-                } else {
-                    if (oldWarrant.equals(newWarrant)) {
-                        msg = Bundle.getMessage("reLaunch", oldWarrant.getDisplayName(), (num<0 ? "unlimited" : num));
-                    } else {
-                        msg = Bundle.getMessage("linkedLaunch",
-                                newWarrant.getDisplayName(), oldWarrant.getDisplayName(),
-                                newWarrant.getfirstOrder().getBlock().getDisplayName(),
-                                endBlock.getDisplayName());
-                    }
-                    color = WarrantTableModel.myGreen;
-                }
+            msg = newWarrant.setRoute(false, null);
+            if (msg == null) {
+                msg = newWarrant.setRunMode(Warrant.MODE_RUN, null, null, null, false);
+            }
+            if (msg != null) {
+                msg = Bundle.getMessage("CannotRun", newWarrant.getDisplayName(), msg);
             } else {
-                msg = WarrantTableFrame.getDefault().runTrain(newWarrant, Warrant.MODE_RUN);
-                if (msg != null) {
-                    msg = Bundle.getMessage("CannotRun", newWarrant.getDisplayName(), msg);
+                if (oldWarrant.equals(newWarrant)) {
+                    msg = Bundle.getMessage("reLaunch", oldWarrant.getDisplayName(), (num<0 ? "unlimited" : num));
                 } else {
                     msg = Bundle.getMessage("linkedLaunch",
                             newWarrant.getDisplayName(), oldWarrant.getDisplayName(),
                             newWarrant.getfirstOrder().getBlock().getDisplayName(),
-                            oldWarrant.getfirstOrder().getBlock().getDisplayName());
-                    color = WarrantTableModel.myGreen;
-               }
+                            endBlock.getDisplayName());
+                }
+                color = WarrantTableModel.myGreen;
             }
             String m = msg;
             java.awt.Color c = color;

diff --git a/java/test/jmri/jmrit/logix/LinkedWarrantTest.java b/java/test/jmri/jmrit/logix/LinkedWarrantTest.java
@@ -80,7 +80,6 @@ public void testLoopedWarrant() throws Exception {
        // OBlock of route
         String[] route = {"OB12", "OB1", "OB3", "OB5", "OB6", "OB7", "OB9", "OB11", "OB12"};
         OBlock block = _OBlockMgr.getOBlock("OB12");
-        OBlock westBlk = _OBlockMgr.getOBlock("West");
 
         // Run the train, then checks end location
         Assert.assertEquals("LoopDeLoop after first leg", block.getSensor().getDisplayName(), NXFrameTest.runtimes(route, _OBlockMgr).getDisplayName());