Merge pull request #8697 from bobjacobsen/and-catalog-and-roster

Improve roster, catalog references from jmri package
JMRI · Jun 16, 2020 · 1a37a77 · 1a37a77
2 parents 1581538 + 27bb274
commit 1a37a77
Show file tree

Hide file tree

Showing 28 changed files with 49 additions and 46 deletions.
diff --git a/...tore/c4b353e5-9817-4cd4-9672-b8b4150544d7 → ...tore/0593c15b-2922-4e2d-8f6d-cc41a895be82 b/...tore/c4b353e5-9817-4cd4-9672-b8b4150544d7 → ...tore/0593c15b-2922-4e2d-8f6d-cc41a895be82
diff --git a/...tore/1d46097e-ad2a-4f96-89c1-26b33443d047 → ...tore/1399b807-0aa3-487f-8c8a-1ff1268293fd b/...tore/1d46097e-ad2a-4f96-89c1-26b33443d047 → ...tore/1399b807-0aa3-487f-8c8a-1ff1268293fd
diff --git a/...tore/43584a34-ede9-4223-b3be-36efe2509048 → ...tore/788ffcd8-d213-479d-a8a6-d7854e18adef b/...tore/43584a34-ede9-4223-b3be-36efe2509048 → ...tore/788ffcd8-d213-479d-a8a6-d7854e18adef
@@ -67,8 +67,6 @@ Constructor <jmri.web.server.WebServerPreferencesInstanceInitializer$1.<init>(jm
 Constructor <jmri.web.servlet.operations.HtmlTrainCommon.<init>(java.util.Locale, jmri.jmrit.operations.trains.Train)> calls constructor <jmri.jmrit.operations.trains.TrainCommon.<init>()> in (HtmlTrainCommon.java:47)
 Method <jmri.BlockManager$1.run()> calls constructor <jmri.jmrit.display.layoutEditor.BlockValueFile.<init>()> in (BlockManager.java:47)
 Method <jmri.BlockManager$1.run()> calls method <jmri.jmrit.display.layoutEditor.BlockValueFile.writeBlockValues()> in (BlockManager.java:47)
-Method <jmri.BlockManager.lambda$getBlocksOccupiedByRosterEntry$1(jmri.jmrit.roster.RosterEntry, java.util.List, jmri.Block)> calls method <jmri.jmrit.roster.RosterEntry.getDccAddress()> in (BlockManager.java:265)
-Method <jmri.BlockManager.lambda$getBlocksOccupiedByRosterEntry$1(jmri.jmrit.roster.RosterEntry, java.util.List, jmri.Block)> calls method <jmri.jmrit.roster.RosterEntry.getId()> in (BlockManager.java:264)
 Method <jmri.ConditionalVariable.evaluate()> calls method <jmri.jmrit.logix.OBlock.statusIs(java.lang.String)> in (ConditionalVariable.java:622)
 Method <jmri.ConditionalVariable.evaluate()> calls method <jmri.jmrit.logix.OBlockManager.getOBlock(java.lang.String)> in (ConditionalVariable.java:617)
 Method <jmri.ConditionalVariable.evaluate()> calls method <jmri.jmrit.logix.Warrant.getRunMode()> in (ConditionalVariable.java:595)

diff --git a/...tore/10319f6f-901b-48a6-8a5e-483103dddc21 → ...tore/84324b13-47c7-4ccb-9494-e59787afc534 b/...tore/10319f6f-901b-48a6-8a5e-483103dddc21 → ...tore/84324b13-47c7-4ccb-9494-e59787afc534
@@ -4,12 +4,6 @@ Constructor <jmri.ConditionalVariable.<init>(boolean, jmri.Conditional$Operator,
 Method <jmri.AudioManager.getActiveAudioFactory()> has return type <jmri.jmrit.audio.AudioFactory> in (AudioManager.java:0)
 Method <jmri.BlockManager$1.run()> calls constructor <jmri.jmrit.display.layoutEditor.BlockValueFile.<init>()> in (BlockManager.java:47)
 Method <jmri.BlockManager$1.run()> calls method <jmri.jmrit.display.layoutEditor.BlockValueFile.writeBlockValues()> in (BlockManager.java:47)
-Method <jmri.BlockManager.getBlocksOccupiedByRosterEntry(jmri.jmrit.roster.RosterEntry)> has parameter of type <jmri.jmrit.roster.RosterEntry> in (BlockManager.java:0)
-Method <jmri.BlockManager.lambda$getBlocksOccupiedByRosterEntry$1(jmri.jmrit.roster.RosterEntry, java.util.List, jmri.Block)> calls method <jmri.jmrit.roster.RosterEntry.getDccAddress()> in (BlockManager.java:265)
-Method <jmri.BlockManager.lambda$getBlocksOccupiedByRosterEntry$1(jmri.jmrit.roster.RosterEntry, java.util.List, jmri.Block)> calls method <jmri.jmrit.roster.RosterEntry.getId()> in (BlockManager.java:264)
-Method <jmri.BlockManager.lambda$getBlocksOccupiedByRosterEntry$1(jmri.jmrit.roster.RosterEntry, java.util.List, jmri.Block)> has parameter of type <jmri.jmrit.roster.RosterEntry> in (BlockManager.java:0)
-Method <jmri.CatalogTree.getRoot()> has return type <jmri.jmrit.catalog.CatalogTreeNode> in (CatalogTree.java:0)
-Method <jmri.CatalogTree.insertNodes(java.lang.String, java.lang.String, jmri.jmrit.catalog.CatalogTreeNode)> has parameter of type <jmri.jmrit.catalog.CatalogTreeNode> in (CatalogTree.java:0)
 Method <jmri.ConditionalAction.getSound()> has return type <jmri.jmrit.Sound> in (ConditionalAction.java:0)
 Method <jmri.ConditionalVariable.evaluate()> calls method <jmri.jmrit.logix.OBlock.statusIs(java.lang.String)> in (ConditionalVariable.java:622)
 Method <jmri.ConditionalVariable.evaluate()> calls method <jmri.jmrit.logix.OBlockManager.getOBlock(java.lang.String)> in (ConditionalVariable.java:617)

diff --git a/...tore/3d80424b-f1d3-4605-bb5c-133d739b6d0f → ...tore/c240fd69-85bb-485e-af60-5c59a4b51978 b/...tore/3d80424b-f1d3-4605-bb5c-133d739b6d0f → ...tore/c240fd69-85bb-485e-af60-5c59a4b51978
diff --git a/...tore/f6610449-23bd-48c8-a5c1-99de40e7b760 → ...tore/f32654a4-1dcc-4e71-aab2-75039c24bbf4 b/...tore/f6610449-23bd-48c8-a5c1-99de40e7b760 → ...tore/f32654a4-1dcc-4e71-aab2-75039c24bbf4
diff --git a/archunit_store/stored.rules b/archunit_store/stored.rules
@@ -1,8 +1,8 @@
 #
-#Mon Jun 15 07:48:37 PDT 2020
-classes\ that\ reside\ in\ a\ package\ 'jmri.jmrit..'\ should\ only\ be\ accessed\ by\ any\ package\ ['jmri.jmrit..',\ 'apps..']=43584a34-ede9-4223-b3be-36efe2509048
-no\ classes\ that\ reside\ in\ a\ package\ 'jmri.util..'\ should\ depend\ on\ classes\ that\ reside\ outside\ of\ packages\ ['jmri',\ 'jmri.util..',\ 'java..',\ 'javax..',\ 'org..']=1d46097e-ad2a-4f96-89c1-26b33443d047
-classes\ that\ reside\ in\ a\ package\ 'jmri.jmrix..'\ should\ only\ be\ accessed\ by\ any\ package\ ['jmri.jmrix..',\ 'apps..']=3d80424b-f1d3-4605-bb5c-133d739b6d0f
-no\ classes\ that\ reside\ in\ a\ package\ 'jmri.jmris'\ should\ depend\ on\ classes\ that\ reside\ in\ a\ package\ 'jmri.jmrit..'=c4b353e5-9817-4cd4-9672-b8b4150544d7
-no\ classes\ that\ reside\ in\ a\ package\ 'jmri'\ should\ depend\ on\ classes\ that\ reside\ in\ a\ package\ 'jmri.jmrit..'=10319f6f-901b-48a6-8a5e-483103dddc21
-classes\ that\ reside\ in\ a\ package\ 'apps..'\ should\ only\ be\ accessed\ by\ any\ package\ ['apps..']=f6610449-23bd-48c8-a5c1-99de40e7b760
+#Mon Jun 15 14:47:33 PDT 2020
+classes\ that\ reside\ in\ a\ package\ 'jmri.jmrit..'\ should\ only\ be\ accessed\ by\ any\ package\ ['jmri.jmrit..',\ 'apps..']=788ffcd8-d213-479d-a8a6-d7854e18adef
+no\ classes\ that\ reside\ in\ a\ package\ 'jmri.util..'\ should\ depend\ on\ classes\ that\ reside\ outside\ of\ packages\ ['jmri',\ 'jmri.util..',\ 'java..',\ 'javax..',\ 'org..']=1399b807-0aa3-487f-8c8a-1ff1268293fd
+classes\ that\ reside\ in\ a\ package\ 'jmri.jmrix..'\ should\ only\ be\ accessed\ by\ any\ package\ ['jmri.jmrix..',\ 'apps..']=c240fd69-85bb-485e-af60-5c59a4b51978
+no\ classes\ that\ reside\ in\ a\ package\ 'jmri.jmris'\ should\ depend\ on\ classes\ that\ reside\ in\ a\ package\ 'jmri.jmrit..'=0593c15b-2922-4e2d-8f6d-cc41a895be82
+no\ classes\ that\ reside\ in\ a\ package\ 'jmri'\ should\ depend\ on\ classes\ that\ reside\ in\ a\ package\ 'jmri.jmrit..'=84324b13-47c7-4ccb-9494-e59787afc534
+classes\ that\ reside\ in\ a\ package\ 'apps..'\ should\ only\ be\ accessed\ by\ any\ package\ ['apps..']=f32654a4-1dcc-4e71-aab2-75039c24bbf4
diff --git a/java/src/jmri/BlockManager.java b/java/src/jmri/BlockManager.java
@@ -255,12 +255,12 @@ public String getBeanTypeHandled(boolean plural) {
      */
     @CheckReturnValue
     @Nonnull
-    public List<Block> getBlocksOccupiedByRosterEntry(@Nonnull RosterEntry re) {
+    public List<Block> getBlocksOccupiedByRosterEntry(@Nonnull BasicRosterEntry re) {
         List<Block> blockList = new ArrayList<>();
         getNamedBeanSet().stream().forEach(b -> {
             if (b != null) {
                 Object obj = b.getValue();
-                if ((obj instanceof RosterEntry && obj == re) ||
+                if ((obj instanceof BasicRosterEntry && obj == re) ||
                         obj.toString().equals(re.getId()) ||
                         obj.toString().equals(re.getDccAddress())) {
                     blockList.add(b);

diff --git a/java/src/jmri/CatalogTree.java b/java/src/jmri/CatalogTree.java
@@ -1,7 +1,6 @@
 package jmri;
 
 import javax.swing.tree.TreeModel;
-import jmri.jmrit.catalog.CatalogTreeNode;
 
 /**
  * Represents a CatalogTree, a tree displaying a taxonomy - e.g. a file system

diff --git a/...c/jmri/jmrit/catalog/CatalogTreeLeaf.java → java/src/jmri/CatalogTreeLeaf.java b/...c/jmri/jmrit/catalog/CatalogTreeLeaf.java → java/src/jmri/CatalogTreeLeaf.java
@@ -1,4 +1,4 @@
-package jmri.jmrit.catalog;
+package jmri;
 
 /**
  * Leaf of a CatalogTree.

diff --git a/...c/jmri/jmrit/catalog/CatalogTreeNode.java → java/src/jmri/CatalogTreeNode.java b/...c/jmri/jmrit/catalog/CatalogTreeNode.java → java/src/jmri/CatalogTreeNode.java
@@ -1,8 +1,8 @@
-package jmri.jmrit.catalog;
+package jmri;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
-import javax.swing.tree.DefaultMutableTreeNode;
+import jmri.util.swing.DefaultMutableTreeNode;
 import javax.swing.tree.TreeNode;
 
 /**
@@ -39,21 +39,6 @@ public void addLeaf(CatalogTreeLeaf leaf) {
      * @param path path to the new leaf
      */
     public void addLeaf(String name, String path) {
-        // check path
-        //        NamedIcon icon = NamedIcon.getIconByName(path);
-        //        if (icon == null) {
-        //            log.warn("path \" {} \" is not a NamedIcon.", path);
-        //            return;
-        //        }
-        //        int h = icon.getIconHeight();
-        //        log.debug("_leafs size {}", _leafs.size());
-        //        for (int i = 0; i < _leafs.size(); i++) {
-        //            CatalogTreeLeaf leaf = _leafs.get(i);
-        //            if (h < leaf.getSize()) {
-        //                _leafs.add(i + 1, new CatalogTreeLeaf(name, path, h));
-        //                return;
-        //            }
-        //        }
         int h = 0;
         _leafs.add(new CatalogTreeLeaf(name, path, h)); //  name is non-localized
     }

diff --git a/java/src/jmri/jmrit/catalog/AbstractCatalogTree.java b/java/src/jmri/jmrit/catalog/AbstractCatalogTree.java
@@ -8,6 +8,7 @@
 import javax.annotation.Nonnull;
 import javax.swing.tree.DefaultTreeModel;
 import jmri.CatalogTree;
+import jmri.CatalogTreeNode;
 import jmri.NamedBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/java/src/jmri/jmrit/catalog/CatalogPanel.java b/java/src/jmri/jmrit/catalog/CatalogPanel.java
@@ -32,6 +32,8 @@
 import javax.swing.tree.*;
 
 import jmri.CatalogTree;
+import jmri.CatalogTreeNode;
+import jmri.CatalogTreeLeaf;
 import jmri.CatalogTreeManager;
 import jmri.InstanceManager;
 import jmri.jmrit.display.Editor;

diff --git a/java/src/jmri/jmrit/catalog/CatalogTreeFS.java b/java/src/jmri/jmrit/catalog/CatalogTreeFS.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.util.HashMap;
+import jmri.CatalogTreeNode;
 import org.apache.commons.io.FilenameUtils;
 
 /**

diff --git a/java/src/jmri/jmrit/catalog/CatalogTreeIndex.java b/java/src/jmri/jmrit/catalog/CatalogTreeIndex.java
@@ -1,6 +1,8 @@
 package jmri.jmrit.catalog;
 
 import java.util.HashMap;
+import jmri.CatalogTreeNode;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/java/src/jmri/jmrit/catalog/DefaultCatalogTreeManager.java b/java/src/jmri/jmrit/catalog/DefaultCatalogTreeManager.java
@@ -2,6 +2,8 @@
 
 import java.util.Set;
 import jmri.CatalogTree;
+import jmri.CatalogTreeLeaf;
+import jmri.CatalogTreeNode;
 import jmri.CatalogTreeManager;
 import jmri.InstanceInitializer;
 import jmri.InstanceManager;

diff --git a/java/src/jmri/jmrit/catalog/ImageIndexEditor.java b/java/src/jmri/jmrit/catalog/ImageIndexEditor.java
@@ -19,6 +19,7 @@
 import javax.swing.tree.*;
 
 import jmri.CatalogTreeManager;
+import jmri.CatalogTreeNode;
 import jmri.InstanceInitializer;
 import jmri.InstanceManager;
 import jmri.implementation.AbstractInstanceInitializer;

diff --git a/java/src/jmri/jmrit/catalog/configurexml/DefaultCatalogTreeManagerXml.java b/java/src/jmri/jmrit/catalog/configurexml/DefaultCatalogTreeManagerXml.java
@@ -10,8 +10,8 @@
 import jmri.CatalogTreeManager;
 import jmri.InstanceManager;
 import jmri.jmrit.XmlFile;
-import jmri.jmrit.catalog.CatalogTreeLeaf;
-import jmri.jmrit.catalog.CatalogTreeNode;
+import jmri.CatalogTreeLeaf;
+import jmri.CatalogTreeNode;
 import jmri.util.FileUtil;
 import org.jdom2.Attribute;
 import org.jdom2.Document;

diff --git a/java/src/jmri/jmrit/display/IconAdder.java b/java/src/jmri/jmrit/display/IconAdder.java
@@ -34,8 +34,8 @@
 import jmri.NamedBean;
 import jmri.SignalHead;
 import jmri.jmrit.catalog.CatalogPanel;
-import jmri.jmrit.catalog.CatalogTreeLeaf;
-import jmri.jmrit.catalog.CatalogTreeNode;
+import jmri.CatalogTreeLeaf;
+import jmri.CatalogTreeNode;
 import jmri.jmrit.catalog.ImageIndexEditor;
 import jmri.jmrit.catalog.NamedIcon;
 import jmri.jmrit.picker.PickListModel;

diff --git a/java/src/jmri/jmrit/display/MultiSensorIconAdder.java b/java/src/jmri/jmrit/display/MultiSensorIconAdder.java
@@ -33,8 +33,8 @@
 import jmri.InstanceManager;
 import jmri.NamedBeanHandle;
 import jmri.Sensor;
-import jmri.jmrit.catalog.CatalogTreeLeaf;
-import jmri.jmrit.catalog.CatalogTreeNode;
+import jmri.CatalogTreeLeaf;
+import jmri.CatalogTreeNode;
 import jmri.jmrit.catalog.NamedIcon;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/java/src/jmri/jmrit/display/palette/ItemPalette.java b/java/src/jmri/jmrit/display/palette/ItemPalette.java
@@ -26,8 +26,8 @@
 import jmri.CatalogTree;
 import jmri.CatalogTreeManager;
 import jmri.InstanceManager;
-import jmri.jmrit.catalog.CatalogTreeLeaf;
-import jmri.jmrit.catalog.CatalogTreeNode;
+import jmri.CatalogTreeLeaf;
+import jmri.CatalogTreeNode;
 import jmri.jmrit.catalog.DirectorySearcher;
 import jmri.jmrit.catalog.ImageIndexEditor;
 import jmri.jmrit.catalog.NamedIcon;

diff --git a/java/src/jmri/util/swing/DefaultMutableTreeNode.java b/java/src/jmri/util/swing/DefaultMutableTreeNode.java
@@ -0,0 +1,18 @@
+package jmri.util.swing;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Facial subclass for {@link javax.swing.tree.DefaultMutableTreeNode}
+ * to limit linkage for i.e. {@link jmri.CatalogTreeNode} use.
+ *
+ * @author Bob Jacobsen
+ */
+@SuppressFBWarnings(value = "NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification = "Desired pattern is repeated class names to shift dependency")
+public class DefaultMutableTreeNode extends javax.swing.tree.DefaultMutableTreeNode {
+
+    public DefaultMutableTreeNode(String name) {
+        super(name);
+    }
+
+}
diff --git a/...ri/jmrit/catalog/CatalogTreeLeafTest.java → java/test/jmri/CatalogTreeLeafTest.java b/...ri/jmrit/catalog/CatalogTreeLeafTest.java → java/test/jmri/CatalogTreeLeafTest.java
@@ -1,4 +1,4 @@
-package jmri.jmrit.catalog;
+package jmri;
 
 import org.junit.After;
 import org.junit.Assert;

diff --git a/...ri/jmrit/catalog/CatalogTreeNodeTest.java → java/test/jmri/CatalogTreeNodeTest.java b/...ri/jmrit/catalog/CatalogTreeNodeTest.java → java/test/jmri/CatalogTreeNodeTest.java
@@ -1,4 +1,4 @@
-package jmri.jmrit.catalog;
+package jmri;
 
 import jmri.util.JUnitUtil;
 import org.junit.After;

diff --git a/.../jmri/jmrit/display/layoutEditor/loadref/linux/Sidlo-2020-04-Chotebor.xml.6.png b/.../jmri/jmrit/display/layoutEditor/loadref/linux/Sidlo-2020-04-Chotebor.xml.6.png
diff --git a/.../jmri/jmrit/display/layoutEditor/loadref/macos/Sidlo-2020-04-Chotebor.xml.6.png b/.../jmri/jmrit/display/layoutEditor/loadref/macos/Sidlo-2020-04-Chotebor.xml.6.png
diff --git a/...mri/jmrit/display/layoutEditor/loadref/windows/Sidlo-2020-04-Chotebor.xml.6.png b/...mri/jmrit/display/layoutEditor/loadref/windows/Sidlo-2020-04-Chotebor.xml.6.png
diff --git a/...ri/jmrit/display/layoutEditor/loadref/windows7/Sidlo-2020-04-Chotebor.xml.6.png b/...ri/jmrit/display/layoutEditor/loadref/windows7/Sidlo-2020-04-Chotebor.xml.6.png