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

Merge pull request #2167 from SiboVG/issue-2150

Browse Source 
[#2150] Don't let illegal file format be a silent warning
This commit is contained in:
Sibo Van Gool 2023-04-12 22:06:05 +02:00 committed by GitHub
commit a0cb228186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/resources/l10n/messages.properties
View File

@ -2311,11 +2311,11 @@ IgnitionSelectionDialog.opt.default = Change all configurations using the defaul
IgnitionSelectionDialog.opt.override = Override for the {0} flight configuration only IgnitionSelectionDialog.opt.override = Override for the {0} flight configuration only
DeploymentSelectionDialog.opt.title = Which flight configurations are affected: DeploymentSelectionDialog.opt.title = Which flight configurations are affected:
DeploymentSelectionDialog.opt.default = Change all configuration using the default deployment event DeploymentSelectionDialog.opt.default = Change all configurations using the default deployment event
DeploymentSelectionDialog.opt.override = Override for the {0} flight configuration only DeploymentSelectionDialog.opt.override = Override for the {0} flight configuration only
SeparationSelectionDialog.opt.title = Which flight configurations are affected: SeparationSelectionDialog.opt.title = Which flight configurations are affected:
SeparationSelectionDialog.opt.default = Change all configuration using the default separation event SeparationSelectionDialog.opt.default = Change all configurations using the default separation event
SeparationSelectionDialog.opt.override = Override for the {0} flight configuration only SeparationSelectionDialog.opt.override = Override for the {0} flight configuration only
MotorConfigurationPanel.description = <b>Select the motors and motor ignition events of the selected flight configuration.</b><br> <em>Motor mounts:</em> Select which components function as motor mounts.<br> <em>Motor configurations:</em> Select the motor and ignition event for each motor mount. MotorConfigurationPanel.description = <b>Select the motors and motor ignition events of the selected flight configuration.</b><br> <em>Motor mounts:</em> Select which components function as motor mounts.<br> <em>Motor configurations:</em> Select the motor and ignition event for each motor mount.

9
core/src/net/sf/openrocket/file/motor/RASPMotorLoader.java
View File

@ -94,7 +94,8 @@ public class RASPMotorLoader extends AbstractMotorLoader {
// desig diam len delays prop.w tot.w manufacturer // desig diam len delays prop.w tot.w manufacturer
pieces = split(line); pieces = split(line);
if (pieces.length != 7) { if (pieces.length != 7) {
throw new IOException("Illegal file format."); throw new IOException("Illegal file format. Motor header line must contain 7 fields:<br>" +
"&nbsp designation diameter length delays propellantWeight totalWeight manufacturer");
} }
designation = pieces[0]; designation = pieces[0];
@ -140,7 +141,8 @@ public class RASPMotorLoader extends AbstractMotorLoader {
thrust.add(Double.parseDouble(buf[1])); thrust.add(Double.parseDouble(buf[1]));
} else { } else {
throw new IOException("Illegal file format."); throw new IOException("Illegal file format.<br>" +
"Data should only have 2 entries: a time and thrust value.");
} }
} }
@ -158,7 +160,8 @@ public class RASPMotorLoader extends AbstractMotorLoader {
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
throw new IOException("Illegal file format."); throw new IOException("Illegal file format. Could not convert value to a number.<br" +
">Verify that each number is correctly formatted.");
} }

20
swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java
View File

@ -27,6 +27,7 @@ import net.sf.openrocket.util.Pair;
import javax.swing.JDialog; import javax.swing.JDialog;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
/** /**
* An asynchronous database loader that loads the internal thrust curves * An asynchronous database loader that loads the internal thrust curves
@ -140,21 +141,26 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
*/ */
private void loadFile(GeneralMotorLoader loader, Pair<File, InputStream> f) { private void loadFile(GeneralMotorLoader loader, Pair<File, InputStream> f) {
try { try {
List<ThrustCurveMotor.Builder> motors = loader.load(f.getV(), f.getU().getName());
try { try {
List<ThrustCurveMotor.Builder> motors = loader.load(f.getV(), f.getU().getName());
addMotorsFromBuilders(motors); addMotorsFromBuilders(motors);
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException | IOException e) {
Translator trans = Application.getTranslator(); Translator trans = Application.getTranslator();
String fullPath = f.getU().getPath(); String fullPath = f.getU().getPath();
String message = "<html><body><p style='width: 400px;'><i>" + e.getMessage() + String message = "<html><body><p style='width: 400px;'><i>" + e.getMessage() +
"</i>.<br><br>" + MessageFormat.format( trans.get("MotorDbLoaderDlg.message1"), fullPath) + "</i>.<br><br>" + MessageFormat.format( trans.get("MotorDbLoaderDlg.message1"), fullPath) +
"<br>" + trans.get("MotorDbLoaderDlg.message2") + "</p></body></html>"; "<br>" + trans.get("MotorDbLoaderDlg.message2") + "</p></body></html>";
JOptionPane pane = new JOptionPane(message, JOptionPane.WARNING_MESSAGE); SwingUtilities.invokeLater(new Runnable() {
JDialog dialog = pane.createDialog(null, trans.get("MotorDbLoaderDlg.title")); @Override
dialog.setModalityType(Dialog.ModalityType.MODELESS); public void run() {
dialog.setAlwaysOnTop(true); JOptionPane pane = new JOptionPane(message, JOptionPane.WARNING_MESSAGE);
dialog.setVisible(true); JDialog dialog = pane.createDialog(null, trans.get("MotorDbLoaderDlg.title"));
dialog.setModalityType(Dialog.ModalityType.MODELESS);
dialog.setAlwaysOnTop(true);
dialog.setVisible(true);
}
});
} }
f.getV().close(); f.getV().close();
} catch (Exception e) { } catch (Exception e) {