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

Move net.sf.openrocket.util.Prefs to net.sf.openrocket.gui.util.SwingPreferences.

Browse Source
This commit is contained in:
Kevin Ruland 2011-12-13 19:40:54 +00:00
parent 70128ba359
commit dcaaa1ac40
19 changed files with 77 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/sf/openrocket/database/Databases.java
View File

@ -1,12 +1,12 @@
package net.sf.openrocket.database; package net.sf.openrocket.database;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material;
import net.sf.openrocket.material.MaterialStorage; import net.sf.openrocket.material.MaterialStorage;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.MathUtil;
import net.sf.openrocket.util.Prefs;
/** /**
@ -95,7 +95,7 @@ public class Databases {
// Add user-defined materials // Add user-defined materials
for (Material m : ((Prefs) Application.getPreferences()).getUserMaterials()) { for (Material m : ((SwingPreferences) Application.getPreferences()).getUserMaterials()) {
switch (m.getType()) { switch (m.getType()) {
case LINE: case LINE:
LINE_MATERIAL.add(m); LINE_MATERIAL.add(m);

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

@ -23,6 +23,7 @@ import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.gui.util.FileHelper; import net.sf.openrocket.gui.util.FileHelper;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.gui.util.SaveCSVWorker; import net.sf.openrocket.gui.util.SaveCSVWorker;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.FlightData;
@ -31,7 +32,6 @@ import net.sf.openrocket.simulation.FlightDataType;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.Prefs;
public class SimulationExportPanel extends JPanel { public class SimulationExportPanel extends JPanel {
@ -86,7 +86,7 @@ public class SimulationExportPanel extends JPanel {
selected = new boolean[types.length]; selected = new boolean[types.length];
units = new Unit[types.length]; units = new Unit[types.length];
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
selected[i] = ((Prefs) Application.getPreferences()).isExportSelected(types[i]); selected[i] = ((SwingPreferences) Application.getPreferences()).isExportSelected(types[i]);
units[i] = types[i].getUnitGroup().getDefaultUnit(); units[i] = types[i].getUnitGroup().getDefaultUnit();
} }
@ -193,7 +193,7 @@ public class SimulationExportPanel extends JPanel {
private void doExport() { private void doExport() {
JFileChooser chooser = new JFileChooser(); JFileChooser chooser = new JFileChooser();
chooser.setFileFilter(FileHelper.CSV_FILE_FILTER); chooser.setFileFilter(FileHelper.CSV_FILE_FILTER);
chooser.setCurrentDirectory(((Prefs) Application.getPreferences()).getDefaultDirectory()); chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
if (chooser.showSaveDialog(this) != JFileChooser.APPROVE_OPTION) if (chooser.showSaveDialog(this) != JFileChooser.APPROVE_OPTION)
return; return;
@ -217,9 +217,9 @@ public class SimulationExportPanel extends JPanel {
// Store preferences and export // Store preferences and export
int n = 0; int n = 0;
((Prefs) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory()); ((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory());
for (int i = 0; i < selected.length; i++) { for (int i = 0; i < selected.length; i++) {
((Prefs) Application.getPreferences()).setExportSelected(types[i], selected[i]); ((SwingPreferences) Application.getPreferences()).setExportSelected(types[i], selected[i]);
if (selected[i]) if (selected[i])
n++; n++;
} }

10
src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
View File

@ -36,6 +36,7 @@ import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.gui.components.StyledLabel.Style; import net.sf.openrocket.gui.components.StyledLabel.Style;
import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.gui.components.UnitSelector;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material;
import net.sf.openrocket.rocketcomponent.ComponentAssembly; import net.sf.openrocket.rocketcomponent.ComponentAssembly;
@ -47,7 +48,6 @@ import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.Invalidatable; import net.sf.openrocket.util.Invalidatable;
import net.sf.openrocket.util.LineStyle; import net.sf.openrocket.util.LineStyle;
import net.sf.openrocket.util.Prefs;
public class RocketComponentConfig extends JPanel { public class RocketComponentConfig extends JPanel {
@ -379,7 +379,7 @@ public class RocketComponentConfig extends JPanel {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Color c = component.getColor(); Color c = component.getColor();
if (c == null) { if (c == null) {
c = ((Prefs) Application.getPreferences()).getDefaultColor(component.getClass()); c = ((SwingPreferences) Application.getPreferences()).getDefaultColor(component.getClass());
} }
//// Choose color //// Choose color
@ -401,7 +401,7 @@ public class RocketComponentConfig extends JPanel {
if (colorDefault.isSelected()) if (colorDefault.isSelected())
component.setColor(null); component.setColor(null);
else else
component.setColor(((Prefs) Application.getPreferences()).getDefaultColor(component.getClass())); component.setColor(((SwingPreferences) Application.getPreferences()).getDefaultColor(component.getClass()));
} }
}); });
panel.add(colorDefault, "wrap para"); panel.add(colorDefault, "wrap para");
@ -423,7 +423,7 @@ public class RocketComponentConfig extends JPanel {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if (component.getColor() != null) { if (component.getColor() != null) {
((Prefs) Application.getPreferences()).setDefaultColor(component.getClass(), component.getColor()); ((SwingPreferences) Application.getPreferences()).setDefaultColor(component.getClass(), component.getColor());
component.setColor(null); component.setColor(null);
} }
if (component.getLineStyle() != null) { if (component.getLineStyle() != null) {
@ -441,7 +441,7 @@ public class RocketComponentConfig extends JPanel {
private Color getColor() { private Color getColor() {
Color c = component.getColor(); Color c = component.getColor();
if (c == null) { if (c == null) {
c = ((Prefs) Application.getPreferences()).getDefaultColor(component.getClass()); c = ((SwingPreferences) Application.getPreferences()).getDefaultColor(component.getClass());
} }
return c; return c;
} }

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

@ -37,11 +37,11 @@ import net.sf.openrocket.gui.print.components.CheckTreeManager;
import net.sf.openrocket.gui.print.components.RocketPrintTree; import net.sf.openrocket.gui.print.components.RocketPrintTree;
import net.sf.openrocket.gui.util.FileHelper; import net.sf.openrocket.gui.util.FileHelper;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Prefs;
/** /**
* This class isolates the Swing components used to create a panel that is added to a standard Java print dialog. * This class isolates the Swing components used to create a panel that is added to a standard Java print dialog.
@ -63,7 +63,7 @@ public class PrintDialog extends JDialog implements TreeSelectionListener {
private JButton cancel; private JButton cancel;
private final static Prefs prefs = (Prefs) Application.getPreferences(); private final static SwingPreferences prefs = (SwingPreferences) Application.getPreferences();
/** /**
* Constructor. * Constructor.
@ -330,7 +330,7 @@ public class PrintDialog extends JDialog implements TreeSelectionListener {
dir = dir.getParentFile(); dir = dir.getParentFile();
} }
if (dir == null) { if (dir == null) {
dir = ((Prefs) Application.getPreferences()).getDefaultDirectory(); dir = prefs.getDefaultDirectory();
} }
chooser.setCurrentDirectory(dir); chooser.setCurrentDirectory(dir);

12
src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
View File

@ -49,6 +49,7 @@ import net.sf.openrocket.gui.dialogs.motor.CloseableDialog;
import net.sf.openrocket.gui.dialogs.motor.MotorSelector; import net.sf.openrocket.gui.dialogs.motor.MotorSelector;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.gui.util.Icons;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
@ -57,7 +58,6 @@ import net.sf.openrocket.motor.ThrustCurveMotor;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.Prefs;
import net.sf.openrocket.utils.MotorCorrelation; import net.sf.openrocket.utils.MotorCorrelation;
import org.jfree.chart.ChartColor; import org.jfree.chart.ChartColor;
@ -234,11 +234,11 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
//// Hide very similar thrust curves //// Hide very similar thrust curves
hideSimilarBox = new JCheckBox(trans.get("TCMotorSelPan.checkbox.hideSimilar")); hideSimilarBox = new JCheckBox(trans.get("TCMotorSelPan.checkbox.hideSimilar"));
GUIUtil.changeFontSize(hideSimilarBox, -1); GUIUtil.changeFontSize(hideSimilarBox, -1);
hideSimilarBox.setSelected(Application.getPreferences().getBoolean(Prefs.MOTOR_HIDE_SIMILAR, true)); hideSimilarBox.setSelected(Application.getPreferences().getBoolean(SwingPreferences.MOTOR_HIDE_SIMILAR, true));
hideSimilarBox.addActionListener(new ActionListener() { hideSimilarBox.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Application.getPreferences().putBoolean(Prefs.MOTOR_HIDE_SIMILAR, hideSimilarBox.isSelected()); Application.getPreferences().putBoolean(SwingPreferences.MOTOR_HIDE_SIMILAR, hideSimilarBox.isSelected());
updateData(); updateData();
} }
}); });
@ -541,7 +541,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
// Sets the filter: // Sets the filter:
int showMode = Application.getPreferences().getChoice(Prefs.MOTOR_DIAMETER_FILTER, SHOW_MAX, SHOW_EXACT); int showMode = Application.getPreferences().getChoice(SwingPreferences.MOTOR_DIAMETER_FILTER, SHOW_MAX, SHOW_EXACT);
filterComboBox.setSelectedIndex(showMode); filterComboBox.setSelectedIndex(showMode);
@ -585,7 +585,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
} }
// Store selected motor in preferences node, set all others to false // Store selected motor in preferences node, set all others to false
Preferences prefs = ((Prefs) Application.getPreferences()).getNode(Prefs.PREFERRED_THRUST_CURVE_MOTOR_NODE); Preferences prefs = ((SwingPreferences) Application.getPreferences()).getNode(SwingPreferences.PREFERRED_THRUST_CURVE_MOTOR_NODE);
for (ThrustCurveMotor m : set.getMotors()) { for (ThrustCurveMotor m : set.getMotors()) {
String digest = MotorDigest.digestMotor(m); String digest = MotorDigest.digestMotor(m);
prefs.putBoolean(digest, m == motor); prefs.putBoolean(digest, m == motor);
@ -815,7 +815,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
// Find which motor has been used the most recently // Find which motor has been used the most recently
List<ThrustCurveMotor> list = set.getMotors(); List<ThrustCurveMotor> list = set.getMotors();
Preferences prefs = ((Prefs) Application.getPreferences()).getNode(Prefs.PREFERRED_THRUST_CURVE_MOTOR_NODE); Preferences prefs = ((SwingPreferences) Application.getPreferences()).getNode(SwingPreferences.PREFERRED_THRUST_CURVE_MOTOR_NODE);
for (ThrustCurveMotor m : list) { for (ThrustCurveMotor m : list) {
String digest = MotorDigest.digestMotor(m); String digest = MotorDigest.digestMotor(m);
if (prefs.getBoolean(digest, false)) { if (prefs.getBoolean(digest, false)) {

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

@ -67,6 +67,7 @@ import net.sf.openrocket.gui.scalefigure.RocketFigure;
import net.sf.openrocket.gui.scalefigure.ScaleScrollPane; import net.sf.openrocket.gui.scalefigure.ScaleScrollPane;
import net.sf.openrocket.gui.util.FileHelper; import net.sf.openrocket.gui.util.FileHelper;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.optimization.general.OptimizationException; import net.sf.openrocket.optimization.general.OptimizationException;
@ -91,7 +92,6 @@ import net.sf.openrocket.unit.Value;
import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.Chars; import net.sf.openrocket.util.Chars;
import net.sf.openrocket.util.Named; import net.sf.openrocket.util.Named;
import net.sf.openrocket.util.Prefs;
import net.sf.openrocket.util.TextUtil; import net.sf.openrocket.util.TextUtil;
import com.itextpdf.text.Font; import com.itextpdf.text.Font;
@ -1236,7 +1236,7 @@ public class GeneralOptimizationDialog extends JDialog {
JFileChooser chooser = new JFileChooser(); JFileChooser chooser = new JFileChooser();
chooser.setFileFilter(FileHelper.CSV_FILE_FILTER); chooser.setFileFilter(FileHelper.CSV_FILE_FILTER);
chooser.setCurrentDirectory(((Prefs) Application.getPreferences()).getDefaultDirectory()); chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
chooser.setAccessory(csvOptions); chooser.setAccessory(csvOptions);
if (chooser.showSaveDialog(this) != JFileChooser.APPROVE_OPTION) if (chooser.showSaveDialog(this) != JFileChooser.APPROVE_OPTION)

22
src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
View File

@ -37,6 +37,7 @@ import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.gui.components.StyledLabel.Style; import net.sf.openrocket.gui.components.StyledLabel.Style;
import net.sf.openrocket.gui.dialogs.UpdateInfoDialog; import net.sf.openrocket.gui.dialogs.UpdateInfoDialog;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.gui.util.SimpleFileFilter; import net.sf.openrocket.gui.util.SimpleFileFilter;
import net.sf.openrocket.l10n.L10N; import net.sf.openrocket.l10n.L10N;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
@ -47,7 +48,6 @@ import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.BuildProperties; import net.sf.openrocket.util.BuildProperties;
import net.sf.openrocket.util.Named; import net.sf.openrocket.util.Named;
import net.sf.openrocket.util.Prefs;
import net.sf.openrocket.util.Utils; import net.sf.openrocket.util.Utils;
@ -96,7 +96,7 @@ public class PreferencesDialog extends JDialog {
this.addWindowListener(new WindowAdapter() { this.addWindowListener(new WindowAdapter() {
@Override @Override
public void windowClosed(WindowEvent e) { public void windowClosed(WindowEvent e) {
((Prefs) Application.getPreferences()).storeDefaultUnits(); ((SwingPreferences) Application.getPreferences()).storeDefaultUnits();
} }
}); });
@ -115,7 +115,7 @@ public class PreferencesDialog extends JDialog {
userLocale = L10N.toLocale(locale); userLocale = L10N.toLocale(locale);
} }
List<Named<Locale>> locales = new ArrayList<Named<Locale>>(); List<Named<Locale>> locales = new ArrayList<Named<Locale>>();
for (Locale l : Prefs.getSupportedLocales()) { for (Locale l : SwingPreferences.getSupportedLocales()) {
locales.add(new Named<Locale>(l, l.getDisplayLanguage())); locales.add(new Named<Locale>(l, l.getDisplayLanguage()));
} }
Collections.sort(locales); Collections.sort(locales);
@ -144,7 +144,7 @@ public class PreferencesDialog extends JDialog {
//// Position to insert new body components: //// Position to insert new body components:
panel.add(new JLabel(trans.get("pref.dlg.lbl.Positiontoinsert")), "gapright para"); panel.add(new JLabel(trans.get("pref.dlg.lbl.Positiontoinsert")), "gapright para");
panel.add(new JComboBox(new PrefChoiseSelector(Prefs.BODY_COMPONENT_INSERT_POSITION_KEY, panel.add(new JComboBox(new PrefChoiseSelector(Preferences.BODY_COMPONENT_INSERT_POSITION_KEY,
//// Always ask //// Always ask
//// Insert in middle //// Insert in middle
//// Add to end //// Add to end
@ -154,7 +154,7 @@ public class PreferencesDialog extends JDialog {
//// Confirm deletion of simulations: //// Confirm deletion of simulations:
panel.add(new JLabel(trans.get("pref.dlg.lbl.Confirmdeletion"))); panel.add(new JLabel(trans.get("pref.dlg.lbl.Confirmdeletion")));
panel.add(new JComboBox(new PrefBooleanSelector(Prefs.CONFIRM_DELETE_SIMULATION, panel.add(new JComboBox(new PrefBooleanSelector(Preferences.CONFIRM_DELETE_SIMULATION,
//// Delete //// Delete
//// Confirm //// Confirm
trans.get("pref.dlg.PrefBooleanSelector1"), trans.get("pref.dlg.PrefBooleanSelector1"),
@ -163,7 +163,7 @@ public class PreferencesDialog extends JDialog {
//// User-defined thrust curves: //// User-defined thrust curves:
panel.add(new JLabel(trans.get("pref.dlg.lbl.User-definedthrust")), "spanx, wrap"); panel.add(new JLabel(trans.get("pref.dlg.lbl.User-definedthrust")), "spanx, wrap");
final JTextField field = new JTextField(); final JTextField field = new JTextField();
List<File> files = ((Prefs) Application.getPreferences()).getUserThrustCurveFiles(); List<File> files = ((SwingPreferences) Application.getPreferences()).getUserThrustCurveFiles();
String str = ""; String str = "";
for (File file : files) { for (File file : files) {
if (str.length() > 0) { if (str.length() > 0) {
@ -197,7 +197,7 @@ public class PreferencesDialog extends JDialog {
list.add(new File(s)); list.add(new File(s));
} }
} }
((Prefs) Application.getPreferences()).setUserThrustCurveFiles(list); ((SwingPreferences) Application.getPreferences()).setUserThrustCurveFiles(list);
} }
}); });
panel.add(field, "w 100px, gapright unrel, spanx, growx, split"); panel.add(field, "w 100px, gapright unrel, spanx, growx, split");
@ -252,8 +252,8 @@ public class PreferencesDialog extends JDialog {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
// First one sets to the default, but does not un-set the pref // First one sets to the default, but does not un-set the pref
field.setText(((Prefs)Application.getPreferences()).getDefaultUserThrustCurveFile().getAbsolutePath()); field.setText(((SwingPreferences)Application.getPreferences()).getDefaultUserThrustCurveFile().getAbsolutePath());
((Prefs) Application.getPreferences()).setUserThrustCurveFiles(null); ((SwingPreferences) Application.getPreferences()).setUserThrustCurveFiles(null);
} }
}); });
panel.add(button, "wrap"); panel.add(button, "wrap");
@ -668,9 +668,9 @@ public class PreferencesDialog extends JDialog {
UpdateInfoDialog infoDialog = new UpdateInfoDialog(info); UpdateInfoDialog infoDialog = new UpdateInfoDialog(info);
infoDialog.setVisible(true); infoDialog.setVisible(true);
if (infoDialog.isReminderSelected()) { if (infoDialog.isReminderSelected()) {
Application.getPreferences().putString(Prefs.LAST_UPDATE, ""); Application.getPreferences().putString(SwingPreferences.LAST_UPDATE, "");
} else { } else {
Application.getPreferences().putString(Prefs.LAST_UPDATE, info.getLatestVersion()); Application.getPreferences().putString(SwingPreferences.LAST_UPDATE, info.getLatestVersion());
} }
} }

10
src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -87,6 +87,7 @@ import net.sf.openrocket.gui.util.FileHelper;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.gui.util.Icons;
import net.sf.openrocket.gui.util.OpenFileWorker; import net.sf.openrocket.gui.util.OpenFileWorker;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.gui.util.SaveFileWorker; import net.sf.openrocket.gui.util.SaveFileWorker;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
@ -99,7 +100,6 @@ import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.MemoryManagement; import net.sf.openrocket.util.MemoryManagement;
import net.sf.openrocket.util.MemoryManagement.MemoryData; import net.sf.openrocket.util.MemoryManagement.MemoryData;
import net.sf.openrocket.util.Prefs;
import net.sf.openrocket.util.Reflection; import net.sf.openrocket.util.Reflection;
import net.sf.openrocket.util.TestRockets; import net.sf.openrocket.util.TestRockets;
@ -1005,14 +1005,14 @@ public class BasicFrame extends JFrame {
chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
chooser.setMultiSelectionEnabled(true); chooser.setMultiSelectionEnabled(true);
chooser.setCurrentDirectory(((Prefs) Application.getPreferences()).getDefaultDirectory()); chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
int option = chooser.showOpenDialog(this); int option = chooser.showOpenDialog(this);
if (option != JFileChooser.APPROVE_OPTION) { if (option != JFileChooser.APPROVE_OPTION) {
log.user("Decided not to open files, option=" + option); log.user("Decided not to open files, option=" + option);
return; return;
} }
((Prefs) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory()); ((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory());
File[] files = chooser.getSelectedFiles(); File[] files = chooser.getSelectedFiles();
log.user("Opening files " + Arrays.toString(files)); log.user("Opening files " + Arrays.toString(files));
@ -1259,7 +1259,7 @@ public class BasicFrame extends JFrame {
new StorageOptionChooser(document, document.getDefaultStorageOptions()); new StorageOptionChooser(document, document.getDefaultStorageOptions());
JFileChooser chooser = new JFileChooser(); JFileChooser chooser = new JFileChooser();
chooser.setFileFilter(FileHelper.OPENROCKET_DESIGN_FILTER); chooser.setFileFilter(FileHelper.OPENROCKET_DESIGN_FILTER);
chooser.setCurrentDirectory(((Prefs) Application.getPreferences()).getDefaultDirectory()); chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
chooser.setAccessory(storageChooser); chooser.setAccessory(storageChooser);
if (document.getFile() != null) if (document.getFile() != null)
chooser.setSelectedFile(document.getFile()); chooser.setSelectedFile(document.getFile());
@ -1276,7 +1276,7 @@ public class BasicFrame extends JFrame {
return false; return false;
} }
((Prefs) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory()); ((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory());
storageChooser.storeOptions(document.getDefaultStorageOptions()); storageChooser.storeOptions(document.getDefaultStorageOptions());
file = FileHelper.ensureExtension(file, "ork"); file = FileHelper.ensureExtension(file, "ork");

4
src/net/sf/openrocket/gui/main/SimulationRunDialog.java
View File

@ -24,6 +24,7 @@ import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.gui.dialogs.DetailDialog; import net.sf.openrocket.gui.dialogs.DetailDialog;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.Configuration; import net.sf.openrocket.rocketcomponent.Configuration;
@ -40,7 +41,6 @@ import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.MathUtil;
import net.sf.openrocket.util.Prefs;
public class SimulationRunDialog extends JDialog { public class SimulationRunDialog extends JDialog {
@ -63,7 +63,7 @@ public class SimulationRunDialog extends JDialog {
* dialogs to run in parallel, ie. they both have their own executor service. * dialogs to run in parallel, ie. they both have their own executor service.
*/ */
private final ExecutorService executor = Executors.newFixedThreadPool( private final ExecutorService executor = Executors.newFixedThreadPool(
Prefs.getMaxThreadCount()); SwingPreferences.getMaxThreadCount());
private final JLabel simLabel, timeLabel, altLabel, velLabel; private final JLabel simLabel, timeLabel, altLabel, velLabel;

4
src/net/sf/openrocket/gui/print/DesignReport.java
View File

@ -12,6 +12,7 @@ import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.gui.figureelements.FigureElement; import net.sf.openrocket.gui.figureelements.FigureElement;
import net.sf.openrocket.gui.figureelements.RocketInfo; import net.sf.openrocket.gui.figureelements.RocketInfo;
import net.sf.openrocket.gui.scalefigure.RocketPanel; import net.sf.openrocket.gui.scalefigure.RocketPanel;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.masscalc.BasicMassCalculator; import net.sf.openrocket.masscalc.BasicMassCalculator;
import net.sf.openrocket.masscalc.MassCalculator; import net.sf.openrocket.masscalc.MassCalculator;
@ -29,7 +30,6 @@ import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.Chars; import net.sf.openrocket.util.Chars;
import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.Prefs;
import com.itextpdf.text.Document; import com.itextpdf.text.Document;
import com.itextpdf.text.DocumentException; import com.itextpdf.text.DocumentException;
@ -427,7 +427,7 @@ public class DesignReport {
Rocket duplicate = theRocket.copyWithOriginalID(); Rocket duplicate = theRocket.copyWithOriginalID();
FlightData flight = null; FlightData flight = null;
try { try {
Simulation simulation = ((Prefs)Application.getPreferences()).getBackgroundSimulation(duplicate); Simulation simulation = ((SwingPreferences)Application.getPreferences()).getBackgroundSimulation(duplicate);
simulation.getOptions().setMotorConfigurationID(motorId); simulation.getOptions().setMotorConfigurationID(motorId);
simulation.simulate(); simulation.simulate();
flight = simulation.getSimulatedData(); flight = simulation.getSimulatedData();

8
src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
View File

@ -21,6 +21,7 @@ import java.util.LinkedHashSet;
import net.sf.openrocket.gui.figureelements.FigureElement; import net.sf.openrocket.gui.figureelements.FigureElement;
import net.sf.openrocket.gui.main.ExceptionHandler; import net.sf.openrocket.gui.main.ExceptionHandler;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.rocketcomponent.Configuration; import net.sf.openrocket.rocketcomponent.Configuration;
import net.sf.openrocket.rocketcomponent.MotorMount; import net.sf.openrocket.rocketcomponent.MotorMount;
@ -30,7 +31,6 @@ import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.LineStyle; import net.sf.openrocket.util.LineStyle;
import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.MathUtil;
import net.sf.openrocket.util.Prefs;
import net.sf.openrocket.util.Reflection; import net.sf.openrocket.util.Reflection;
import net.sf.openrocket.util.Transformation; import net.sf.openrocket.util.Transformation;
@ -312,7 +312,7 @@ public class RocketFigure extends AbstractScaleFigure {
// Set component color and line style // Set component color and line style
Color color = c.getColor(); Color color = c.getColor();
if (color == null) { if (color == null) {
color = ((Prefs) Application.getPreferences()).getDefaultColor(c.getClass()); color = ((SwingPreferences) Application.getPreferences()).getDefaultColor(c.getClass());
} }
g2.setColor(color); g2.setColor(color);
@ -348,8 +348,8 @@ public class RocketFigure extends AbstractScaleFigure {
// Draw motors // Draw motors
String motorID = configuration.getMotorConfigurationID(); String motorID = configuration.getMotorConfigurationID();
Color fillColor = ((Prefs)Application.getPreferences()).getMotorFillColor(); Color fillColor = ((SwingPreferences)Application.getPreferences()).getMotorFillColor();
Color borderColor = ((Prefs)Application.getPreferences()).getMotorBorderColor(); Color borderColor = ((SwingPreferences)Application.getPreferences()).getMotorBorderColor();
Iterator<MotorMount> iterator = configuration.motorIterator(); Iterator<MotorMount> iterator = configuration.motorIterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
MotorMount mount = iterator.next(); MotorMount mount = iterator.next();

8
src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
View File

@ -49,6 +49,7 @@ import net.sf.openrocket.gui.figureelements.Caret;
import net.sf.openrocket.gui.figureelements.RocketInfo; import net.sf.openrocket.gui.figureelements.RocketInfo;
import net.sf.openrocket.gui.main.SimulationWorker; import net.sf.openrocket.gui.main.SimulationWorker;
import net.sf.openrocket.gui.main.componenttree.ComponentTreeModel; import net.sf.openrocket.gui.main.componenttree.ComponentTreeModel;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.masscalc.BasicMassCalculator; import net.sf.openrocket.masscalc.BasicMassCalculator;
import net.sf.openrocket.masscalc.MassCalculator; import net.sf.openrocket.masscalc.MassCalculator;
@ -67,7 +68,6 @@ import net.sf.openrocket.util.ChangeSource;
import net.sf.openrocket.util.Chars; import net.sf.openrocket.util.Chars;
import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.MathUtil;
import net.sf.openrocket.util.Prefs;
import net.sf.openrocket.util.StateChangeListener; import net.sf.openrocket.util.StateChangeListener;
/** /**
@ -121,7 +121,7 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
*/ */
private static final Executor backgroundSimulationExecutor; private static final Executor backgroundSimulationExecutor;
static { static {
backgroundSimulationExecutor = Executors.newFixedThreadPool(Prefs.getMaxThreadCount(), backgroundSimulationExecutor = Executors.newFixedThreadPool(SwingPreferences.getMaxThreadCount(),
new ThreadFactory() { new ThreadFactory() {
private ThreadFactory factory = Executors.defaultThreadFactory(); private ThreadFactory factory = Executors.defaultThreadFactory();
@ -564,7 +564,7 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
//////// Flight simulation in background //////// Flight simulation in background
// Check whether to compute or not // Check whether to compute or not
if (!((Prefs) Application.getPreferences()).computeFlightInBackground()) { if (!((SwingPreferences) Application.getPreferences()).computeFlightInBackground()) {
extraText.setFlightData(null); extraText.setFlightData(null);
extraText.setCalculatingData(false); extraText.setCalculatingData(false);
stopBackgroundSimulation(); stopBackgroundSimulation();
@ -594,7 +594,7 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
extraText.setCalculatingData(true); extraText.setCalculatingData(true);
Rocket duplicate = (Rocket) configuration.getRocket().copy(); Rocket duplicate = (Rocket) configuration.getRocket().copy();
Simulation simulation = ((Prefs)Application.getPreferences()).getBackgroundSimulation(duplicate); Simulation simulation = ((SwingPreferences)Application.getPreferences()).getBackgroundSimulation(duplicate);
simulation.getOptions().setMotorConfigurationID( simulation.getOptions().setMotorConfigurationID(
configuration.getMotorConfigurationID()); configuration.getMotorConfigurationID());

13
src/net/sf/openrocket/gui/util/GUIUtil.java
View File

@ -77,7 +77,6 @@ import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.Invalidatable; import net.sf.openrocket.util.Invalidatable;
import net.sf.openrocket.util.MemoryManagement; import net.sf.openrocket.util.MemoryManagement;
import net.sf.openrocket.util.Prefs;
public class GUIUtil { public class GUIUtil {
private static final LogHelper log = Application.getLogger(); private static final LogHelper log = Application.getLogger();
@ -305,22 +304,22 @@ public class GUIUtil {
@Override @Override
public void componentResized(ComponentEvent e) { public void componentResized(ComponentEvent e) {
log.debug("Storing size of " + window.getClass().getName() + ": " + window.getSize()); log.debug("Storing size of " + window.getClass().getName() + ": " + window.getSize());
((Prefs) Application.getPreferences()).setWindowSize(window.getClass(), window.getSize()); ((SwingPreferences) Application.getPreferences()).setWindowSize(window.getClass(), window.getSize());
if (window instanceof JFrame) { if (window instanceof JFrame) {
if ((((JFrame) window).getExtendedState() & JFrame.MAXIMIZED_BOTH) == JFrame.MAXIMIZED_BOTH) { if ((((JFrame) window).getExtendedState() & JFrame.MAXIMIZED_BOTH) == JFrame.MAXIMIZED_BOTH) {
log.debug("Storing maximized state of " + window.getClass().getName()); log.debug("Storing maximized state of " + window.getClass().getName());
((Prefs) Application.getPreferences()).setWindowMaximized(window.getClass()); ((SwingPreferences) Application.getPreferences()).setWindowMaximized(window.getClass());
} }
} }
} }
}); });
if (((Prefs) Application.getPreferences()).isWindowMaximized(window.getClass())) { if (((SwingPreferences) Application.getPreferences()).isWindowMaximized(window.getClass())) {
if (window instanceof JFrame) { if (window instanceof JFrame) {
((JFrame) window).setExtendedState(JFrame.MAXIMIZED_BOTH); ((JFrame) window).setExtendedState(JFrame.MAXIMIZED_BOTH);
} }
} else { } else {
Dimension dim = ((Prefs) Application.getPreferences()).getWindowSize(window.getClass()); Dimension dim = ((SwingPreferences) Application.getPreferences()).getWindowSize(window.getClass());
if (dim != null) { if (dim != null) {
window.setSize(dim); window.setSize(dim);
} }
@ -336,12 +335,12 @@ public class GUIUtil {
window.addComponentListener(new ComponentAdapter() { window.addComponentListener(new ComponentAdapter() {
@Override @Override
public void componentMoved(ComponentEvent e) { public void componentMoved(ComponentEvent e) {
((Prefs) Application.getPreferences()).setWindowPosition(window.getClass(), window.getLocation()); ((SwingPreferences) Application.getPreferences()).setWindowPosition(window.getClass(), window.getLocation());
} }
}); });
// Set window position according to preferences, and set prefs when moving // Set window position according to preferences, and set prefs when moving
Point position = ((Prefs) Application.getPreferences()).getWindowPosition(window.getClass()); Point position = ((SwingPreferences) Application.getPreferences()).getWindowPosition(window.getClass());
if (position != null) { if (position != null) {
window.setLocationByPlatform(false); window.setLocationByPlatform(false);
window.setLocation(position); window.setLocation(position);

21
src/net/sf/openrocket/util/Prefs.java → src/net/sf/openrocket/gui/util/SwingPreferences.java
View File

@ -1,4 +1,4 @@
package net.sf.openrocket.util; package net.sf.openrocket.gui.util;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
@ -17,7 +17,6 @@ import java.util.prefs.Preferences;
import net.sf.openrocket.arch.SystemInfo; import net.sf.openrocket.arch.SystemInfo;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.gui.main.ExceptionHandler; import net.sf.openrocket.gui.main.ExceptionHandler;
import net.sf.openrocket.gui.util.ColorConversion;
import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material;
import net.sf.openrocket.rocketcomponent.BodyComponent; import net.sf.openrocket.rocketcomponent.BodyComponent;
@ -33,9 +32,11 @@ import net.sf.openrocket.simulation.RK4SimulationStepper;
import net.sf.openrocket.simulation.SimulationOptions; import net.sf.openrocket.simulation.SimulationOptions;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.BuildProperties;
public class Prefs extends net.sf.openrocket.startup.Preferences { public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
private static final LogHelper log = Application.getLogger(); private static final LogHelper log = Application.getLogger();
private static final String SPLIT_CHARACTER = "|"; private static final String SPLIT_CHARACTER = "|";
@ -70,22 +71,10 @@ public class Prefs extends net.sf.openrocket.startup.Preferences {
*/ */
private static final String NODENAME = (DEBUG ? "OpenRocket-debug" : "OpenRocket"); private static final String NODENAME = (DEBUG ? "OpenRocket-debug" : "OpenRocket");
/**
* Return whether to use additional safety code checks.
*/
public static boolean useSafetyChecks() {
// Currently default to false unless openrocket.debug.safetycheck is defined
String s = System.getProperty("openrocket.debug.safetycheck");
if (s != null && !(s.equalsIgnoreCase("false") || s.equalsIgnoreCase("off"))) {
return true;
}
return false;
}
private final Preferences PREFNODE; private final Preferences PREFNODE;
public Prefs() { public SwingPreferences() {
Preferences root = Preferences.userRoot(); Preferences root = Preferences.userRoot();
if (DEBUG && CLEARPREFS) { if (DEBUG && CLEARPREFS) {
try { try {

6
src/net/sf/openrocket/material/MaterialStorage.java
View File

@ -2,8 +2,8 @@ package net.sf.openrocket.material;
import net.sf.openrocket.database.Database; import net.sf.openrocket.database.Database;
import net.sf.openrocket.database.DatabaseListener; import net.sf.openrocket.database.DatabaseListener;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Prefs;
/** /**
* Class for storing changes to user-added materials. The materials are stored to * Class for storing changes to user-added materials. The materials are stored to
@ -16,13 +16,13 @@ public class MaterialStorage implements DatabaseListener<Material> {
@Override @Override
public void elementAdded(Material material, Database<Material> source) { public void elementAdded(Material material, Database<Material> source) {
if (material.isUserDefined()) { if (material.isUserDefined()) {
((Prefs) Application.getPreferences()).addUserMaterial(material); ((SwingPreferences) Application.getPreferences()).addUserMaterial(material);
} }
} }
@Override @Override
public void elementRemoved(Material material, Database<Material> source) { public void elementRemoved(Material material, Database<Material> source) {
((Prefs) Application.getPreferences()).removeUserMaterial(material); ((SwingPreferences) Application.getPreferences()).removeUserMaterial(material);
} }
} }

4
src/net/sf/openrocket/startup/Startup.java
View File

@ -4,6 +4,7 @@ import java.io.PrintStream;
import java.util.Locale; import java.util.Locale;
import java.util.prefs.Preferences; import java.util.prefs.Preferences;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.DebugTranslator; import net.sf.openrocket.l10n.DebugTranslator;
import net.sf.openrocket.l10n.L10N; import net.sf.openrocket.l10n.L10N;
import net.sf.openrocket.l10n.ResourceBundleTranslator; import net.sf.openrocket.l10n.ResourceBundleTranslator;
@ -13,7 +14,6 @@ import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.logging.LogLevel; import net.sf.openrocket.logging.LogLevel;
import net.sf.openrocket.logging.LogLevelBufferLogger; import net.sf.openrocket.logging.LogLevelBufferLogger;
import net.sf.openrocket.logging.PrintStreamLogger; import net.sf.openrocket.logging.PrintStreamLogger;
import net.sf.openrocket.util.Prefs;
/** /**
@ -50,7 +50,7 @@ public class Startup {
// Initialize logging first so we can use it // Initialize logging first so we can use it
initializeLogging(); initializeLogging();
Application.setPreferences( new Prefs() ); Application.setPreferences( new SwingPreferences() );
// Setup the translations // Setup the translations
initializeL10n(); initializeL10n();

12
src/net/sf/openrocket/startup/Startup2.java
View File

@ -24,12 +24,12 @@ import net.sf.openrocket.gui.main.BasicFrame;
import net.sf.openrocket.gui.main.ExceptionHandler; import net.sf.openrocket.gui.main.ExceptionHandler;
import net.sf.openrocket.gui.main.Splash; import net.sf.openrocket.gui.main.Splash;
import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.gui.util.SimpleFileFilter; import net.sf.openrocket.gui.util.SimpleFileFilter;
import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.motor.ThrustCurveMotor;
import net.sf.openrocket.util.BuildProperties; import net.sf.openrocket.util.BuildProperties;
import net.sf.openrocket.util.Prefs;
/** /**
* The second class in the OpenRocket startup sequence. This class can assume the * The second class in the OpenRocket startup sequence. This class can assume the
@ -113,7 +113,7 @@ public class Startup2 {
ToolTipManager.sharedInstance().setDismissDelay(30000); ToolTipManager.sharedInstance().setDismissDelay(30000);
// Load defaults // Load defaults
((Prefs) Application.getPreferences()).loadDefaultUnits(); ((SwingPreferences) Application.getPreferences()).loadDefaultUnits();
// Load motors etc. // Load motors etc.
log.info("Loading databases"); log.info("Loading databases");
@ -193,7 +193,7 @@ public class Startup2 {
thrustCurveCount = list.size(); thrustCurveCount = list.size();
// Load the user-defined thrust curves // Load the user-defined thrust curves
for (File file : ((Prefs) Application.getPreferences()).getUserThrustCurveFiles()) { for (File file : ((SwingPreferences) Application.getPreferences()).getUserThrustCurveFiles()) {
log.info("Loading motors from " + file); log.info("Loading motors from " + file);
list = MotorLoaderHelper.load(file); list = MotorLoaderHelper.load(file);
for (Motor m : list) { for (Motor m : list) {
@ -243,7 +243,7 @@ public class Startup2 {
timer.stop(); timer.stop();
String current = BuildProperties.getVersion(); String current = BuildProperties.getVersion();
String last = Application.getPreferences().getString(Prefs.LAST_UPDATE, ""); String last = Application.getPreferences().getString(Preferences.LAST_UPDATE, "");
UpdateInfo info = updateInfo.getUpdateInfo(); UpdateInfo info = updateInfo.getUpdateInfo();
if (info != null && info.getLatestVersion() != null && if (info != null && info.getLatestVersion() != null &&
@ -253,9 +253,9 @@ public class Startup2 {
UpdateInfoDialog infoDialog = new UpdateInfoDialog(info); UpdateInfoDialog infoDialog = new UpdateInfoDialog(info);
infoDialog.setVisible(true); infoDialog.setVisible(true);
if (infoDialog.isReminderSelected()) { if (infoDialog.isReminderSelected()) {
Application.getPreferences().putString(Prefs.LAST_UPDATE, ""); Application.getPreferences().putString(Preferences.LAST_UPDATE, "");
} else { } else {
Application.getPreferences().putString(Prefs.LAST_UPDATE, info.getLatestVersion()); Application.getPreferences().putString(Preferences.LAST_UPDATE, info.getLatestVersion());
} }
} }
} }

4
test/net/sf/openrocket/file/rocksim/RocksimTestBase.java
View File

@ -7,9 +7,9 @@ import java.lang.reflect.Field;
import java.util.List; import java.util.List;
import junit.framework.TestCase; import junit.framework.TestCase;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Prefs;
/** /**
* A base class for the Rocksim tests. Includes code from the junitx.addons project. * A base class for the Rocksim tests. Includes code from the junitx.addons project.
@ -32,7 +32,7 @@ public abstract class RocksimTestBase extends TestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
Application.setPreferences( new Prefs() ); Application.setPreferences( new SwingPreferences() );
} }

4
test/net/sf/openrocket/util/BaseTestCase/BaseTestCase.java
View File

@ -1,7 +1,7 @@
package net.sf.openrocket.util.BaseTestCase; package net.sf.openrocket.util.BaseTestCase;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Prefs;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -10,7 +10,7 @@ public class BaseTestCase {
@BeforeClass @BeforeClass
public static void setUpApplication () { public static void setUpApplication () {
Application.setPreferences( new Prefs() ); Application.setPreferences( new SwingPreferences() );
} }
} }