TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-18 09:24:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed wrong error message

Browse Source
This commit is contained in:
hneemann 2018-01-24 22:53:29 +01:00
parent 952629fd2b
commit 8771ec4361
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/neemann/digital/gui/components/table/TableDialog.java
View File

@ -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);
}
}
}

20
src/main/java/de/neemann/digital/gui/components/table/hardware/GenerateFile.java
View File

@ -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));
}
}