Allow user to not use the car drops format

JMRI · Nov 9, 2019 · 60bc979 · 60bc979
1 parent 4a3c0ac
commit 60bc979
Show file tree

Hide file tree

Showing 20 changed files with 57 additions and 88 deletions.
diff --git a/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle.properties b/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle.properties
@@ -29,8 +29,6 @@ MenuItemChangeTrackType = Change Track Type
 MenuItemScheduleOptions = Options
 MenuItemPoolTrack       = Track Pools
 MenuItemShowSchedulesByLoad = Show Schedules by Car Type and Load
-MenuItemCarLoadsPreview = Preview Car Loads
-MenuItemCarLoadsPrint   = Print Car Loads
 MenuItemPlannedPickups  = Planned Pick Ups
 MenuItemComments        = Manifest Comments
 MenuItemRoadOptions     = Road Options

diff --git a/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_ca.properties b/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_ca.properties
@@ -29,8 +29,6 @@ MenuItemChangeTrackType = Modifica el tipus de Via
 MenuItemScheduleOptions = Opcions
 MenuItemPoolTrack       = Grup de vies
 MenuItemShowSchedulesByLoad = Mostra Horaris segons el tipus de Vagons i la C\u00e0rrega
-MenuItemCarLoadsPreview = Previsualitza C\u00e0rrega dels Vagons
-MenuItemCarLoadsPrint   = Imprimeix C\u00e0rrega dels Vagons
 MenuItemPlannedPickups  = Sortides Previstes de Vagons
 MenuItemComments        = Comentaris Ordres del Tren
 MenuItemRoadOptions     = Opcions de la L\u00ednia

diff --git a/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_da.properties b/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_da.properties
@@ -29,8 +29,6 @@ MenuItemChangeTrackType = Change Track Type
 MenuItemScheduleOptions = Indstillinger
 MenuItemPoolTrack       = Track Pools
 MenuItemShowSchedulesByLoad = Show Schedules by Car Type and Load
-MenuItemCarLoadsPreview = Preview Car Loads
-MenuItemCarLoadsPrint   = Print Car Loads
 MenuItemPlannedPickups  = Planned Pick Ups
 MenuItemComments        = Manifest Comments
 MenuItemRoadOptions     = Road Options

diff --git a/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_de.properties b/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_de.properties
@@ -38,8 +38,6 @@ MenuItemChangeTrackType=Gleistyp umsetzen
 MenuItemScheduleOptions=Ablaufplanoptionen
 MenuItemPoolTrack=Gleisvereinigung
 MenuItemShowSchedulesByLoad=Zeige Ablaufplann je Wagentyp u. -ladung
-MenuItemCarLoadsPreview=Wagenladungenvorschau
-MenuItemCarLoadsPrint=Drucke Wagenladungen
 MenuItemPlannedPickups=Geplante Abholarbeit
 MenuItemComments=Ladungsverzeichnisbemerkungen
 MenuItemRoadOptions=Bahnoptionen

diff --git a/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_fr.properties b/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_fr.properties
@@ -30,8 +30,6 @@ MenuItemChangeTrackType = Modifier le Type de Voie
 MenuItemScheduleOptions = Options
 MenuItemPoolTrack       = Groupements de Voie
 MenuItemShowSchedulesByLoad = Afficher les horaires par type de wagon et de charge
-MenuItemCarLoadsPreview = Aper\u00e7u Charges Wagons 
-MenuItemCarLoadsPrint   = Imprimer Charges de Wagons
 MenuItemPlannedPickups  = Pr\u00e9vision Collectes
 MenuItemComments        = Commentaires Manifeste 
 MenuItemRoadOptions     = Options de la Ligne

diff --git a/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_it.properties b/java/src/jmri/jmrit/operations/locations/JmritOperationsLocationsBundle_it.properties
@@ -25,8 +25,6 @@ MenuItemChangeTrackType = Cambia Tipo Binario
 MenuItemScheduleOptions = Opzioni
 MenuItemPoolTrack = Gruppi di Binari
 MenuItemShowSchedulesByLoad = Mostra pianificazioni per tipo di carro e carico
-MenuItemCarLoadsPreview = Anteprima Carichi Carro
-MenuItemCarLoadsPrint = Stampa Carichi Carro
 MenuItemPlannedPickups = Prelievi Carri pianificati
 MenuItemComments    = Commenti Ordini Treno
 MenuItemRoadOptions     = Opzioni Compagnia

diff --git a/java/src/jmri/jmrit/operations/locations/schedules/SchedulesByLoadFrame.java b/java/src/jmri/jmrit/operations/locations/schedules/SchedulesByLoadFrame.java
@@ -3,16 +3,12 @@
 import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.text.MessageFormat;
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.ScrollPaneConstants;
+
+import javax.swing.*;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jmri.InstanceManager;
 import jmri.jmrit.operations.OperationsFrame;
 import jmri.jmrit.operations.locations.Location;
@@ -23,8 +19,6 @@
 import jmri.jmrit.operations.rollingstock.cars.CarTypes;
 import jmri.jmrit.operations.rollingstock.cars.tools.PrintCarLoadsAction;
 import jmri.jmrit.operations.setup.Control;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Frame to display spurs with schedules and their loads
@@ -96,8 +90,8 @@ public SchedulesByLoadFrame() {
         // build menu
         JMenuBar menuBar = new JMenuBar();
         JMenu toolMenu = new JMenu(Bundle.getMessage("MenuTools"));
-        toolMenu.add(new PrintCarLoadsAction(Bundle.getMessage("MenuItemCarLoadsPreview"), true, this));
-        toolMenu.add(new PrintCarLoadsAction(Bundle.getMessage("MenuItemCarLoadsPrint"), false, this));
+        toolMenu.add(new PrintCarLoadsAction(true, this));
+        toolMenu.add(new PrintCarLoadsAction(false, this));
         menuBar.add(toolMenu);
         setJMenuBar(menuBar);
         addHelpMenu("package.jmri.jmrit.operations.Operations_ShowSchedulesByCarTypeAndLoad", true); // NOI18N

diff --git a/java/src/jmri/jmrit/operations/rollingstock/RollingStockAttribute.java b/java/src/jmri/jmrit/operations/rollingstock/RollingStockAttribute.java
@@ -158,7 +158,6 @@ public int getMaxNameSubStringLength() {
                     maxNameLength = subString[0].length();
                 }
             }
-            log.info("Max car type name ({}) length {}", maxName, maxNameLength);
         }
         return maxNameLength;
     }

diff --git a/java/src/jmri/jmrit/operations/rollingstock/cars/CarRoads.java b/java/src/jmri/jmrit/operations/rollingstock/cars/CarRoads.java
@@ -69,15 +69,7 @@ public void replaceName(String oldName, String newName) {
     @Override
     public int getMaxNameLength() {
         if (maxNameLength == 0) {
-            maxName = "";
-            maxNameLength = MIN_NAME_LENGTH;
-            for (String name : getNames()) {
-                String[] subString = name.split("-");
-                if (subString[0].length() > maxNameLength) {
-                    maxName = name;
-                    maxNameLength = subString[0].length();
-                }
-            }
+            getMaxNameSubStringLength();
             log.info("Max road name ({}) length {}", maxName, maxNameLength);
         }
         return maxNameLength;

diff --git a/java/src/jmri/jmrit/operations/rollingstock/cars/CarTypes.java b/java/src/jmri/jmrit/operations/rollingstock/cars/CarTypes.java
@@ -127,15 +127,7 @@ public void replaceName(String oldName, String newName) {
     @Override
     public int getMaxNameLength() {
         if (maxNameLength == 0) {
-            maxName = "";
-            maxNameLength = MIN_NAME_LENGTH;
-            for (String name : getNames()) {
-                String[] subString = name.split("-");
-                if (subString[0].length() > maxNameLength) {
-                    maxName = name;
-                    maxNameLength = subString[0].length();
-                }
-            }
+            getMaxNameSubStringLength();
             log.info("Max car type name ({}) length {}", maxName, maxNameLength);
         }
         return maxNameLength;

diff --git a/java/src/jmri/jmrit/operations/rollingstock/cars/CarsTableFrame.java b/java/src/jmri/jmrit/operations/rollingstock/cars/CarsTableFrame.java
@@ -2,36 +2,27 @@
 
 import java.text.MessageFormat;
 import java.util.List;
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.ScrollPaneConstants;
+
+import javax.swing.*;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.TableColumnModel;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jmri.InstanceManager;
 import jmri.jmrit.operations.OperationsFrame;
 import jmri.jmrit.operations.OperationsXml;
 import jmri.jmrit.operations.locations.schedules.ScheduleManager;
 import jmri.jmrit.operations.locations.tools.ModifyLocationsAction;
+import jmri.jmrit.operations.rollingstock.cars.tools.PrintCarLoadsAction;
 import jmri.jmrit.operations.rollingstock.cars.tools.ResetCheckboxesCarsTableAction;
 import jmri.jmrit.operations.rollingstock.cars.tools.ShowCheckboxesCarsTableAction;
 import jmri.jmrit.operations.setup.Control;
 import jmri.jmrit.operations.setup.Setup;
 import jmri.jmrit.operations.trains.tools.TrainsByCarTypeAction;
 import jmri.swing.JTablePersistenceManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Frame for adding and editing the car roster for operations.
@@ -252,6 +243,8 @@ public CarsTableFrame(boolean showAllCars, String locationName, String trackName
         toolMenu.add(new ResetCheckboxesCarsTableAction(carsTableModel));
         toolMenu.add(new ModifyLocationsAction());
         toolMenu.add(new TrainsByCarTypeAction());
+        toolMenu.add(new PrintCarLoadsAction(true, this));
+        toolMenu.add(new PrintCarLoadsAction(false, this));
         toolMenu.add(new CarsSetFrameAction(carsTable));
         menuBar.add(toolMenu);
         menuBar.add(new jmri.jmrit.operations.OperationsMenu());

diff --git a/java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle.properties b/java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle.properties
@@ -14,6 +14,9 @@ TitleSetCars        = Set Cars
 TitleShowCheckboxes = Show Checkboxes
 TitleResetCheckboxes = Reset Checkboxes
 
+MenuItemCarLoadsPreview = Preview Car Loads
+MenuItemCarLoadsPrint   = Print Car Loads
+
 FD                  = FD
 ReturnWhenEmpty     = Return When Empty
 RWELocation			= RWE Location

diff --git a/java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle_ca.properties b/java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle_ca.properties
@@ -14,6 +14,10 @@ TitleSetCars        = Set Cars
 TitleShowCheckboxes = Show Checkboxes
 TitleResetCheckboxes = Reset Checkboxes
 
+MenuItemCarLoadsPreview = Previsualitza C\u00e0rrega dels Vagons
+MenuItemCarLoadsPrint   = Imprimeix C\u00e0rrega dels Vagons
+
+
 FD                  = FD
 ReturnWhenEmpty     = Return When Empty
 RWELocation			= RWE Location

diff --git a/java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle_de.properties b/java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle_de.properties
@@ -14,6 +14,9 @@ TitleSetCars            = Setze Wagen
 TitleShowCheckboxes     = Zeige Auswahlk\u00e4stchen
 TitleResetCheckboxes    = Setze K\u00e4stchen zur\u00fcck
 
+MenuItemCarLoadsPreview=Wagenladungenvorschau
+MenuItemCarLoadsPrint=Drucke Wagenladungen
+
 ReturnWhenEmpty         = R\u00fcckfahrt wenn Leer
 RWELoad                 = RWL Ladung
 ModifyLocations         = Orte bearbeiten?

diff --git a/java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle_fr.properties b/java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle_fr.properties
@@ -16,6 +16,9 @@ TitleSetCars         = D\u00e9finir Wagons
 TitleShowCheckboxes = Montrer les Cases \u00e0 Cocher
 TitleResetCheckboxes = R\u00e9initialiser les Cases \u00e0 Cocher
 
+MenuItemCarLoadsPreview = Aper\u00e7u Charges Wagons 
+MenuItemCarLoadsPrint   = Imprimer Charges de Wagons
+
 FD          = Avant
 ReturnWhenEmpty  = Retour Quand il est Vide
 RWELoad      = Inv Charge

diff --git a/java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle_it.properties b/java/src/jmri/jmrit/operations/rollingstock/cars/JmritOperationsCarsBundle_it.properties
@@ -15,6 +15,9 @@ TitleSetCars = Imposta Carri
 TitleShowCheckboxes = Vedi Spunte
 TitleResetCheckboxes = Reset Spunte
 
+MenuItemCarLoadsPreview = Anteprima Carichi Carro
+MenuItemCarLoadsPrint = Stampa Carichi Carro
+
 FD = DF
 ReturnWhenEmpty = Ritorna quando Vuoto
 RWELoad = Carico per RV

diff --git a/java/src/jmri/jmrit/operations/rollingstock/cars/tools/CarLoadEditFrame.java b/java/src/jmri/jmrit/operations/rollingstock/cars/tools/CarLoadEditFrame.java
@@ -3,31 +3,21 @@
 import java.awt.Dimension;
 import java.awt.GridBagLayout;
 import java.text.MessageFormat;
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
+
+import javax.swing.*;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jmri.InstanceManager;
 import jmri.jmrit.operations.OperationsFrame;
 import jmri.jmrit.operations.OperationsXml;
 import jmri.jmrit.operations.locations.LocationManager;
 import jmri.jmrit.operations.locations.schedules.ScheduleManager;
-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.CarTypes;
+import jmri.jmrit.operations.rollingstock.cars.*;
 import jmri.jmrit.operations.setup.Control;
 import jmri.jmrit.operations.setup.Setup;
 import jmri.jmrit.operations.trains.TrainManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Frame for adding and editing the car roster for operations.
@@ -153,8 +143,8 @@ public void initComponents(String type, String selectedItem) {
         JMenuBar menuBar = new JMenuBar();
         JMenu toolMenu = new JMenu(Bundle.getMessage("MenuTools"));
         toolMenu.add(new CarLoadAttributeAction(Bundle.getMessage("CarQuantity"), this));
-        toolMenu.add(new PrintCarLoadsAction(Bundle.getMessage("MenuItemPreview"), true, this));
-        toolMenu.add(new PrintCarLoadsAction(Bundle.getMessage("MenuItemPrint"), false, this));
+        toolMenu.add(new PrintCarLoadsAction(true, this));
+        toolMenu.add(new PrintCarLoadsAction(false, this));
         menuBar.add(toolMenu);
         setJMenuBar(menuBar);
         // add help menu to window

diff --git a/java/src/jmri/jmrit/operations/rollingstock/cars/tools/PrintCarLoadsAction.java b/java/src/jmri/jmrit/operations/rollingstock/cars/tools/PrintCarLoadsAction.java
@@ -6,16 +6,19 @@
 import java.io.IOException;
 import java.util.Hashtable;
 import java.util.List;
+
 import javax.swing.AbstractAction;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jmri.InstanceManager;
 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.CarTypes;
 import jmri.jmrit.operations.setup.Control;
 import jmri.util.davidflanagan.HardcopyWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Action to print a summary of car loads ordered by car type.
@@ -31,8 +34,8 @@ public class PrintCarLoadsAction extends AbstractAction {
 
     CarManager manager = InstanceManager.getDefault(CarManager.class);
 
-    public PrintCarLoadsAction(String actionName, boolean preview, Component pWho) {
-        super(actionName);
+    public PrintCarLoadsAction(boolean preview, Component pWho) {
+        super(preview? Bundle.getMessage("MenuItemCarLoadsPreview") : Bundle.getMessage("MenuItemCarLoadsPrint"));
         isPreview = preview;
     }
 

diff --git a/java/src/jmri/jmrit/operations/trains/TrainCommon.java b/java/src/jmri/jmrit/operations/trains/TrainCommon.java
@@ -1642,7 +1642,7 @@ public void printDropEngineHeader(PrintWriter file, boolean isManifest) {
      *
      * @param file             Manifest or Switch List File
      * @param isManifest       True if manifest, false if switch list.
-     * @param isTwoColumnTrack True if two column format.
+     * @param isTwoColumnTrack True if two column format using track names.
      */
     public void printCarHeader(PrintWriter file, boolean isManifest, boolean isTwoColumnTrack) {
         int lineLength = getLineLength(isManifest);
@@ -1679,7 +1679,7 @@ public void printPickupCarHeader(PrintWriter file, boolean isManifest, boolean i
     }
 
     public void printDropCarHeader(PrintWriter file, boolean isManifest, boolean isTwoColumnTrack) {
-        if (!Setup.isPrintHeadersEnabled()) {
+        if (!Setup.isPrintHeadersEnabled() || getDropCarHeader(isManifest, isTwoColumnTrack).trim().isEmpty()) {
             return;
         }
         printHorizontalLine(file, isManifest);

diff --git a/java/test/jmri/jmrit/operations/rollingstock/cars/tools/PrintCarLoadsActionTest.java b/java/test/jmri/jmrit/operations/rollingstock/cars/tools/PrintCarLoadsActionTest.java
@@ -1,11 +1,13 @@
 package jmri.jmrit.operations.rollingstock.cars.tools;
 
 import java.awt.GraphicsEnvironment;
-import jmri.jmrit.operations.OperationsTestCase;
+
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
 
+import jmri.jmrit.operations.OperationsTestCase;
+
 /**
  *
  * @author Paul Bender Copyright (C) 2017	
@@ -16,7 +18,7 @@ public class PrintCarLoadsActionTest extends OperationsTestCase {
     public void testCTor() {
         Assume.assumeFalse(GraphicsEnvironment.isHeadless());
         jmri.util.JmriJFrame jf = new jmri.util.JmriJFrame("Print Car Loads Frame");
-        PrintCarLoadsAction t = new PrintCarLoadsAction("Test Action",true,jf);
+        PrintCarLoadsAction t = new PrintCarLoadsAction(true,jf);
         Assert.assertNotNull("exists",t);
     }