From: kruland2607 Date: Wed, 4 Jan 2012 17:57:54 +0000 (+0000) Subject: Fixup problems I introduced during previous commit of MotorDatabase refactoring.... X-Git-Tag: upstream/12.03~1^2~196 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=66c13ed4572e91a94c65d125c5c3c1ebf4835a9a;p=debian%2Fopenrocket Fixup problems I introduced during previous commit of MotorDatabase refactoring. The ThrustCurveMotorSet class needs to be public. The classes MotorDatabaseLoadingDialog and ThrustCurveMotorSelectionPanel need to blind cast the MotorDatabase retrieved from the Application to ThrustCurveMotorSetDatabase in order to have access to functions specific to that implementation. 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 321e42b2..99c422e3 100644 --- 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 { +public class ThrustCurveMotorSet implements Comparable { // 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 203a903b..f19e590d 100644 --- 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 null */ 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 7b978d95..e4c22229 100644 --- 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 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 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)) {