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

better handling of CUPL filenames

Browse Source
This commit is contained in:
hneemann 2016-12-21 08:44:45 +01:00
parent 25d80b2d1b
commit 8a0cabe4a5
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,12 +448,27 @@ public class TableDialog extends JDialog {
private void createCUPL(Gal16v8CuplExporter cupl) {
try {
if (filename == null)
throw new IOException(Lang.get("err_noFileNameAvailable"));
String name = filename.getName();
if (name.endsWith(".dig")) name = name.substring(0, name.length() - 4);
File cuplPath = new File(filename.getParentFile(), "CUPL_" + name);
File cuplPath;
if (filename == null) {
JFileChooser fc = new JFileChooser();
fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
fc.setDialogTitle(Lang.get("msg_selectAnEmptyFolder"));
if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) {
cuplPath = fc.getSelectedFile();
filename = cuplPath;
} else {
return;
}
} else {
if (filename.isDirectory()) {
cuplPath = filename;
} else {
String name = filename.getName();
if (name.length() > 3 && name.charAt(name.length() - 4) == '.')
name = name.substring(0, name.length() - 4);
cuplPath = new File(filename.getParentFile(), "CUPL_" + name);
}
}
if (!cuplPath.mkdirs())
if (!cuplPath.exists())

2
src/main/resources/lang/lang_de.xml
View File

@ -258,7 +258,6 @@ Zur Analyse können Sie die Schaltung im Gatterschrittmodus ausführen.</string>
<string name="err_openingDocumentation">Browser konnte nicht geöffnet werden.</string>
<string name="err_splitterDoesNotSupportHighZInputs">Der Splitter unterstützt keine HighZ Eingänge! Verwenden Sie einen PullUp- oder PullDown-Widerstand</string>
<string name="err_splitterAllowsOnlyOneHighZInput">Ein Splitter der hochohmige Eingänge erlaubt, kann nur einen Eingang haben!</string>
<string name="err_noFileNameAvailable">Die Datei wurde noch nicht gespeichert!</string>
<string name="err_couldNotCreateFolder_N0">Konnte den Order '{0}' nicht erzeugen!</string>
<string name="key_AddrBits">Adress-Bits</string>
@ -499,6 +498,7 @@ Die Icons stammen aus dem Tango Desktop Project.</string>
<string name="msg_errorSavingData">Speichern der Daten fehlgeschlagen!</string>
<string name="msg_creatingHelp">Fehler bei der Erzeugung der Hilfe!</string>
<string name="msg_clipboardContainsNoImportableData">In der Zwischenablage befinden sich keine importierbaren Daten!</string>
<string name="msg_selectAnEmptyFolder">Wählen Sie einen leeren Ordner aus!</string>
<string name="ok">Ok</string>
<string name="rot_0">0°</string>
<string name="rot_180">180°</string>

2
src/main/resources/lang/lang_en.xml
View File

@ -251,7 +251,6 @@ To analyse you can run the circuit in single gate step mode.</string>
<string name="err_openingDocumentation">Could not open the browser.</string>
<string name="err_splitterDoesNotSupportHighZInputs">The splitter does not support high z inputs! Use a pull up or pull down resisitor.</string>
<string name="err_splitterAllowsOnlyOneHighZInput">A splitter which allows high z inputs can only have one input!</string>
<string name="err_noFileNameAvailable">File not saved already! There is no filename avaiable!</string>
<string name="err_couldNotCreateFolder_N0">Could not create folder '{0}'!</string>
<string name="key_AddrBits">Address Bits</string>
@ -492,6 +491,7 @@ The icons are taken from the Tango Desktop Project.</string>
<string name="msg_errorSavingData">Error writing the data!</string>
<string name="msg_creatingHelp">Error creating the help!</string>
<string name="msg_clipboardContainsNoImportableData">The clipboard contains no importable data!</string>
<string name="msg_selectAnEmptyFolder">Select an empty folder!</string>
<string name="ok">Ok</string>
<string name="rot_0">0°</string>
<string name="rot_180">180°</string>