renamed a method

src/main/java/de/neemann/digital/draw/elements/Circuit.java

@@ -326,6 +326,20 @@ public class Circuit implements Copyable<Circuit> {
         return visualElements;
     }
 
+    /**
+     * Find specific visual elements
+     *
+     * @param filter the filter
+     * @return the elements
+     */
+    public List<VisualElement> getElements(Circuit.ElementFilter filter) {
+        ArrayList<VisualElement> found = new ArrayList<>();
+        for (VisualElement v : visualElements)
+            if (filter.accept(v))
+                found.add(v);
+        return found;
+    }
+
     /**
      * Returns a list of all Moveables in the given rectangle.
      *
@@ -588,20 +602,6 @@ public class Circuit implements Copyable<Circuit> {
         return best;
     }
 
-    /**
-     * Find specific visual elements
-     *
-     * @param filter the filter
-     * @return the elements
-     */
-    public List<VisualElement> findElements(Circuit.ElementFilter filter) {
-        ArrayList<VisualElement> found = new ArrayList<>();
-        for (VisualElement v : visualElements)
-            if (filter.accept(v))
-                found.add(v);
-        return found;
-    }
-
     /**
      * Deletes the references to the ObservableValues representing the elements or wire state.
      * So this circuit is detached from a generated model.

src/main/java/de/neemann/digital/gui/components/CircuitComponent.java

@@ -1139,13 +1139,11 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
     private Modification<Circuit> checkNetRename(VisualElement element, ElementAttributes modified, Modification<Circuit> mod) {
         String oldName = element.getElementAttributes().get(Keys.NETNAME);
         if (element.equalsDescription(Tunnel.DESCRIPTION) && modified.contains(Keys.NETNAME) && !oldName.isEmpty()) {
-            ArrayList<VisualElement> others = new ArrayList<>();
+
-            for (VisualElement el : getCircuit().getElements())
+            List<VisualElement> others = getCircuit().getElements(el -> el != element
-                if (el != element
+                    && el.equalsDescription(Tunnel.DESCRIPTION)
-                        && el.equalsDescription(Tunnel.DESCRIPTION)
+                    && el.getElementAttributes().get(Keys.NETNAME).equals(oldName));
-                        && el.getElementAttributes().get(Keys.NETNAME).equals(oldName)) {
+
-                    others.add(el);
-                }
             if (others.size() > 0) {
                 String newName = modified.get(Keys.NETNAME);
                 int res = JOptionPane.showConfirmDialog(this,

src/main/java/de/neemann/digital/toolchain/Configuration.java

@@ -411,7 +411,7 @@ public final class Configuration {
     }
 
     private int getFrequency() throws HGSEvalException {
-        List<VisualElement> l = circuitProvider.getCurrentCircuit().findElements(v -> v.equalsDescription(Clock.DESCRIPTION));
+        List<VisualElement> l = circuitProvider.getCurrentCircuit().getElements(v -> v.equalsDescription(Clock.DESCRIPTION));
         if (l.isEmpty())
             return 0;
         if (l.size() > 1)

src/test/java/de/neemann/digital/builder/circuit/CircuitBuilderTest.java

@@ -216,12 +216,12 @@ public class CircuitBuilderTest extends TestCase {
         Circuit circuit = circuitBuilder.createCircuit();
 
         // check
-        List<VisualElement> in = circuit.findElements(v -> v.equalsDescription(In.DESCRIPTION));
+        List<VisualElement> in = circuit.getElements(v -> v.equalsDescription(In.DESCRIPTION));
         assertEquals(2, in.size());
         checkPin(in.get(0), "A", "1,2,3,4");
         checkPin(in.get(1), "B", "5,6,7,8");
 
-        List<VisualElement> out = circuit.findElements(v -> v.equalsDescription(Out.DESCRIPTION));
+        List<VisualElement> out = circuit.getElements(v -> v.equalsDescription(Out.DESCRIPTION));
         assertEquals(2, out.size());
         checkPin(out.get(0), "S", "9,10,11,12");
         checkPin(out.get(1), "U", "13,14,15,16");

src/test/java/de/neemann/digital/integration/TestInGUI.java

@@ -964,6 +964,7 @@ public class TestInGUI extends TestCase {
                 .press("ENTER")
                 .delay(200)
                 .add(new GuiTester.CheckTextInWindow<>(JDialog.class, "'net'"))
+                .add(new GuiTester.CheckTextInWindow<>(JDialog.class, " 2 "))
                 .delay(200)
                 .press("ENTER")
                 .delay(200)
@@ -971,7 +972,7 @@ public class TestInGUI extends TestCase {
                     @Override
                     public void checkWindow(GuiTester guiTester, Main main) {
                         List<VisualElement> e = main.getCircuitComponent().getCircuit()
-                                .findElements(v -> v.equalsDescription(Tunnel.DESCRIPTION));
+                                .getElements(v -> v.equalsDescription(Tunnel.DESCRIPTION));
                         assertEquals(3, e.size());
                         for (VisualElement v : e)
                             assertEquals("net", v.getElementAttributes().get(Keys.NETNAME));
@@ -1189,7 +1190,7 @@ public class TestInGUI extends TestCase {
             List<VisualElement> el = main
                     .getCircuitComponent()
                     .getCircuit()
-                    .findElements(v -> v.equalsDescription(description));
+                    .getElements(v -> v.equalsDescription(description));
 
             assertEquals("not exact one " + description.getName() + " found in circuit", 1, el.size());
 
@@ -1218,7 +1219,7 @@ public class TestInGUI extends TestCase {
             List<VisualElement> el = main
                     .getCircuitComponent()
                     .getCircuit()
-                    .findElements(filter);
+                    .getElements(filter);
 
             assertEquals("not exact one element found in circuit", 1, el.size());
 

src/test/java/de/neemann/digital/toolchain/RegressionTest.java

@@ -30,7 +30,7 @@ public class RegressionTest extends TestCase {
     public void testSimple() throws Exception {
         ioInterface = new ConfigurationTest.TestIOInterface();
         br = new ToBreakRunner(new File(Resources.getRoot(), "toolchain/ff.dig"));
-        clock = br.getCircuit().findElements(v -> v.equalsDescription(Clock.DESCRIPTION)).get(0);
+        clock = br.getCircuit().getElements(v -> v.equalsDescription(Clock.DESCRIPTION)).get(0);
         File root = new File(Resources.getRoot(), "../../main/dig/hdl");
         int fc = new FileScanner(this::doCheck).setSuffix(".config").scan(root);