hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Confirm file overwrite

Browse Source
This commit is contained in:
SiboVG 2023-03-14 00:20:00 +01:00
parent 1b7213e21f
commit 05561b2872
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
View File

@ -648,13 +648,18 @@ public class SimulationPanel extends JPanel {
JFileChooser fch = this.setUpFileChooser(); JFileChooser fch = this.setUpFileChooser();
int selectionStatus = fch.showSaveDialog(tableParent); int selectionStatus = fch.showSaveDialog(tableParent);
if (selectionStatus != JFileChooser.APPROVE_OPTION) { if (selectionStatus != JFileChooser.APPROVE_OPTION) {
log.info("User cancelled CSV export"); log.debug("User cancelled CSV export");
return; return;
} }
// Fetch the info from the file chooser // Fetch the info from the file chooser
File CSVFile = fch.getSelectedFile(); File CSVFile = fch.getSelectedFile();
CSVFile = FileHelper.forceExtension(CSVFile, "csv"); CSVFile = FileHelper.forceExtension(CSVFile, "csv");
if (!FileHelper.confirmWrite(CSVFile, SimulationPanel.this)) {
log.debug("User cancelled CSV export overwrite");
return;
}
String separator = ((CsvOptionPanel) fch.getAccessory()).getFieldSeparator(); String separator = ((CsvOptionPanel) fch.getAccessory()).getFieldSeparator();
int precision = ((CsvOptionPanel) fch.getAccessory()).getDecimalPlaces(); int precision = ((CsvOptionPanel) fch.getAccessory()).getDecimalPlaces();
((CsvOptionPanel) fch.getAccessory()).storePreferences(); ((CsvOptionPanel) fch.getAccessory()).storePreferences();
@ -688,7 +693,6 @@ public class SimulationPanel extends JPanel {
// Add CSV options to FileChooser // Add CSV options to FileChooser
CsvOptionPanel CSVOptions = new CsvOptionPanel(SimulationTableCSVExport.class); CsvOptionPanel CSVOptions = new CsvOptionPanel(SimulationTableCSVExport.class);
fch.setAccessory(CSVOptions); fch.setAccessory(CSVOptions);
fch.revalidate();
// TODO: update this dynamically instead of hard-coded values // TODO: update this dynamically instead of hard-coded values
// The macOS file chooser has an issue where it does not update its size when the accessory is added. // The macOS file chooser has an issue where it does not update its size when the accessory is added.