From 8771ec436166b9a7f8d77faf21f76f587f3d5dc9 Mon Sep 17 00:00:00 2001 From: hneemann Date: Wed, 24 Jan 2018 22:53:29 +0100 Subject: [PATCH] fixed wrong error message --- .../gui/components/table/TableDialog.java | 2 +- .../table/hardware/GenerateFile.java | 20 +++++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java b/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java index 39f9f138c..0afe4a91f 100644 --- a/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java +++ b/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java @@ -800,7 +800,7 @@ public class TableDialog extends JDialog { generator.generate(TableDialog.this, filename, model.getTable(), lastGeneratedExpressions); setLastUsedGenerator(generator); } catch (Exception e1) { - new ErrorMessage(Lang.get("msg_errorDuringCalculation")).addCause(e1).show(TableDialog.this); + new ErrorMessage(Lang.get("msg_errorDuringHardwareExport")).addCause(e1).show(TableDialog.this); } } } diff --git a/src/main/java/de/neemann/digital/gui/components/table/hardware/GenerateFile.java b/src/main/java/de/neemann/digital/gui/components/table/hardware/GenerateFile.java index dd97a8e3e..3b47be24e 100644 --- a/src/main/java/de/neemann/digital/gui/components/table/hardware/GenerateFile.java +++ b/src/main/java/de/neemann/digital/gui/components/table/hardware/GenerateFile.java @@ -1,24 +1,18 @@ package de.neemann.digital.gui.components.table.hardware; import de.neemann.digital.analyse.TruthTable; -import de.neemann.digital.analyse.expression.ExpressionException; -import de.neemann.digital.analyse.expression.format.FormatterException; import de.neemann.digital.analyse.expression.modify.ExpressionModifier; import de.neemann.digital.builder.ExpressionToFileExporter; -import de.neemann.digital.builder.PinMapException; -import de.neemann.digital.builder.jedec.FuseMapFillerException; import de.neemann.digital.gui.SaveAsHelper; import de.neemann.digital.gui.components.table.BuilderExpressionCreator; import de.neemann.digital.gui.components.table.ExpressionListenerStore; import de.neemann.digital.lang.Lang; -import de.neemann.gui.ErrorMessage; import de.neemann.gui.LineBreaker; import de.neemann.gui.MyFileChooser; import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter; import java.io.File; -import java.io.IOException; import java.util.ArrayList; /** @@ -79,15 +73,11 @@ public class GenerateFile implements HardwareDescriptionGenerator { fileChooser.setFileFilter(new FileNameExtensionFilter("JEDEC", suffix)); fileChooser.setSelectedFile(circuitFile); if (fileChooser.showSaveDialog(parent) == JFileChooser.APPROVE_OPTION) { - try { - ExpressionToFileExporter expressionExporter = factory.create(); - expressionExporter.getPinMapping().addAll(table.getPins()); - expressionExporter.getPinMapping().setClockPin(table.getClockPinInt()); - new BuilderExpressionCreator(expressionExporter.getBuilder(), ExpressionModifier.IDENTITY).create(expressions); - expressionExporter.export(SaveAsHelper.checkSuffix(fileChooser.getSelectedFile(), suffix)); - } catch (ExpressionException | FormatterException | IOException | FuseMapFillerException | PinMapException e) { - new ErrorMessage(Lang.get("msg_errorDuringHardwareExport")).addCause(e).show(parent); - } + ExpressionToFileExporter expressionExporter = factory.create(); + expressionExporter.getPinMapping().addAll(table.getPins()); + expressionExporter.getPinMapping().setClockPin(table.getClockPinInt()); + new BuilderExpressionCreator(expressionExporter.getBuilder(), ExpressionModifier.IDENTITY).create(expressions); + expressionExporter.export(SaveAsHelper.checkSuffix(fileChooser.getSelectedFile(), suffix)); } }