From b51fed39ed8462cb1cc7cc8f8f283f1739097187 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Wed, 20 Apr 2022 09:42:57 +0200
Subject: [PATCH] Use full file path for thrust curve import error message
---
swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java b/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java
index 36de83ac7..3b8ad6c9a 100644
--- a/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java
+++ b/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java
@@ -146,8 +146,10 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
}
catch (IllegalArgumentException e) {
Translator trans = Application.getTranslator();
+ File thrustCurveDir = ((SwingPreferences) Application.getPreferences()).getDefaultUserThrustCurveFile();
+ File fullPath = new File(thrustCurveDir, f.getU());
String message = "<html><body><p style='width: 400px;'><i>" + e.getMessage() +
- "</i>.<br><br>" + MessageFormat.format( trans.get("MotorDbLoaderDlg.message1"), f.getU()) +
+ "</i>.<br><br>" + MessageFormat.format( trans.get("MotorDbLoaderDlg.message1"), fullPath.getPath()) +
"<br>" + trans.get("MotorDbLoaderDlg.message2") + "</p></body></html>";
JOptionPane pane = new JOptionPane(message, JOptionPane.WARNING_MESSAGE);
JDialog dialog = pane.createDialog(null, trans.get("MotorDbLoaderDlg.title"));