Merge branch 'master' of https://github.com/JMRI/JMRI into Collecting…

…Reporters
JMRI · Feb 6, 2019 · 58acd74 · 58acd74
2 parents 983911c + 7c55376
commit 58acd74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/java/src/jmri/jmrit/operations/rollingstock/engines/JmritOperationsEnginesBundle.properties b/java/src/jmri/jmrit/operations/rollingstock/engines/JmritOperationsEnginesBundle.properties
@@ -74,6 +74,7 @@ rsAddManuallyToTrain= Manually add locomotive to train?
 rsAddRsToTrain      = Do you want to add loco ({0}) to train ({1})?
 rsRemoveRsFromTrain = Do you really want to remove loco ({0}) from train ({1})?
 rsPressSaveWill     = Pressing the Save button will release the locomotive from the train
+rsDoNotSelectStaging = Do not select a staging track when sending a locomotive to staging!
 
 engineInConsist     = This loco is part of a consist, do you want the other locomotives to also have the same settings?
 enginePartConsist   = Locomotive is part of a consist

diff --git a/java/src/jmri/jmrit/operations/trains/TrainsTableModel.java b/java/src/jmri/jmrit/operations/trains/TrainsTableModel.java
@@ -75,7 +75,7 @@ public void setSort(int sort) {
     public void setShowAll(boolean showAll) {
         _showAll = showAll;
         updateList();
-        //fireTableStructureChanged();
+        fireTableStructureChanged();
         initTable();
     }
 
@@ -372,7 +372,7 @@ public void setValueAt(Object value, int row, int col) {
 
     public Color getRowColor(int row) {
         Train train = sysList.get(row);
-        //  log.debug("Row: {} train: {} color: {}", row, train.getName(), train.getTableRowColorName());
+//          log.debug("Row: {} train: {} color: {}", row, train.getName(), train.getTableRowColorName());
         return train.getTableRowColor();
     }