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

Move ORPreferences to preferences package

Browse Source
This commit is contained in:
SiboVG 2024-07-21 23:10:41 +02:00
parent 464d42fb81
commit c86c04bd42
44 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java
View File

@ -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;

2
core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java
View File

@ -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;

3
core/src/main/java/info/openrocket/core/startup/ORPreferences.java → core/src/main/java/info/openrocket/core/preferences/ORPreferences.java
View File

@ -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;

2
core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java
View File

@ -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;

2
core/src/main/java/info/openrocket/core/simulation/DefaultSimulationOptionFactory.java
View File

@ -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;

2
core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java
View File

@ -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;

2
core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingUtil.java
View File

@ -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;

1
core/src/main/java/info/openrocket/core/startup/Application.java
View File

@ -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

1
core/src/main/java/module-info.java
View File

@ -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

2
core/src/test/java/info/openrocket/core/ServicesForTesting.java
View File

@ -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;

2
core/src/test/java/info/openrocket/core/simulation/SimulationConditionsTest.java
View File

@ -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;

1
core/src/test/java/info/openrocket/core/startup/MockPreferences.java
View File

@ -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;

2
core/src/test/resources/ServicesForTesting.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/components/PreferencesOptionPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/components/SVGOptionPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/configdialog/InnerTubeConfig.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/configdialog/RocketComponentConfig.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/configdialog/SaveDesignInfoPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java
View File

@ -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;
/**

2
swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GraphicsPreferencesPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/main/ComponentAddButtons.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/main/DesignFileSaveAsFileChooser.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/main/SimulationPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/util/PreferencesExporter.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/startup/GuiModule.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/startup/SwingStartup.java
View File

@ -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;

2
swing/src/main/java/info/openrocket/swing/utils/CoreServicesModule.java
View File

@ -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;

2
swing/src/test/java/info/openrocket/swing/ServicesForTesting.java
View File

@ -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;