From 173a2172cf2ac4ad44368ba1557f2b73a28f9b09 Mon Sep 17 00:00:00 2001 From: hneemann Date: Wed, 28 Aug 2019 09:59:01 +0200 Subject: [PATCH] renamed a method --- .../digital/draw/elements/Circuit.java | 28 +++++++++---------- .../gui/components/CircuitComponent.java | 12 ++++---- .../digital/toolchain/Configuration.java | 2 +- .../builder/circuit/CircuitBuilderTest.java | 4 +-- .../digital/integration/TestInGUI.java | 7 +++-- .../digital/toolchain/RegressionTest.java | 2 +- 6 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/main/java/de/neemann/digital/draw/elements/Circuit.java b/src/main/java/de/neemann/digital/draw/elements/Circuit.java index 5d2ed0ab7..19f9993c0 100644 --- a/src/main/java/de/neemann/digital/draw/elements/Circuit.java +++ b/src/main/java/de/neemann/digital/draw/elements/Circuit.java @@ -326,6 +326,20 @@ public class Circuit implements Copyable { return visualElements; } + /** + * Find specific visual elements + * + * @param filter the filter + * @return the elements + */ + public List getElements(Circuit.ElementFilter filter) { + ArrayList 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 { return best; } - /** - * Find specific visual elements - * - * @param filter the filter - * @return the elements - */ - public List findElements(Circuit.ElementFilter filter) { - ArrayList 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. diff --git a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java index ff96afed0..62aa16df4 100644 --- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java +++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java @@ -1139,13 +1139,11 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib private Modification checkNetRename(VisualElement element, ElementAttributes modified, Modification mod) { String oldName = element.getElementAttributes().get(Keys.NETNAME); if (element.equalsDescription(Tunnel.DESCRIPTION) && modified.contains(Keys.NETNAME) && !oldName.isEmpty()) { - ArrayList others = new ArrayList<>(); - for (VisualElement el : getCircuit().getElements()) - if (el != element - && el.equalsDescription(Tunnel.DESCRIPTION) - && el.getElementAttributes().get(Keys.NETNAME).equals(oldName)) { - others.add(el); - } + + List others = getCircuit().getElements(el -> el != element + && el.equalsDescription(Tunnel.DESCRIPTION) + && el.getElementAttributes().get(Keys.NETNAME).equals(oldName)); + if (others.size() > 0) { String newName = modified.get(Keys.NETNAME); int res = JOptionPane.showConfirmDialog(this, diff --git a/src/main/java/de/neemann/digital/toolchain/Configuration.java b/src/main/java/de/neemann/digital/toolchain/Configuration.java index 1fb5cfc3e..eb0a403f2 100644 --- a/src/main/java/de/neemann/digital/toolchain/Configuration.java +++ b/src/main/java/de/neemann/digital/toolchain/Configuration.java @@ -411,7 +411,7 @@ public final class Configuration { } private int getFrequency() throws HGSEvalException { - List l = circuitProvider.getCurrentCircuit().findElements(v -> v.equalsDescription(Clock.DESCRIPTION)); + List l = circuitProvider.getCurrentCircuit().getElements(v -> v.equalsDescription(Clock.DESCRIPTION)); if (l.isEmpty()) return 0; if (l.size() > 1) diff --git a/src/test/java/de/neemann/digital/builder/circuit/CircuitBuilderTest.java b/src/test/java/de/neemann/digital/builder/circuit/CircuitBuilderTest.java index 8e43f17a1..28858c0b5 100644 --- a/src/test/java/de/neemann/digital/builder/circuit/CircuitBuilderTest.java +++ b/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 in = circuit.findElements(v -> v.equalsDescription(In.DESCRIPTION)); + List 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 out = circuit.findElements(v -> v.equalsDescription(Out.DESCRIPTION)); + List 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"); diff --git a/src/test/java/de/neemann/digital/integration/TestInGUI.java b/src/test/java/de/neemann/digital/integration/TestInGUI.java index a493e1048..b18a3783a 100644 --- a/src/test/java/de/neemann/digital/integration/TestInGUI.java +++ b/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 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 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 el = main .getCircuitComponent() .getCircuit() - .findElements(filter); + .getElements(filter); assertEquals("not exact one element found in circuit", 1, el.size()); diff --git a/src/test/java/de/neemann/digital/toolchain/RegressionTest.java b/src/test/java/de/neemann/digital/toolchain/RegressionTest.java index bdd2bfb66..d67486a59 100644 --- a/src/test/java/de/neemann/digital/toolchain/RegressionTest.java +++ b/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);