Layout editor add check for unnecessary anchors

help/en/JavaHelpSearch/SCHEMA

@@ -1,2 +1,2 @@
 JavaSearch 1.0
-TMAP bs=2048 rt=72 fl=-1 id1=15445 id2=1
+TMAP bs=2048 rt=78 fl=-1 id1=15483 id2=1

help/en/Map.jhm

@@ -2048,6 +2048,8 @@
 
 <mapID target="package.jmri.jmrit.withrottle.UserInterface" url="package/jmri/jmrit/withrottle/UserInterface.shtml"/>
 
+<mapID target="html.hardware.loconet.Addressing_boards" url="html/hardware/loconet/Addressing.shtml#boards"/>
+
 <mapID target="package.jmri.jmrix.secsi.nodeconfig.NodeConfigFrame" url="package/jmri/jmrix/secsi/nodeconfig/NodeConfigFrame.shtml"/>
 
 <mapID target="manual.DecoderPro3.Comp_Analog" url="manual/DecoderPro3/Comp_Analog.shtml"/>
@@ -3218,6 +3220,8 @@
 
 <mapID target="html.hardware.loconet.Digitrax" url="html/hardware/loconet/Digitrax.shtml"/>
 
+<mapID target="html.doc.Technical.I8N_classkeysreport" url="html/doc/Technical/I8N.shtml#classkeysreport"/>
+
 <mapID target="html.hardware.loconet.Digitrax_alternatives" url="html/hardware/loconet/Digitrax.shtml#alternatives"/>
 
 <mapID target="html.apps.DecoderPro.LocoFile" url="html/apps/DecoderPro/LocoFile.shtml"/>
@@ -3778,6 +3782,8 @@
 
 <mapID target="html.hardware.loconet.StandaloneLocoNet_pseudoground" url="html/hardware/loconet/StandaloneLocoNet.shtml#pseudoground"/>
 
+<mapID target="html.doc.Technical.I8N_bundlekeysreport" url="html/doc/Technical/I8N.shtml#bundlekeysreport"/>
+
 <mapID target="manual.DecoderPro3.Main_OakTreeSystems" url="manual/DecoderPro3/Main_OakTreeSystems.shtml"/>
 
 <mapID target="package.jmri.jmrit.beantable.LogixTable_logixOptions" url="package/jmri/jmrit/beantable/LogixTable.shtml#logixOptions"/>

java/src/jmri/jmrit/beantable/TransitTableAction.java

@@ -770,12 +770,19 @@ void removeLastSectionPressed(ActionEvent e) {
                 curSequenceNum--;
                 curSection = sectionList.get(j - 1);
                 curSectionDirection = direction[j - 1];
+                // delete alternate if present
                 int k = j - 2;
                 while ((k >= 0) && alternate[k]) {
                     k--;
                 }
-                prevSection = sectionList.get(k);
-                prevSectionDirection = direction[k];
+                // After this delete we need the new previous section, if there is one.
+                if (k < 0) {
+                    // There is no previous section
+                    prevSection = null;
+                } else {
+                    prevSection = sectionList.get(k);
+                    prevSectionDirection = direction[k];
+                }
             }
             sectionList.remove(j);
             initializeSectionCombos();

java/src/jmri/jmrit/dispatcher/AutoTurnouts.java

@@ -184,30 +184,17 @@ private boolean turnoutUtil(Section s, int seqNum, Section nextSection,
             // next Block is outside of the Section
             nextBlock = exitPt.getFromBlock();
         } else {
-            if (!at.isAllocationReversed()) {
-                if (direction == Section.FORWARD) {
-                    nextBlock = s.getBlockBySequenceNumber(curBlockSeqNum + 1);
-                    nextBlockSeqNum = curBlockSeqNum + 1;
-                } else if (direction == Section.REVERSE) {
-                    nextBlock = s.getBlockBySequenceNumber(curBlockSeqNum - 1);
-                    nextBlockSeqNum = curBlockSeqNum - 1;
-                }
-                if ((nextBlock == null) && (curBlock != at.getEndBlock())) {
-                    log.error("Error in block sequence numbers fwd when setting/checking turnouts");
-                    return false;
-                }
-            } else {
-                if (direction == Section.REVERSE) {
-                    nextBlock = s.getBlockBySequenceNumber(curBlockSeqNum + 1);
-                    nextBlockSeqNum = curBlockSeqNum + 1;
-                } else if (direction == Section.FORWARD) {
-                    nextBlock = s.getBlockBySequenceNumber(curBlockSeqNum - 1);
-                    nextBlockSeqNum = curBlockSeqNum - 1;
-                }
-                if ((nextBlock == null) && (curBlock != at.getStartBlock())) {
-                    log.error("Error in block sequence numbers rev when setting/checking turnouts");
-                    return false;
-                }
+            // next Block is inside the Section
+            if (direction == Section.FORWARD) {
+                nextBlock = s.getBlockBySequenceNumber(curBlockSeqNum + 1);
+                nextBlockSeqNum = curBlockSeqNum + 1;
+            } else if (direction == Section.REVERSE) {
+                nextBlock = s.getBlockBySequenceNumber(curBlockSeqNum - 1);
+                nextBlockSeqNum = curBlockSeqNum - 1;
+            }
+            if ((nextBlock == null) && (curBlock != at.getEndBlock())) {
+                log.error("Error in block sequence numbers when setting/checking turnouts");
+                return false;
             }
         }
 

java/src/jmri/jmrit/dispatcher/DispatcherBundle.properties

@@ -112,8 +112,8 @@ DestinationBlockBoxLabel = Destination Location of Train
 DestinationBlockBoxHint = Select the Block where the Train will be located when Transit ends.
 AutoRun = Run Train Automatically
 AllocateMethodLabel = Allocation Method
-AllocateMethodBoxHint = Number of Blocks ahead to auto allocate
-NumberOfBlocks = Number of Blocks
+AllocateMethodBoxHint = Number of Sections ahead to auto allocate
+NumberOfBlocks = Number of Sections
 AsFarAsPos = As Far As Pos
 ToSafeSections = To Safe Secs
 UseSpeedProfileLabel = Use Speed Profile

java/src/jmri/jmrit/display/layoutEditor/LayoutEditor.java

@@ -2090,10 +2090,13 @@ public static void setupComboBox(@Nonnull JmriBeanComboBox inComboBox, boolean i
         inComboBox.setValidateMode(inValidateMode);
         inComboBox.setText("");
 
+        // This has to be set before calling setupComboBoxMaxRows
+        // (otherwise if inFirstBlank then the  number of rows will be wrong)
+        inComboBox.setFirstItemBlank(inFirstBlank);
+
         // set the max number of rows that will fit onscreen
         JComboBoxUtil.setupComboBoxMaxRows(inComboBox);
 
-        inComboBox.setFirstItemBlank(inFirstBlank);
         inComboBox.setSelectedIndex(-1);
     } //setupComboBox
 
@@ -2849,7 +2852,7 @@ public void menuCanceled(MenuEvent event) {
     /*============================================*\
     |* LayoutTrackDrawingOptions accessor methods *|
     \*============================================*/
-    private LayoutTrackDrawingOptions layoutTrackDrawingOptions = null;
+    private transient LayoutTrackDrawingOptions layoutTrackDrawingOptions = null;
 
     public LayoutTrackDrawingOptions getLayoutTrackDrawingOptions() {
         if (layoutTrackDrawingOptions == null) {
@@ -5707,6 +5710,11 @@ && allControlling() && !isMetaDown(event) && !event.isAltDown() && !event.isPopu
             prevSelectedObject = selectedObject;
             selectedObject = null;
         }
+
+        // clear these
+        beginObject = null;
+        foundObject = null;
+
         isDragging = false;
         delayedPopupTrigger = false;
         requestFocusInWindow();

java/src/jmri/jmrit/display/layoutEditor/LayoutEditorBundle.properties

@@ -636,7 +636,8 @@ CheckUnBlockedTracksMenuTitle = Un-Blocked Tracks
 CheckUnBlockedTracksMenuToolTip = Select this to check for tracks that do not have an assigned block
 CheckNonContiguousBlocksMenuTitle = Non-Contiguous Blocks
 CheckNonContiguousBlocksMenuToolTip = Select this to check for blocks that are not contiguous
-
+CheckUnnecessaryAnchorsMenuTitle = Unnecessary Anchors
+CheckUnnecessaryAnchorsMenuToolTip = Select this to check if the adjacent track segments can be merged
 #LayoutTrackDrawingOptionsDialog properties
 #
 # the presets