Fixup problems I introduced during previous commit of MotorDatabase refactoring....

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@274 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/src/net/sf/openrocket/database/ThrustCurveMotorSet.java b/src/net/sf/openrocket/database/ThrustCurveMotorSet.java
index 321e42b269cf102fc95f1b042bbfd694a3ab20d8..99c422e314c1a515217e5e758539e98ce799cac4 100644 (file)
--- a/src/net/sf/openrocket/database/ThrustCurveMotorSet.java
+++ b/src/net/sf/openrocket/database/ThrustCurveMotorSet.java
@@ -19,7 +19,7 @@ import net.sf.openrocket.motor.ThrustCurveMotor;
 import net.sf.openrocket.util.ArrayList;
 import net.sf.openrocket.util.MathUtil;
 
-class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
+public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
        
        //  Comparators:
        private static final Collator COLLATOR = Collator.getInstance(Locale.US);

diff --git a/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java b/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java
index 203a903b0552e46714e574c4f8046dd1a7ae3e65..f19e590d31f392e8dd80511b908c3bd6c85c2360 100644 (file)
--- a/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java
@@ -56,7 +56,8 @@ public class MotorDatabaseLoadingDialog extends JDialog {
         * @param parent        the parent window for the dialog, or <code>null</code>
         */
        public static void check(Window parent) {
-               final ThrustCurveMotorSetDatabase db = Application.getMotorSetDatabase();
+               // TODO - ugly blind cast
+               final ThrustCurveMotorSetDatabase db = (ThrustCurveMotorSetDatabase) Application.getMotorSetDatabase();
                if (db.isLoaded())
                        return;
                

diff --git a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
index 7b978d958cd04c62258150e2594deb75ac9c3b57..e4c22229447814ed41d05be797c4d2dc0e055f61 100644 (file)
--- a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
+++ b/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
@@ -43,6 +43,7 @@ import javax.swing.table.TableRowSorter;
 
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.database.ThrustCurveMotorSet;
+import net.sf.openrocket.database.ThrustCurveMotorSetDatabase;
 import net.sf.openrocket.gui.components.StyledLabel;
 import net.sf.openrocket.gui.components.StyledLabel.Style;
 import net.sf.openrocket.gui.dialogs.motor.CloseableDialog;
@@ -161,7 +162,8 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 
                // Construct the database (adding the current motor if not in the db already)
                List<ThrustCurveMotorSet> db;
-               db = Application.getMotorSetDatabase().getMotorSets();
+               // TODO - ugly blind cast.
+               db = ((ThrustCurveMotorSetDatabase) Application.getMotorSetDatabase()).getMotorSets();
                
                // If current motor is not found in db, add a new ThrustCurveMotorSet containing it
                if (current != null) {
@@ -234,11 +236,11 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
                //// Hide very similar thrust curves
                hideSimilarBox = new JCheckBox(trans.get("TCMotorSelPan.checkbox.hideSimilar"));
                GUIUtil.changeFontSize(hideSimilarBox, -1);
-               hideSimilarBox.setSelected(Application.getPreferences().getBoolean(SwingPreferences.MOTOR_HIDE_SIMILAR, true));
+               hideSimilarBox.setSelected(Application.getPreferences().getBoolean(net.sf.openrocket.startup.Preferences.MOTOR_HIDE_SIMILAR, true));
                hideSimilarBox.addActionListener(new ActionListener() {
                        @Override
                        public void actionPerformed(ActionEvent e) {
-                               Application.getPreferences().putBoolean(SwingPreferences.MOTOR_HIDE_SIMILAR, hideSimilarBox.isSelected());
+                               Application.getPreferences().putBoolean(net.sf.openrocket.startup.Preferences.MOTOR_HIDE_SIMILAR, hideSimilarBox.isSelected());
                                updateData();
                        }
                });
@@ -541,7 +543,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 
 
                // Sets the filter:
-               int showMode = Application.getPreferences().getChoice(SwingPreferences.MOTOR_DIAMETER_FILTER, SHOW_MAX, SHOW_EXACT);
+               int showMode = Application.getPreferences().getChoice(net.sf.openrocket.startup.Preferences.MOTOR_DIAMETER_FILTER, SHOW_MAX, SHOW_EXACT);
                filterComboBox.setSelectedIndex(showMode);
                
 
@@ -585,7 +587,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
                }
                
                // Store selected motor in preferences node, set all others to false
-               Preferences prefs = ((SwingPreferences) Application.getPreferences()).getNode(SwingPreferences.PREFERRED_THRUST_CURVE_MOTOR_NODE);
+               Preferences prefs = ((SwingPreferences) Application.getPreferences()).getNode(net.sf.openrocket.startup.Preferences.PREFERRED_THRUST_CURVE_MOTOR_NODE);
                for (ThrustCurveMotor m : set.getMotors()) {
                        String digest = MotorDigest.digestMotor(m);
                        prefs.putBoolean(digest, m == motor);
@@ -815,7 +817,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 
                // Find which motor has been used the most recently
                List<ThrustCurveMotor> list = set.getMotors();
-               Preferences prefs = ((SwingPreferences) Application.getPreferences()).getNode(SwingPreferences.PREFERRED_THRUST_CURVE_MOTOR_NODE);
+               Preferences prefs = ((SwingPreferences) Application.getPreferences()).getNode(net.sf.openrocket.startup.Preferences.PREFERRED_THRUST_CURVE_MOTOR_NODE);
                for (ThrustCurveMotor m : list) {
                        String digest = MotorDigest.digestMotor(m);
                        if (prefs.getBoolean(digest, false)) {