zero deprecation warnings in main code!

java/src/jmri/BlockManager.java

@@ -300,8 +300,7 @@ public String getBeanTypeHandled() {
     public List<Block> getBlocksOccupiedByRosterEntry(@Nonnull RosterEntry re) {
         List<Block> blockList = new ArrayList<>();
 
-        getSystemNameList().stream().forEach((sysName) -> {
-            Block b = getBySystemName(sysName);
+        getNamedBeanSet().stream().forEach((b) -> {
             Object obj;
             if (b!= null && (obj = b.getValue()) != null) {
                 if (obj instanceof RosterEntry && obj == re) {

java/src/jmri/ReporterManager.java

@@ -132,16 +132,6 @@ public interface ReporterManager extends ProvidingManager<Reporter> {
     @Nonnull public
     Reporter newReporter(@Nonnull String systemName, String userName);
 
-    /**
-     * Get a list of all Reporter system names.
-     *
-     * @return a list of reporter system names or an empty list if there are no
-     *         reporters
-     */
-    @Nonnull public
-    @Override
-    List<String> getSystemNameList();
-
     /**
      * Determine if it is possible to add a range of reporters in numerical
      * order.

java/src/jmri/SectionManager.java

@@ -4,6 +4,7 @@
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import jmri.jmrit.display.layoutEditor.LayoutEditor;
 import jmri.managers.AbstractManager;
 import org.slf4j.Logger;
@@ -187,14 +188,14 @@ String normalizeSystemName(@Nonnull String inputName) {
      *         sections
      */
     public int validateAllSections(jmri.util.JmriJFrame frame, LayoutEditor lePanel) {
-        List<String> list = getSystemNameList();
+        Set<Section> set = getNamedBeanSet();
         int numSections = 0;
         int numErrors = 0;
-        if (list.size() <= 0) {
+        if (set.size() <= 0) {
             return -2;
         }
-        for (int i = 0; i < list.size(); i++) {
-            String s = getBySystemName(list.get(i)).validate(lePanel);
+        for (Section section : set) {
+            String s = section.validate(lePanel);
             if (!s.equals("")) {
                 log.error(s);
                 numErrors++;
@@ -216,14 +217,14 @@ public int setupDirectionSensors(LayoutEditor lePanel) {
         if (lePanel == null) {
             return -1;
         }
-        List<String> list = getSystemNameList();
+        Set<Section> set = getNamedBeanSet();
         int numSections = 0;
         int numErrors = 0;
-        if (list.size() <= 0) {
+        if (set.size() <= 0) {
             return -2;
         }
-        for (int i = 0; i < list.size(); i++) {
-            int errors = getBySystemName(list.get(i)).placeDirectionSensors(lePanel);
+        for (Section section : set) {
+            int errors = section.placeDirectionSensors(lePanel);
             numErrors = numErrors + errors;
             numSections++;
         }
@@ -243,14 +244,13 @@ public int removeDirectionSensorsFromSSL(LayoutEditor lePanel) {
             return -1;
         }
         jmri.jmrit.display.layoutEditor.ConnectivityUtil cUtil = lePanel.getConnectivityUtil();
-        List<String> list = getSystemNameList();
-        if (list.size() <= 0) {
+        Set<Section> set = getNamedBeanSet();
+        if (set.size() <= 0) {
             return -2;
         }
         int numErrors = 0;
-        ArrayList<String> sensorList = new ArrayList<>();
-        for (int i = 0; i < list.size(); i++) {
-            Section s = getBySystemName(list.get(i));
+        List<String> sensorList = new ArrayList<>();
+        for (Section s : set) {
             String name = s.getReverseBlockingSensorName();
             if ((name != null) && (!name.equals(""))) {
                 sensorList.add(name);

java/src/jmri/TransitManager.java

@@ -189,54 +189,33 @@ public void deleteTransit(Transit z) {
      */
     public ArrayList<Transit> getListUsingSection(Section s) {
         ArrayList<Transit> list = new ArrayList<>();
-        List<String> tList = getSystemNameList();
-        for (int i = 0; i < tList.size(); i++) {
-            String tName = tList.get(i);
-            if ((tName != null) && (tName.length() > 0)) {
-                Transit tTransit = getTransit(tName);
-                if (tTransit != null) {
-                    if (tTransit.containsSection(s)) {
-                        // this Transit uses the specified Section
-                        list.add(tTransit);
-                    }
-                }
+        for (Transit tTransit : getNamedBeanSet()) {
+            if (tTransit.containsSection(s)) {
+                // this Transit uses the specified Section
+                list.add(tTransit);
             }
         }
         return list;
     }
 
     public ArrayList<Transit> getListUsingBlock(Block b) {
         ArrayList<Transit> list = new ArrayList<>();
-        List<String> tList = getSystemNameList();
-        for (int i = 0; i < tList.size(); i++) {
-            String tName = tList.get(i);
-            if ((tName != null) && (tName.length() > 0)) {
-                Transit tTransit = getTransit(tName);
-                if (tTransit != null) {
-                    if (tTransit.containsBlock(b)) {
-                        // this Transit uses the specified Section
-                        list.add(tTransit);
-                    }
-                }
+        for (Transit tTransit : getNamedBeanSet()) {
+            if (tTransit.containsBlock(b)) {
+                // this Transit uses the specified Section
+                list.add(tTransit);
             }
         }
         return list;
     }
 
     public ArrayList<Transit> getListEntryBlock(Block b) {
         ArrayList<Transit> list = new ArrayList<>();
-        List<String> tList = getSystemNameList();
-        for (int i = 0; i < tList.size(); i++) {
-            String tName = tList.get(i);
-            if ((tName != null) && (tName.length() > 0)) {
-                Transit tTransit = getTransit(tName);
-                if (tTransit != null) {
-                    ArrayList<Block> entryBlock = tTransit.getEntryBlocksList();
-                    if (entryBlock.contains(b)) {
-                        // this Transit uses the specified Section
-                        list.add(tTransit);
-                    }
-                }
+        for (Transit tTransit : getNamedBeanSet()) {
+            ArrayList<Block> entryBlock = tTransit.getEntryBlocksList();
+            if (entryBlock.contains(b)) {
+                // this Transit uses the specified Section
+                list.add(tTransit);
             }
         }
         return list;

java/src/jmri/TurnoutOperation.java

@@ -239,18 +239,13 @@ public boolean isDeleted() {
      * @return true iff any turnouts are using it
      */
     public boolean isInUse() {
-        boolean result = false;
         TurnoutManager tm = InstanceManager.turnoutManagerInstance();
-        List<String> turnouts = tm.getSystemNameList();
-        Iterator<String> iter = turnouts.iterator();
-        while (iter.hasNext()) {
-            Turnout t = tm.getBySystemName(iter.next());
+        for (Turnout t : tm.getNamedBeanSet()) {
             if (t != null && t.getTurnoutOperation() == this) {
-                result = true;
-                break;
+                return true;
             }
         }
-        return result;
+        return false;
     }
 
     /**

java/src/jmri/configurexml/BlockManagerXml.java

@@ -50,6 +50,7 @@ public void setStoreElementClass(Element memories) {
      * @return Element containing the complete info
      */
     @Override
+    @SuppressWarnings("deprecation") // needs careful unwinding for Set operations
     public Element store(Object o) {
         Element blocks = new Element("blocks");
         setStoreElementClass(blocks);

java/src/jmri/configurexml/SectionManagerXml.java

@@ -28,6 +28,7 @@ public SectionManagerXml() {
      * @return Element containing the complete info
      */
     @Override
+    @SuppressWarnings("deprecation") // needs careful unwinding for Set operations
     public Element store(Object o) {
         Element sections = new Element("sections");
         setStoreElementClass(sections);

java/src/jmri/configurexml/TransitManagerXml.java

@@ -30,6 +30,7 @@ public TransitManagerXml() {
      * @return Element containing the complete info
      */
     @Override
+    @SuppressWarnings("deprecation") // needs careful unwinding for Set operations
     public Element store(Object o) {
         Element transits = new Element("transits");
         setStoreElementClass(transits);

java/src/jmri/jmris/srcp/parser/SRCPVisitor.java

@@ -123,6 +123,7 @@ public Object visit(ASThandshake_set node, Object data) {
     }
 
     @Override
+    @SuppressWarnings("deprecation") // needs careful unwinding for Set operations
     public Object visit(ASTget node, Object data) {
         log.debug("Get " + ((SimpleNode) node.jjtGetChild(1)).jjtGetValue());
         int bus = Integer.parseInt(((String) ((SimpleNode) node.jjtGetChild(0)).jjtGetValue()));

java/src/jmri/jmrit/beantable/BeanTableDataModel.java

@@ -100,6 +100,7 @@ protected NamedBeanPropertyDescriptor<?> getPropertyColumnDescriptor(int column)
         return propertyColumns.get(tgt);
     }
 
+    @SuppressWarnings("deprecation") // needs careful unwinding for Set operations & generics
     protected synchronized void updateNameList() {
         // first, remove listeners from the individual objects
         if (sysNameList != null) {
@@ -793,6 +794,7 @@ public void removeName(int row, int column) {
         fireTableRowsUpdated(row, row);
     }
 
+    @SuppressWarnings("deprecation") // needs careful unwinding for Set operations & generics
     public void moveBean(int row, int column) {
         final T t = getBySystemName(sysNameList.get(row));
         String currentName = t.getUserName();

java/src/jmri/jmrit/beantable/LRouteTableAction.java

@@ -109,6 +109,7 @@ class LBeanTableDataModel extends BeanTableDataModel<Logix> {
          * Override to filter out the LRoutes from the rest of Logix.
          */
         @Override
+        @SuppressWarnings("deprecation") // needs careful unwinding for Set operations
         protected synchronized void updateNameList() {
             // first, remove listeners from the individual objects
             if (sysNameList != null) {

java/src/jmri/jmrit/beantable/LogixTableAction.java

@@ -653,9 +653,7 @@ void deviceReportPressed(ActionEvent e) {
     }
 
     void enableAll(boolean enable) {
-        List<String> sysNameList = _logixManager.getSystemNameList();
-        for (int i = 0; i < sysNameList.size(); i++) {
-            Logix x = _logixManager.getBySystemName(sysNameList.get(i));
+        for (Logix x : _logixManager.getNamedBeanSet()) {
             x.setEnabled(enable);
         }
     }

java/src/jmri/jmrit/beantable/RouteTableAction.java

@@ -468,22 +468,17 @@ protected void addPressed(ActionEvent e) {
             cancelEdit();
         }
         jmri.TurnoutManager tm = InstanceManager.turnoutManagerInstance();
-        List<String> systemNameList = tm.getSystemNameList();
-        _turnoutList = new ArrayList<>(systemNameList.size());
-        Iterator<String> iter = systemNameList.iterator();
-        while (iter.hasNext()) {
-            String systemName = iter.next();
-            String userName = tm.getBySystemName(systemName).getUserName();
+        _turnoutList = new ArrayList<>();
+        for (Turnout t : tm.getNamedBeanSet()) {
+            String systemName = t.getSystemName();
+            String userName = t.getUserName();
             _turnoutList.add(new RouteTurnout(systemName, userName));
         }
 
         jmri.SensorManager sm = InstanceManager.sensorManagerInstance();
-        systemNameList = sm.getSystemNameList();
-        _sensorList = new ArrayList<>(systemNameList.size());
-        iter = systemNameList.iterator();
-        while (iter.hasNext()) {
-            String systemName = iter.next();
-            Sensor s = sm.getBySystemName(systemName);
+         _sensorList = new ArrayList<>();
+        for (Sensor s : sm.getNamedBeanSet()) {
+            String systemName = s.getSystemName();
             if (s != null) {
                 String userName = s.getUserName();
                 _sensorList.add(new RouteSensor(systemName, userName));

java/src/jmri/jmrit/beantable/SectionTableAction.java

@@ -975,17 +975,26 @@ private void layoutEditorSelectionChanged() {
      * Build a combo box to select Blocks for this Section.
      */
     private void initializeBlockCombo() {
-        List<String> allBlocks = blockManager.getSystemNameList();
         blockBox.removeAllItems();
         for (int j = blockBoxList.size(); j > 0; j--) {
             blockBoxList.remove(j - 1);
         }
         if (blockList.size() == 0) {
             // No blocks selected, all blocks are eligible
-            for (int i = 0; i < allBlocks.size(); i++) {
-                String bName = allBlocks.get(i);
-                Block b = blockManager.getBySystemName(bName);
-                if (b != null) {
+            for (Block b : blockManager.getNamedBeanSet()) {
+                String bName = b.getSystemName();
+                String uname = b.getUserName();
+                if ((uname != null) && (!uname.equals(""))) {
+                    bName = bName + " ( " + uname + " )";
+                }
+                blockBox.addItem(bName);
+                blockBoxList.add(b);
+            }
+        } else {
+            // limit combo list to Blocks bonded to the currently selected Block that are not already in the Section
+            for (Block b : blockManager.getNamedBeanSet()) {
+                String bName = b.getSystemName();
+                if ((!inSection(b)) && connected(b, endBlock)) {
                     String uname = b.getUserName();
                     if ((uname != null) && (!uname.equals(""))) {
                         bName = bName + " ( " + uname + " )";
@@ -994,22 +1003,6 @@ private void initializeBlockCombo() {
                     blockBoxList.add(b);
                 }
             }
-        } else {
-            // limit combo list to Blocks bonded to the currently selected Block that are not already in the Section
-            for (int i = 0; i < allBlocks.size(); i++) {
-                String bName = allBlocks.get(i);
-                Block b = blockManager.getBySystemName(bName);
-                if (b != null) {
-                    if ((!inSection(b)) && connected(b, endBlock)) {
-                        String uname = b.getUserName();
-                        if ((uname != null) && (!uname.equals(""))) {
-                            bName = bName + " ( " + uname + " )";
-                        }
-                        blockBox.addItem(bName);
-                        blockBoxList.add(b);
-                    }
-                }
-            }
         }
     }
 

java/src/jmri/jmrit/beantable/SignalGroupSubTableAction.java

@@ -265,6 +265,7 @@ void setTurnoutModeBox(int mode, JComboBox<String> box) {
      * @param g Parent Signal Head
      * @param headName System or User Name of this Signal Head
      */
+    @SuppressWarnings("deprecation") // needs careful unwinding for Set operations
     void editHead(SignalGroup g, String headName) {
         curSignalGroup = g;
         curHeadName = headName;

java/src/jmri/jmrit/beantable/SignalGroupTableAction.java

@@ -455,16 +455,11 @@ protected void addPressed(ActionEvent e) {
         _mastAspectsList = null;
 
         SignalHeadManager shm = InstanceManager.getDefault(SignalHeadManager.class);
-        List<String> systemNameList = shm.getSystemNameList();
-        _signalHeadsList = new ArrayList<SignalGroupSignalHead>(systemNameList.size());
+        _signalHeadsList = new ArrayList<SignalGroupSignalHead>();
         // create list of all available Single Output Signal Heads to choose from
-        Iterator<String> iter = systemNameList.iterator();
-        // int i = 1; // for debug of iter next
-        while (iter.hasNext()) {
-            String systemName = iter.next();
-            SignalHead sh = shm.getBySystemName(systemName);
-            // log.debug("Iteration {} of : Looking for Signal Head {}", i, systemNameList.size(), systemName);
-            // debug using i & sysnamelist.size
+        for (SignalHead sh : shm.getNamedBeanSet()) {
+            String systemName = sh.getSystemName();
+
             if (sh != null) {
                 if (sh.getClass().getName().contains("SingleTurnoutSignalHead")) {
                     String userName = sh.getUserName();