diff --git a/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java b/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java index 7b44a88ac..5ca4585e4 100644 --- a/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java +++ b/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java @@ -5,7 +5,7 @@ import java.util.*; import info.openrocket.core.file.wavefrontobj.export.OBJExportOptions; import info.openrocket.core.rocketcomponent.*; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.util.StateChangeListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java index 59f432dbc..ecddec48e 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java @@ -8,7 +8,7 @@ import info.openrocket.core.logging.ErrorSet; import info.openrocket.core.logging.WarningSet; import info.openrocket.core.simulation.SimulationOptions; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/core/src/main/java/info/openrocket/core/startup/ORPreferences.java b/core/src/main/java/info/openrocket/core/preferences/ORPreferences.java similarity index 99% rename from core/src/main/java/info/openrocket/core/startup/ORPreferences.java rename to core/src/main/java/info/openrocket/core/preferences/ORPreferences.java index 3e5264b4d..a8f80188c 100644 --- a/core/src/main/java/info/openrocket/core/startup/ORPreferences.java +++ b/core/src/main/java/info/openrocket/core/preferences/ORPreferences.java @@ -1,4 +1,4 @@ -package info.openrocket.core.startup; +package info.openrocket.core.preferences; import java.awt.Color; import java.io.File; @@ -24,6 +24,7 @@ import info.openrocket.core.rocketcomponent.MassObject; import info.openrocket.core.rocketcomponent.Rocket; import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.simulation.RK4SimulationStepper; +import info.openrocket.core.startup.Application; import info.openrocket.core.util.BugException; import info.openrocket.core.util.BuildProperties; import info.openrocket.core.util.ChangeSource; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java b/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java index 4fc7df5b3..998910271 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java @@ -17,7 +17,7 @@ import info.openrocket.core.aerodynamics.FlightConditions; import info.openrocket.core.logging.WarningSet; import info.openrocket.core.rocketcomponent.position.AnglePositionable; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.util.ORColor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/info/openrocket/core/simulation/DefaultSimulationOptionFactory.java b/core/src/main/java/info/openrocket/core/simulation/DefaultSimulationOptionFactory.java index 08cc72116..46cc2c214 100644 --- a/core/src/main/java/info/openrocket/core/simulation/DefaultSimulationOptionFactory.java +++ b/core/src/main/java/info/openrocket/core/simulation/DefaultSimulationOptionFactory.java @@ -1,6 +1,6 @@ package info.openrocket.core.simulation; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import com.google.inject.Inject; diff --git a/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java b/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java index 5bb623297..3ac41255f 100644 --- a/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java +++ b/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java @@ -6,7 +6,7 @@ import java.util.EventObject; import java.util.List; import java.util.Random; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingUtil.java b/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingUtil.java index 49f71ea5b..a75b55b0c 100644 --- a/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingUtil.java +++ b/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingUtil.java @@ -12,7 +12,7 @@ import javax.script.ScriptEngineFactory; import info.openrocket.core.scripting.ScriptEngineManagerRedux; import info.openrocket.core.scripting.GraalJSScriptEngineFactory; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.util.ArrayList; import info.openrocket.core.util.BugException; diff --git a/core/src/main/java/info/openrocket/core/startup/Application.java b/core/src/main/java/info/openrocket/core/startup/Application.java index d2109c8fc..21d283ed3 100644 --- a/core/src/main/java/info/openrocket/core/startup/Application.java +++ b/core/src/main/java/info/openrocket/core/startup/Application.java @@ -9,6 +9,7 @@ import info.openrocket.core.l10n.ExceptionSuppressingTranslator; import info.openrocket.core.l10n.Translator; import com.google.inject.Injector; +import info.openrocket.core.preferences.ORPreferences; /** * A class that provides singleton instances / beans for other classes to diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java index d2a8c328f..b74348f80 100644 --- a/core/src/main/java/module-info.java +++ b/core/src/main/java/module-info.java @@ -97,6 +97,7 @@ open module info.openrocket.core { exports info.openrocket.core.util; exports info.openrocket.core.util.enums; exports info.openrocket.core.utils; + exports info.openrocket.core.preferences; // Service providers // Also edit core/src/main/resources/META-INF/services !! (until gradle-modules-plugin supports service diff --git a/core/src/test/java/info/openrocket/core/ServicesForTesting.java b/core/src/test/java/info/openrocket/core/ServicesForTesting.java index 23cbbbb85..9bef1c9d6 100644 --- a/core/src/test/java/info/openrocket/core/ServicesForTesting.java +++ b/core/src/test/java/info/openrocket/core/ServicesForTesting.java @@ -14,7 +14,7 @@ import info.openrocket.core.l10n.Translator; import info.openrocket.core.material.Material; import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.ComponentPreset.Type; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import com.google.inject.AbstractModule; import com.google.inject.Provider; diff --git a/core/src/test/java/info/openrocket/core/simulation/SimulationConditionsTest.java b/core/src/test/java/info/openrocket/core/simulation/SimulationConditionsTest.java index 9192ed304..3f0fcdae6 100644 --- a/core/src/test/java/info/openrocket/core/simulation/SimulationConditionsTest.java +++ b/core/src/test/java/info/openrocket/core/simulation/SimulationConditionsTest.java @@ -13,7 +13,7 @@ import info.openrocket.core.l10n.Translator; import info.openrocket.core.plugin.PluginModule; import info.openrocket.core.startup.Application; import info.openrocket.core.startup.MockPreferences; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.util.MathUtil; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/info/openrocket/core/startup/MockPreferences.java b/core/src/test/java/info/openrocket/core/startup/MockPreferences.java index bc6a55b85..66d67f396 100644 --- a/core/src/test/java/info/openrocket/core/startup/MockPreferences.java +++ b/core/src/test/java/info/openrocket/core/startup/MockPreferences.java @@ -5,6 +5,7 @@ import java.util.prefs.BackingStoreException; import com.google.inject.Singleton; import info.openrocket.core.material.Material; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.ComponentPreset.Type; import info.openrocket.core.util.BugException; diff --git a/core/src/test/resources/ServicesForTesting.java b/core/src/test/resources/ServicesForTesting.java index b78e009e3..ac939fe9e 100644 --- a/core/src/test/resources/ServicesForTesting.java +++ b/core/src/test/resources/ServicesForTesting.java @@ -14,7 +14,7 @@ import info.openrocket.core.l10n.Translator; import info.openrocket.core.material.Material; import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.ComponentPreset.Type; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import com.google.inject.AbstractModule; import com.google.inject.Provider; diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java index af0c8988e..53fd66863 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java @@ -9,7 +9,7 @@ import javax.swing.JSpinner; import javax.swing.SpinnerModel; import javax.swing.SpinnerNumberModel; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import net.miginfocom.swing.MigLayout; import info.openrocket.core.l10n.Translator; import info.openrocket.core.startup.Application; diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/PreferencesOptionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/components/PreferencesOptionPanel.java index f01c4c172..39d968f1c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/PreferencesOptionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/PreferencesOptionPanel.java @@ -1,6 +1,6 @@ package info.openrocket.swing.gui.components; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import net.miginfocom.swing.MigLayout; import info.openrocket.core.l10n.Translator; import info.openrocket.core.startup.Application; diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/SVGOptionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/components/SVGOptionPanel.java index 6c0f4672a..653500932 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/SVGOptionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/SVGOptionPanel.java @@ -5,7 +5,7 @@ import info.openrocket.swing.gui.SpinnerEditor; import info.openrocket.swing.gui.adaptors.DoubleModel; import info.openrocket.core.l10n.Translator; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.unit.UnitGroup; import javax.swing.JLabel; diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java index 8f590c6f7..0783adf89 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java @@ -21,7 +21,7 @@ import javax.swing.SwingUtilities; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.swing.gui.components.SVGOptionPanel; import info.openrocket.swing.gui.util.FileHelper; import info.openrocket.swing.gui.util.SwingPreferences; diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/InnerTubeConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/InnerTubeConfig.java index 930dfd067..dc494755b 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/InnerTubeConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/InnerTubeConfig.java @@ -43,7 +43,7 @@ import info.openrocket.core.rocketcomponent.MotorMount; import info.openrocket.core.rocketcomponent.RingComponent; import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.unit.UnitGroup; import info.openrocket.core.util.BugException; import info.openrocket.core.util.Coordinate; diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/RocketComponentConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/RocketComponentConfig.java index 581deb9bf..f71322045 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/RocketComponentConfig.java @@ -60,7 +60,7 @@ import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.rocketcomponent.*; import info.openrocket.core.rocketcomponent.position.AxialMethod; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.unit.UnitGroup; import info.openrocket.core.util.Invalidatable; diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/SaveDesignInfoPanel.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/SaveDesignInfoPanel.java index f154da0f5..fbbf80291 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/SaveDesignInfoPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/SaveDesignInfoPanel.java @@ -1,6 +1,6 @@ package info.openrocket.swing.gui.configdialog; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import net.miginfocom.swing.MigLayout; import info.openrocket.core.document.OpenRocketDocument; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index 0b8f04ca9..d2991f0cf 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -44,7 +44,7 @@ import javax.swing.event.RowSorterListener; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.swing.gui.plot.Util; import info.openrocket.swing.gui.theme.UITheme; import org.jfree.chart.ChartColor; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java index 475f20487..4cde182b9 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java @@ -10,7 +10,7 @@ import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JSpinner; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import net.miginfocom.swing.MigLayout; import info.openrocket.swing.gui.SpinnerEditor; import info.openrocket.swing.gui.adaptors.DoubleModel; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java index 956b42518..544bf0d00 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java @@ -6,7 +6,7 @@ package info.openrocket.swing.gui.dialogs.preferences; import javax.swing.JComboBox; import javax.swing.JLabel; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import net.miginfocom.swing.MigLayout; /** diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java index 1b05fded4..8efbca17c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java @@ -38,7 +38,7 @@ import info.openrocket.core.communication.UpdateInfoRetriever.ReleaseStatus; import info.openrocket.core.gui.util.SimpleFileFilter; import info.openrocket.core.l10n.L10N; import info.openrocket.core.logging.Markers; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.util.BuildProperties; import info.openrocket.core.util.Named; import info.openrocket.core.util.Utils; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GraphicsPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GraphicsPreferencesPanel.java index 1642c4e6a..f1619bb58 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GraphicsPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GraphicsPreferencesPanel.java @@ -22,7 +22,7 @@ import javax.swing.event.ChangeListener; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import net.miginfocom.swing.MigLayout; import info.openrocket.core.arch.SystemInfo; diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java index ce3a3dc96..4474f076a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java @@ -34,7 +34,7 @@ import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; import javax.swing.event.MouseInputAdapter; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.swing.gui.util.GUIUtil; import info.openrocket.swing.gui.theme.UITheme; import org.slf4j.Logger; diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoPanel.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoPanel.java index f1a4e64dd..274657161 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoPanel.java @@ -50,7 +50,7 @@ import info.openrocket.core.rocketcomponent.FlightConfigurationId; import info.openrocket.core.rocketcomponent.MotorMount; import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.util.Coordinate; import info.openrocket.core.util.MathUtil; import info.openrocket.core.util.StateChangeListener; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java b/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java index e6dc4b8c9..cbd7100c6 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java @@ -49,7 +49,7 @@ import javax.swing.tree.DefaultTreeSelectionModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import net.miginfocom.swing.MigLayout; import info.openrocket.core.file.wavefrontobj.export.OBJExportOptions; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/ComponentAddButtons.java b/swing/src/main/java/info/openrocket/swing/gui/main/ComponentAddButtons.java index 62798d2e1..d94442e6d 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/ComponentAddButtons.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/ComponentAddButtons.java @@ -25,7 +25,7 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/DesignFileSaveAsFileChooser.java b/swing/src/main/java/info/openrocket/swing/gui/main/DesignFileSaveAsFileChooser.java index b92c121dc..9d232989d 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/DesignFileSaveAsFileChooser.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/DesignFileSaveAsFileChooser.java @@ -17,7 +17,7 @@ import info.openrocket.core.gui.util.SimpleFileFilter; import info.openrocket.core.l10n.Translator; import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.util.FileUtils; import info.openrocket.swing.file.wavefrontobj.OBJOptionChooser; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java b/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java index 5b21767c5..5404e867f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java @@ -1,7 +1,7 @@ package info.openrocket.swing.gui.main; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import javax.swing.event.EventListenerList; import java.beans.PropertyChangeEvent; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/SimulationPanel.java b/swing/src/main/java/info/openrocket/swing/gui/main/SimulationPanel.java index 4c4f77185..7ae3a88ec 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/SimulationPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/SimulationPanel.java @@ -63,7 +63,7 @@ import info.openrocket.core.rocketcomponent.Rocket; import info.openrocket.core.simulation.FlightData; import info.openrocket.core.simulation.FlightEvent; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.unit.UnitGroup; import info.openrocket.core.util.AlphanumComparator; diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java index b51b8b07d..7c1f4e619 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java @@ -25,7 +25,7 @@ import info.openrocket.core.simulation.FlightDataBranch; import info.openrocket.core.simulation.FlightDataType; import info.openrocket.core.simulation.FlightEvent; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.unit.Unit; import info.openrocket.core.unit.UnitGroup; import info.openrocket.core.util.LinearInterpolator; diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java index ca27a4e41..cc9d435c2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java @@ -22,7 +22,7 @@ import info.openrocket.core.document.Simulation; import info.openrocket.core.l10n.Translator; import info.openrocket.core.simulation.FlightDataType; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import net.miginfocom.swing.MigLayout; import info.openrocket.swing.gui.components.StyledLabel; diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java index 105c45ba2..b721f097c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java @@ -1,6 +1,6 @@ package info.openrocket.swing.gui.simulation; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import net.miginfocom.swing.MigLayout; import info.openrocket.core.document.OpenRocketDocument; import info.openrocket.core.document.Simulation; diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java index d79467a1c..440962146 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java @@ -31,7 +31,7 @@ import info.openrocket.core.simulation.SimulationOptions; import info.openrocket.core.simulation.extension.SimulationExtension; import info.openrocket.core.simulation.extension.SimulationExtensionProvider; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.unit.UnitGroup; import info.openrocket.core.util.GeodeticComputationStrategy; diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java index 7a1a82605..c20b6a501 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java @@ -31,7 +31,7 @@ import info.openrocket.core.simulation.FlightDataType; import info.openrocket.core.simulation.FlightDataTypeGroup; import info.openrocket.core.simulation.FlightEvent; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.unit.Unit; import info.openrocket.core.util.Utils; diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java b/swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java index 58a2d0f91..5d35c63b3 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java @@ -64,7 +64,7 @@ import javax.swing.tree.DefaultTreeSelectionModel; import javax.swing.tree.TreeModel; import javax.swing.tree.TreeSelectionModel; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.swing.gui.Resettable; import info.openrocket.core.logging.Markers; diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/PreferencesExporter.java b/swing/src/main/java/info/openrocket/swing/gui/util/PreferencesExporter.java index 5a9d993f6..39e9c8632 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/PreferencesExporter.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/PreferencesExporter.java @@ -4,7 +4,7 @@ import info.openrocket.core.arch.SystemInfo; import info.openrocket.core.l10n.Translator; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.swing.gui.components.PreferencesOptionPanel; import info.openrocket.swing.gui.main.MRUDesignFile; import info.openrocket.swing.gui.theme.UITheme; diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java b/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java index c0f93a441..40621f374 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java @@ -22,7 +22,7 @@ import java.util.prefs.Preferences; import info.openrocket.core.database.Databases; import info.openrocket.core.rocketcomponent.NoseCone; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.swing.gui.theme.UITheme; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/swing/src/main/java/info/openrocket/swing/startup/GuiModule.java b/swing/src/main/java/info/openrocket/swing/startup/GuiModule.java index f8f5e5891..e2259400f 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/GuiModule.java +++ b/swing/src/main/java/info/openrocket/swing/startup/GuiModule.java @@ -7,7 +7,7 @@ import info.openrocket.core.formatting.RocketDescriptor; import info.openrocket.core.formatting.RocketDescriptorImpl; import info.openrocket.core.l10n.Translator; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.core.database.ComponentPresetDatabaseLoader; import info.openrocket.core.database.MotorDatabaseLoader; import info.openrocket.swing.gui.util.SwingPreferences; diff --git a/swing/src/main/java/info/openrocket/swing/startup/SwingStartup.java b/swing/src/main/java/info/openrocket/swing/startup/SwingStartup.java index 19a3f1c05..72525213f 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/SwingStartup.java +++ b/swing/src/main/java/info/openrocket/swing/startup/SwingStartup.java @@ -15,7 +15,7 @@ import javax.swing.Timer; import javax.swing.ToolTipManager; import info.openrocket.core.startup.Application; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import net.miginfocom.layout.LayoutUtil; import info.openrocket.core.arch.SystemInfo; import info.openrocket.core.arch.SystemInfo.Platform; diff --git a/swing/src/main/java/info/openrocket/swing/utils/CoreServicesModule.java b/swing/src/main/java/info/openrocket/swing/utils/CoreServicesModule.java index 172bbe914..aebcbaf34 100644 --- a/swing/src/main/java/info/openrocket/swing/utils/CoreServicesModule.java +++ b/swing/src/main/java/info/openrocket/swing/utils/CoreServicesModule.java @@ -2,7 +2,7 @@ package info.openrocket.swing.utils; import info.openrocket.core.formatting.RocketDescriptor; import info.openrocket.core.formatting.RocketDescriptorImpl; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import info.openrocket.swing.gui.util.SwingPreferences; import info.openrocket.core.l10n.Translator; import info.openrocket.swing.startup.providers.TranslatorProvider; diff --git a/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java b/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java index 0e3566753..78cbfe15f 100644 --- a/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java +++ b/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java @@ -10,7 +10,7 @@ import info.openrocket.core.l10n.Translator; import info.openrocket.core.material.Material; import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.ComponentPreset.Type; -import info.openrocket.core.startup.ORPreferences; +import info.openrocket.core.preferences.ORPreferences; import java.util.Collections; import java.util.Locale;