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

Use FileHelper.forceExtension instead of FileHelper.ensureExtension to avoid faulty saved file extensions

Browse Source
This commit is contained in:
Sibo Van Gool 2021-09-17 00:27:18 +02:00
parent d67947bc2a
commit 548c3b7aae
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swing/src/net/sf/openrocket/gui/components/SimulationExportPanel.java
View File

@ -204,7 +204,7 @@ public class SimulationExportPanel extends JPanel {
if (file == null) if (file == null)
return; return;
file = FileHelper.ensureExtension(file, "csv"); file = FileHelper.forceExtension(file, "csv");
if (!FileHelper.confirmWrite(file, this)) { if (!FileHelper.confirmWrite(file, this)) {
return; return;
} }

2
swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
View File

@ -262,7 +262,7 @@ public class FreeformFinSetConfig extends FinSetConfig {
if (JFileChooser.APPROVE_OPTION == chooser.showSaveDialog(FreeformFinSetConfig.this)){ if (JFileChooser.APPROVE_OPTION == chooser.showSaveDialog(FreeformFinSetConfig.this)){
File selectedFile= chooser.getSelectedFile(); File selectedFile= chooser.getSelectedFile();
selectedFile = FileHelper.ensureExtension(selectedFile, "csv"); selectedFile = FileHelper.forceExtension(selectedFile, "csv");
if (!FileHelper.confirmWrite(selectedFile, panel)) { if (!FileHelper.confirmWrite(selectedFile, panel)) {
return; return;
} }

2
swing/src/net/sf/openrocket/gui/dialogs/PrintDialog.java
View File

@ -380,7 +380,7 @@ public class PrintDialog extends JDialog implements TreeSelectionListener {
File file = chooser.getSelectedFile(); File file = chooser.getSelectedFile();
if (returnVal == JFileChooser.APPROVE_OPTION && file != null) { if (returnVal == JFileChooser.APPROVE_OPTION && file != null) {
file = FileHelper.ensureExtension(file, "pdf"); file = FileHelper.forceExtension(file, "pdf");
if (!FileHelper.confirmWrite(file, this)) { if (!FileHelper.confirmWrite(file, this)) {
return false; return false;
} }

2
swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java
View File

@ -1121,7 +1121,7 @@ public class GeneralOptimizationDialog extends JDialog {
if (file == null) if (file == null)
return; return;
file = FileHelper.ensureExtension(file, "csv"); file = FileHelper.forceExtension(file, "csv");
if (!FileHelper.confirmWrite(file, this)) { if (!FileHelper.confirmWrite(file, this)) {
return; return;
} }

2
swing/src/net/sf/openrocket/gui/simulation/SimulationExportPanel.java
View File

@ -230,7 +230,7 @@ public class SimulationExportPanel extends JPanel {
if (file == null) if (file == null)
return false; return false;
file = FileHelper.ensureExtension(file, "csv"); file = FileHelper.forceExtension(file, "csv");
if (!FileHelper.confirmWrite(file, this)) { if (!FileHelper.confirmWrite(file, this)) {
return false; return false;
} }