Minor help improvement

JMRI · Oct 11, 2019 · 39af7a7 · 39af7a7
1 parent 46cb8eb
commit 39af7a7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/help/en/package/jmri/jmrit/operations/Operations.shtml b/help/en/package/jmri/jmrit/operations/Operations.shtml
@@ -3301,7 +3301,7 @@
     feature for all cars of a given type. Since the car's road and number isn't displayed on the
     Manifests and switch list, any car of that type can be placed into a train. Later if you try and
     find a car by its road number, it could very well have been shipped out on an earlier train. So
-    you have to decide, use road numbers or or not for a given type of car.</p>
+    you have to decide, use road numbers or not for a given type of car.</p>
 
    <h4>Location and Track</h4>
    <p>Now set the car's location on the layout. If the car is off the layout, set the location
@@ -4127,6 +4127,12 @@
    locomotives and cars on the railroad. Note that you can only reset a train that hasn't been
    moved.
 
+   <p>
+    There are many counters used when building a train and they are NOT restored when using the
+    train reset feature. This includes track use counts, <a href="#Schedules">schedules</a>, and car
+    wait values. Therefore new train builds can be different after using the train reset function.
+   </p>
+
    <h3>Save Train</h3>
    <p>Press "Save Train" to save your train. The program will create a file named
     "OperationsTrainRoster.xml". You can find this file in JMRI-&gt; "profile name" -&gt;

diff --git a/java/src/jmri/jmrit/operations/trains/JmritOperationsTrainsBundle.properties b/java/src/jmri/jmrit/operations/trains/JmritOperationsTrainsBundle.properties
@@ -906,7 +906,7 @@ buildRemoveCarsStaging      = Remove cars from the other staging tracks:
 buildSpurScheduleNotUsed    = Ignoring spur ({0}, {1}) schedule ({2}) schedule id ({3}) requests type ({4}) road ({5}) load ({6})
 buildSpurNotThisType        = Spur ({0}, {1}) schedule ({2}) doesn''t service type ({3})
 buildCarLoadChangedWait     = Car ({0}) type ({1}) wait expired, old load ({2}) new load ({3})
-buildTrainCanServiceWait	= Train ({0}) can service car ({1}) decrementing wait count
+buildTrainCanServiceWait	= Train ({0}) can service car ({1}) decrementing wait count to ({2})
 buildStagingLocationTrack	= Staging ({0}, {1})
 buildIgnoreStagingFirstPass = Ignoring terminal staging tracks ({0}) on first pass
 

diff --git a/java/src/jmri/jmrit/operations/trains/TrainBuilder.java b/java/src/jmri/jmrit/operations/trains/TrainBuilder.java
@@ -1,18 +1,8 @@
 package jmri.jmrit.operations.trains;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
+import java.io.*;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.ResourceBundle;
+import java.util.*;
 
 import javax.swing.JOptionPane;
 
@@ -26,11 +16,7 @@
 import jmri.jmrit.operations.locations.Track;
 import jmri.jmrit.operations.locations.schedules.ScheduleItem;
 import jmri.jmrit.operations.rollingstock.RollingStock;
-import jmri.jmrit.operations.rollingstock.cars.Car;
-import jmri.jmrit.operations.rollingstock.cars.CarLoad;
-import jmri.jmrit.operations.rollingstock.cars.CarLoads;
-import jmri.jmrit.operations.rollingstock.cars.CarManager;
-import jmri.jmrit.operations.rollingstock.cars.CarRoads;
+import jmri.jmrit.operations.rollingstock.cars.*;
 import jmri.jmrit.operations.rollingstock.engines.Engine;
 import jmri.jmrit.operations.rollingstock.engines.EngineManager;
 import jmri.jmrit.operations.router.Router;
@@ -1847,7 +1833,7 @@ private void removeAndListCars() throws BuildFailedException {
                     if (_train.services(car)) {
                         addLine(_buildReport, SEVEN,
                                 MessageFormat.format(Bundle.getMessage("buildTrainCanServiceWait"),
-                                        new Object[]{_train.getName(), car.toString()}));
+                                        new Object[]{_train.getName(), car.toString(), car.getWait() - 1}));
                         car.setWait(car.getWait() - 1); // decrement wait count
                         // a car's load changes when the wait count reaches 0
                         String oldLoad = car.getLoadName();