From fa98826542387d501757155c214b5f5939748772 Mon Sep 17 00:00:00 2001 From: hneemann Date: Thu, 26 Nov 2020 15:25:51 +0100 Subject: [PATCH] adds a missing language key --- src/main/java/de/neemann/digital/gui/Main.java | 8 ++++---- .../digital/gui/components/testing/ValueTableDialog.java | 2 +- src/main/resources/lang/lang_de.xml | 1 + src/main/resources/lang/lang_en.xml | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java index 4831741f9..a43ea4a5d 100644 --- a/src/main/java/de/neemann/digital/gui/Main.java +++ b/src/main/java/de/neemann/digital/gui/Main.java @@ -1600,10 +1600,10 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS SwingUtilities.invokeLater(() -> { if (model != null && model.isRunning()) { try { - advanceSimulator.advance(Main.this); + advanceSimulator.advance(model); circuitComponent.graphicHasChanged(); } catch (Exception e) { - showError("Message", e); + showError(Lang.get("msg_errorSettingModelToTestCase"), e); } } }); @@ -2141,9 +2141,9 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS /** * Advances the model to a certain state * - * @param main main + * @param model the model * @throws Exception Exception */ - void advance(Main main) throws Exception; + void advance(Model model) throws Exception; } } diff --git a/src/main/java/de/neemann/digital/gui/components/testing/ValueTableDialog.java b/src/main/java/de/neemann/digital/gui/components/testing/ValueTableDialog.java index 68ef503b9..f2cfaae50 100644 --- a/src/main/java/de/neemann/digital/gui/components/testing/ValueTableDialog.java +++ b/src/main/java/de/neemann/digital/gui/components/testing/ValueTableDialog.java @@ -189,7 +189,7 @@ public class ValueTableDialog extends JDialog { TestRow row = vtm.getRow(r); if (owner instanceof Main) { Main main = (Main) owner; - main.startSimulation(m -> new TestExecutor(valueTableHolder.testCaseDescription, m.getModel()).executeTo(row.getRow())); + main.startSimulation(m -> new TestExecutor(valueTableHolder.testCaseDescription, m).executeTo(row.getRow())); } } } diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml index 71b2e76b6..8b1886c76 100644 --- a/src/main/resources/lang/lang_de.xml +++ b/src/main/resources/lang/lang_de.xml @@ -2004,6 +2004,7 @@ Stellen Sie sicher, dass der Flash-Vorgang abgeschlossen ist, bevor Sie diesen D Kopiert den Text in die Zwischenablage. Exportierbar zu VHDL/Verilog. + Fehler beim Setzen der Zeile des Testfalles. Ok diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml index bcf34adab..8729bd362 100644 --- a/src/main/resources/lang/lang_en.xml +++ b/src/main/resources/lang/lang_en.xml @@ -2017,6 +2017,7 @@ Do you really want to discard the changes in the "{0}" field? Exportable to VHDL/Verilog. + Error while setting the test case row. Video mode was not detected ({0})