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

Replace wildcard imports with single imports

Browse Source
This commit is contained in:
SiboVG 2024-08-09 05:07:41 +02:00
parent b0169b6a2a
commit 9cde5c9766
38 changed files with 265 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java
View File

@ -2,8 +2,6 @@ package info.openrocket.core.aerodynamics;
import static info.openrocket.core.util.MathUtil.pow2;
import java.util.*;
import info.openrocket.core.logging.Warning;
import info.openrocket.core.logging.WarningSet;
import info.openrocket.core.rocketcomponent.AxialStage;
@ -32,6 +30,15 @@ import info.openrocket.core.util.ModID;
import info.openrocket.core.util.PolyInterpolator;
import info.openrocket.core.util.Reflection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Queue;
/**
* An aerodynamic calculator that uses the extended Barrowman method to
* calculate the CP of a rocket.

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

@ -1,7 +1,16 @@
package info.openrocket.core.document;
import java.io.File;
import java.util.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EventObject;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -272,9 +281,7 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL
* @return the decal list registered in the document
*/
public Collection<DecalImage> getDecalList() {
return decalRegistry.getDecalList();
}
/**
@ -284,10 +291,8 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL
*/
public int countDecalUsage(DecalImage img) {
int count = 0;
Iterator<RocketComponent> it = rocket.iterator();
while (it.hasNext()) {
RocketComponent c = it.next();
for (RocketComponent c : rocket) {
if (hasDecal(c, img))
count++;
else if (hasDecalInside(c, img))

6
core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java
View File

@ -5,7 +5,11 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.*;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import info.openrocket.core.file.openrocket.savers.PhotoStudioSaver;
import info.openrocket.core.logging.ErrorSet;

2
core/src/main/java/info/openrocket/core/file/openrocket/importt/FinTabPositionSetter.java
View File

@ -2,13 +2,13 @@ package info.openrocket.core.file.openrocket.importt;
import java.util.HashMap;
import info.openrocket.core.rocketcomponent.position.AxialMethod;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.openrocket.core.logging.WarningSet;
import info.openrocket.core.rocketcomponent.FinSet;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.rocketcomponent.position.*;
import info.openrocket.core.util.Reflection;
class FinTabPositionSetter extends DoubleSetter {

5
core/src/main/java/info/openrocket/core/file/openrocket/importt/PhotoStudioHandler.java
View File

@ -8,7 +8,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
import java.util.*;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
* This class will parse the photostudio xml parameters from the

18
core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java
View File

@ -16,7 +16,21 @@ import info.openrocket.core.motor.Motor;
import info.openrocket.core.motor.MotorConfiguration;
import info.openrocket.core.motor.ThrustCurveMotor;
import info.openrocket.core.preset.ComponentPreset;
import info.openrocket.core.rocketcomponent.*;
import info.openrocket.core.rocketcomponent.Clusterable;
import info.openrocket.core.rocketcomponent.ComponentAssembly;
import info.openrocket.core.rocketcomponent.FinSet;
import info.openrocket.core.rocketcomponent.FlightConfigurationId;
import info.openrocket.core.rocketcomponent.InsideColorComponent;
import info.openrocket.core.rocketcomponent.InsideColorComponentHandler;
import info.openrocket.core.rocketcomponent.Instanceable;
import info.openrocket.core.rocketcomponent.LineInstanceable;
import info.openrocket.core.rocketcomponent.MotorMount;
import info.openrocket.core.rocketcomponent.ParallelStage;
import info.openrocket.core.rocketcomponent.PodSet;
import info.openrocket.core.rocketcomponent.RailButton;
import info.openrocket.core.rocketcomponent.Rocket;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.rocketcomponent.TubeFinSet;
import info.openrocket.core.rocketcomponent.position.AnglePositionable;
import info.openrocket.core.rocketcomponent.position.AxialMethod;
import info.openrocket.core.rocketcomponent.position.RadiusPositionable;
@ -225,7 +239,7 @@ public class RocketComponentSaver {
elements.add(" <ignitiondelay>" + defaultInstance.getIgnitionDelay() + "</ignitiondelay>");
elements.add(" <overhang>" + mount.getMotorOverhang() + "</overhang>");
for( FlightConfigurationId fcid : rkt.getIds()){
for (FlightConfigurationId fcid : rkt.getIds()){
MotorConfiguration motorInstance = mount.getMotorConfig(fcid);
// Nothing is stored if no motor loaded

15
core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java
View File

@ -6,7 +6,10 @@ import java.util.Map;
import info.openrocket.core.motor.Motor;
import info.openrocket.core.motor.MotorConfiguration;
import info.openrocket.core.rocketcomponent.*;
import info.openrocket.core.rocketcomponent.ComponentAssembly;
import info.openrocket.core.rocketcomponent.FlightConfiguration;
import info.openrocket.core.rocketcomponent.MotorMount;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.simulation.MotorClusterState;
import info.openrocket.core.util.Coordinate;
import info.openrocket.core.util.MathUtil;
@ -78,7 +81,7 @@ public class MassCalculation {
this.centerOfMass = this.centerOfMass.setWeight(getMass() + mass);
}
public MassCalculation copy( final RocketComponent _root, final Transformation _transform){
public MassCalculation copy(final RocketComponent _root, final Transformation _transform){
return new MassCalculation( this.type, this.config, this.simulationTime, this.activeMotorList, _root, _transform, this.analysisMap);
}
@ -119,10 +122,10 @@ public class MassCalculation {
return this.centerOfMass.hashCode();
}
public MassCalculation( final Type _type, final FlightConfiguration _config, final double _time,
final Collection<MotorClusterState> _activeMotorList,
final RocketComponent _root, final Transformation _transform,
Map<Integer, CMAnalysisEntry> _map)
public MassCalculation(final Type _type, final FlightConfiguration _config, final double _time,
final Collection<MotorClusterState> _activeMotorList,
final RocketComponent _root, final Transformation _transform,
Map<Integer, CMAnalysisEntry> _map)
{
type = _type;
config = _config;

10
core/src/main/java/info/openrocket/core/rocketcomponent/FinSet.java
View File

@ -1,11 +1,17 @@
package info.openrocket.core.rocketcomponent;
import java.awt.geom.Point2D;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import info.openrocket.core.util.*;
import info.openrocket.core.rocketcomponent.position.AnglePositionable;
import info.openrocket.core.util.BoundingBox;
import info.openrocket.core.util.Coordinate;
import info.openrocket.core.util.MathUtil;
import info.openrocket.core.util.Transformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java
View File

@ -6,7 +6,9 @@ import java.util.Collection;
import info.openrocket.core.l10n.Translator;
import info.openrocket.core.preset.ComponentPreset;
import info.openrocket.core.preset.ComponentPreset.Type;
import info.openrocket.core.rocketcomponent.position.*;
import info.openrocket.core.rocketcomponent.position.AngleMethod;
import info.openrocket.core.rocketcomponent.position.AnglePositionable;
import info.openrocket.core.rocketcomponent.position.AxialMethod;
import info.openrocket.core.startup.Application;
import info.openrocket.core.util.BoundingBox;
import info.openrocket.core.util.Coordinate;

12
core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java
View File

@ -1,6 +1,14 @@
package info.openrocket.core.rocketcomponent;
import java.util.*;
import java.util.Collection;
import java.util.EventListener;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
@ -377,7 +385,7 @@ public class Rocket extends ComponentAssembly {
// Rocket copy is cloned, so non-trivial members must be cloned as well:
copyRocket.stageMap = new ConcurrentHashMap<>();
for( Map.Entry<Integer,AxialStage> entry : this.stageMap.entrySet()){
for (Map.Entry<Integer,AxialStage> entry : this.stageMap.entrySet()){
final AxialStage stage = (AxialStage)copyRocket.findComponent(entry.getValue().getID());
if (stage == null) {
throw new IllegalStateException("Stage not found in copy");

5
core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java
View File

@ -12,7 +12,10 @@ import info.openrocket.core.rocketcomponent.position.AxialMethod;
import info.openrocket.core.rocketcomponent.position.AxialPositionable;
import info.openrocket.core.rocketcomponent.position.RadiusMethod;
import info.openrocket.core.startup.Application;
import info.openrocket.core.util.*;
import info.openrocket.core.util.BoundingBox;
import info.openrocket.core.util.Coordinate;
import info.openrocket.core.util.MathUtil;
import info.openrocket.core.util.Transformation;
public class TubeFinSet extends Tube implements AxialPositionable, BoxBounded, RingInstanceable, InsideColorComponent {
private static final Translator trans = Application.getTranslator();

5
core/src/main/java/info/openrocket/core/scripting/GraalJSScriptEngineFactory.java
View File

@ -3,13 +3,16 @@ package info.openrocket.core.scripting;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
import javax.script.ScriptException;
import java.util.*;
import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine;
import org.graalvm.polyglot.Context;
import org.graalvm.polyglot.HostAccess;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class GraalJSScriptEngineFactory implements ScriptEngineFactory {
private static final String ENGINE_NAME = "Graal.js";
private static final String LANGUAGE = "ECMAScript";

4
core/src/main/java/info/openrocket/core/util/TestRockets.java
View File

@ -59,7 +59,9 @@ import info.openrocket.core.rocketcomponent.Transition;
import info.openrocket.core.rocketcomponent.Transition.Shape;
import info.openrocket.core.rocketcomponent.TrapezoidFinSet;
import info.openrocket.core.rocketcomponent.TubeCoupler;
import info.openrocket.core.rocketcomponent.position.*;
import info.openrocket.core.rocketcomponent.position.AngleMethod;
import info.openrocket.core.rocketcomponent.position.AxialMethod;
import info.openrocket.core.rocketcomponent.position.RadiusMethod;
import info.openrocket.core.simulation.customexpression.CustomExpression;
import info.openrocket.core.simulation.exception.SimulationException;
import info.openrocket.core.simulation.extension.impl.ScriptingExtension;

20
core/src/test/java/info/openrocket/core/masscalc/MassCalculatorTest.java
View File

@ -5,7 +5,25 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
import info.openrocket.core.document.OpenRocketDocumentFactory;
import info.openrocket.core.rocketcomponent.*;
import info.openrocket.core.rocketcomponent.AxialStage;
import info.openrocket.core.rocketcomponent.BodyComponent;
import info.openrocket.core.rocketcomponent.BodyTube;
import info.openrocket.core.rocketcomponent.FinSet;
import info.openrocket.core.rocketcomponent.FlightConfiguration;
import info.openrocket.core.rocketcomponent.FlightConfigurationId;
import info.openrocket.core.rocketcomponent.InnerTube;
import info.openrocket.core.rocketcomponent.MassComponent;
import info.openrocket.core.rocketcomponent.MotorMount;
import info.openrocket.core.rocketcomponent.NoseCone;
import info.openrocket.core.rocketcomponent.Parachute;
import info.openrocket.core.rocketcomponent.ParallelStage;
import info.openrocket.core.rocketcomponent.PodSet;
import info.openrocket.core.rocketcomponent.Rocket;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.rocketcomponent.ShockCord;
import info.openrocket.core.rocketcomponent.Transition;
import info.openrocket.core.rocketcomponent.TrapezoidFinSet;
import info.openrocket.core.rocketcomponent.TubeFinSet;
import info.openrocket.core.rocketcomponent.position.AngleMethod;
import info.openrocket.core.rocketcomponent.position.AxialMethod;
import info.openrocket.core.rocketcomponent.position.RadiusMethod;

3
core/src/test/java/info/openrocket/core/rocketcomponent/FinSetTest.java
View File

@ -4,10 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import info.openrocket.core.material.Material;
import info.openrocket.core.rocketcomponent.position.AngleMethod;
import info.openrocket.core.rocketcomponent.position.AxialMethod;
import info.openrocket.core.util.TestRockets;
import org.junit.jupiter.api.Test;
import info.openrocket.core.rocketcomponent.position.*;
import info.openrocket.core.util.Coordinate;
import info.openrocket.core.util.BaseTestCase;

3
core/src/test/java/info/openrocket/core/rocketcomponent/ParallelStageTest.java
View File

@ -5,9 +5,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertNull;
import info.openrocket.core.rocketcomponent.position.AxialMethod;
import info.openrocket.core.rocketcomponent.position.RadiusMethod;
import org.junit.jupiter.api.Test;
import info.openrocket.core.rocketcomponent.position.*;
import info.openrocket.core.util.Coordinate;
import info.openrocket.core.util.TestRockets;
import info.openrocket.core.util.BaseTestCase;

2
core/src/test/java/info/openrocket/core/rocketcomponent/TrapezoidFinSetTest.java
View File

@ -2,10 +2,10 @@ package info.openrocket.core.rocketcomponent;
import static org.junit.jupiter.api.Assertions.assertEquals;
import info.openrocket.core.rocketcomponent.position.AxialMethod;
import org.junit.jupiter.api.Test;
import info.openrocket.core.material.Material;
import info.openrocket.core.rocketcomponent.position.*;
import info.openrocket.core.util.Coordinate;
import info.openrocket.core.util.BaseTestCase;

7
swing/src/main/java/info/openrocket/swing/file/photo/PhotoStudioGetter.java
View File

@ -3,8 +3,13 @@ package info.openrocket.swing.file.photo;
import info.openrocket.core.file.openrocket.importt.OpenRocketHandler;
import info.openrocket.swing.gui.figure3d.photo.PhotoSettings;
import info.openrocket.swing.gui.figure3d.photo.sky.Sky;
import info.openrocket.swing.gui.figure3d.photo.sky.builtin.*;
import info.openrocket.core.util.ORColor;
import info.openrocket.swing.gui.figure3d.photo.sky.builtin.Lake;
import info.openrocket.swing.gui.figure3d.photo.sky.builtin.Meadow;
import info.openrocket.swing.gui.figure3d.photo.sky.builtin.Miramar;
import info.openrocket.swing.gui.figure3d.photo.sky.builtin.Mountains;
import info.openrocket.swing.gui.figure3d.photo.sky.builtin.Orbit;
import info.openrocket.swing.gui.figure3d.photo.sky.builtin.Storm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

8
swing/src/main/java/info/openrocket/swing/gui/configdialog/ParachuteConfig.java
View File

@ -15,6 +15,11 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import info.openrocket.swing.gui.adaptors.CustomFocusTraversalPolicy;
import info.openrocket.swing.gui.adaptors.DoubleModel;
import info.openrocket.swing.gui.adaptors.EnumModel;
import info.openrocket.swing.gui.adaptors.IntegerModel;
import info.openrocket.swing.gui.adaptors.MaterialModel;
import net.miginfocom.swing.MigLayout;
import info.openrocket.core.document.OpenRocketDocument;
@ -28,7 +33,6 @@ import info.openrocket.core.startup.Application;
import info.openrocket.core.unit.UnitGroup;
import info.openrocket.swing.gui.SpinnerEditor;
import info.openrocket.swing.gui.adaptors.*;
import info.openrocket.swing.gui.components.BasicSlider;
import info.openrocket.swing.gui.components.HtmlLabel;
import info.openrocket.swing.gui.components.StyledLabel;
@ -219,7 +223,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig {
DeploymentConfiguration deploymentConfig = parachute.getDeploymentConfigurations().getDefault();
// this issues a warning because EnumModel implements ComboBoxModel without a parameter...
EnumModel<DeploymentConfiguration.DeployEvent> deployOptionsModel = new EnumModel<>(deploymentConfig, "DeployEvent");
EnumModel<DeployEvent> deployOptionsModel = new EnumModel<>(deploymentConfig, "DeployEvent");
register(deployOptionsModel);
JComboBox<DeploymentConfiguration.DeployEvent> eventCombo = new JComboBox<>(deployOptionsModel);
if ((component.getStageNumber() + 1) == d.getRocket().getStageCount()) {

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

@ -34,6 +34,9 @@ import javax.swing.border.Border;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import info.openrocket.core.rocketcomponent.FinSet;
import info.openrocket.core.rocketcomponent.NoseCone;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.swing.gui.theme.ORScrollPaneBorder;
import net.miginfocom.swing.MigLayout;
import info.openrocket.swing.gui.SpinnerEditor;
@ -57,7 +60,6 @@ import info.openrocket.core.database.ComponentPresetDatabase;
import info.openrocket.core.document.OpenRocketDocument;
import info.openrocket.core.l10n.Translator;
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.Preferences;

9
swing/src/main/java/info/openrocket/swing/gui/configdialog/ShockCordConfig.java
View File

@ -1,8 +1,5 @@
package info.openrocket.swing.gui.configdialog;
import javax.swing.*;
import net.miginfocom.swing.MigLayout;
import info.openrocket.core.document.OpenRocketDocument;
@ -21,6 +18,12 @@ import info.openrocket.swing.gui.components.UnitSelector;
import info.openrocket.swing.gui.widgets.SelectColorButton;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

6
swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java
View File

@ -11,7 +11,11 @@ import info.openrocket.core.l10n.Translator;
import info.openrocket.core.masscalc.CMAnalysisEntry;
import info.openrocket.core.masscalc.MassCalculator;
import info.openrocket.core.motor.MotorConfiguration;
import info.openrocket.core.rocketcomponent.*;
import info.openrocket.core.rocketcomponent.ComponentAssembly;
import info.openrocket.core.rocketcomponent.FinSet;
import info.openrocket.core.rocketcomponent.FlightConfiguration;
import info.openrocket.core.rocketcomponent.Rocket;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.startup.Application;
import info.openrocket.core.unit.Unit;
import info.openrocket.core.unit.UnitGroup;

35
swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java
View File

@ -21,13 +21,38 @@ import javax.swing.JSpinner;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import info.openrocket.core.rocketcomponent.AxialStage;
import info.openrocket.core.rocketcomponent.BodyComponent;
import info.openrocket.core.rocketcomponent.BodyTube;
import info.openrocket.core.rocketcomponent.ComponentChangeEvent;
import info.openrocket.core.rocketcomponent.EllipticalFinSet;
import info.openrocket.core.rocketcomponent.FinSet;
import info.openrocket.core.rocketcomponent.FreeformFinSet;
import info.openrocket.core.rocketcomponent.InnerTube;
import info.openrocket.core.rocketcomponent.LaunchLug;
import info.openrocket.core.rocketcomponent.MassComponent;
import info.openrocket.core.rocketcomponent.MassObject;
import info.openrocket.core.rocketcomponent.NoseCone;
import info.openrocket.core.rocketcomponent.Parachute;
import info.openrocket.core.rocketcomponent.ParallelStage;
import info.openrocket.core.rocketcomponent.PodSet;
import info.openrocket.core.rocketcomponent.RadiusRingComponent;
import info.openrocket.core.rocketcomponent.RailButton;
import info.openrocket.core.rocketcomponent.RingComponent;
import info.openrocket.core.rocketcomponent.Rocket;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.rocketcomponent.ShockCord;
import info.openrocket.core.rocketcomponent.Streamer;
import info.openrocket.core.rocketcomponent.SymmetricComponent;
import info.openrocket.core.rocketcomponent.ThicknessRingComponent;
import info.openrocket.core.rocketcomponent.Transition;
import info.openrocket.core.rocketcomponent.TrapezoidFinSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.openrocket.core.document.OpenRocketDocument;
import info.openrocket.core.l10n.Translator;
import info.openrocket.core.logging.Markers;
import info.openrocket.core.rocketcomponent.*;
import info.openrocket.core.startup.Application;
import info.openrocket.core.unit.Unit;
import info.openrocket.core.unit.UnitGroup;
@ -63,10 +88,8 @@ public class ScaleDialog extends JDialog {
* There are two scaler instances; one for when the offset distances (axial/radial offset) don't need to be scaled
* together with the other dimensions and one for when the offsets do need to scale.
*/
private static final Map<Class<? extends RocketComponent>, List<Scaler>> SCALERS_NO_OFFSET =
new HashMap<Class<? extends RocketComponent>, List<Scaler>>();
private static final Map<Class<? extends RocketComponent>, List<Scaler>> SCALERS_OFFSET =
new HashMap<Class<? extends RocketComponent>, List<Scaler>>();
private static final Map<Class<? extends RocketComponent>, List<Scaler>> SCALERS_NO_OFFSET = new HashMap<>();
private static final Map<Class<? extends RocketComponent>, List<Scaler>> SCALERS_OFFSET = new HashMap<>();
static {
List<Scaler> list;
@ -467,7 +490,7 @@ public class ScaleDialog extends JDialog {
doScale();
rocket.enableEvents(true);
ScaleDialog.this.document.getRocket().fireComponentChangeEvent( ComponentChangeEvent.AEROMASS_CHANGE);
ScaleDialog.this.document.getRocket().fireComponentChangeEvent(ComponentChangeEvent.AEROMASS_CHANGE);
ScaleDialog.this.setVisible(false);
}

17
swing/src/main/java/info/openrocket/swing/gui/main/RocketActions.java
View File

@ -5,7 +5,15 @@ import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.io.Serial;
import java.util.*;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.Action;
@ -15,7 +23,12 @@ import javax.swing.KeyStroke;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import info.openrocket.core.rocketcomponent.*;
import info.openrocket.core.rocketcomponent.AxialStage;
import info.openrocket.core.rocketcomponent.ComponentChangeEvent;
import info.openrocket.core.rocketcomponent.ComponentChangeListener;
import info.openrocket.core.rocketcomponent.ParallelStage;
import info.openrocket.core.rocketcomponent.Rocket;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.swing.gui.configdialog.ComponentConfigDialog;
import info.openrocket.swing.gui.dialogs.ScaleDialog;
import info.openrocket.swing.gui.util.GUIUtil;

8
swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
View File

@ -23,8 +23,14 @@ import javax.swing.event.ListSelectionListener;
import info.openrocket.core.document.OpenRocketDocument;
import info.openrocket.core.formatting.RocketDescriptor;
import info.openrocket.core.l10n.Translator;
import info.openrocket.core.rocketcomponent.*;
import info.openrocket.core.rocketcomponent.ComponentChangeEvent;
import info.openrocket.core.rocketcomponent.DeploymentConfiguration;
import info.openrocket.core.rocketcomponent.DeploymentConfiguration.DeployEvent;
import info.openrocket.core.rocketcomponent.FlightConfigurableComponent;
import info.openrocket.core.rocketcomponent.FlightConfigurationId;
import info.openrocket.core.rocketcomponent.RecoveryDevice;
import info.openrocket.core.rocketcomponent.Rocket;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.startup.Application;
import info.openrocket.core.unit.UnitGroup;

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

@ -14,7 +14,13 @@ import java.awt.geom.Line2D;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.text.DecimalFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

6
swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java
View File

@ -1,8 +1,10 @@
package info.openrocket.swing.gui.preset;
import javax.swing.*;
import javax.swing.JComboBox;
import javax.swing.JList;
import javax.swing.UIManager;
import javax.swing.plaf.basic.BasicComboBoxRenderer;
import java.awt.*;
import java.awt.Component;
import java.util.HashSet;
import java.util.Set;

11
swing/src/main/java/info/openrocket/swing/gui/preset/ImagePreviewPanel.java
View File

@ -1,9 +1,12 @@
package info.openrocket.swing.gui.preset;
import javax.swing.*;
import java.awt.*;
import javax.swing.ImageIcon;
import javax.swing.JFileChooser;
import javax.swing.JPanel;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Image;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;

6
swing/src/main/java/info/openrocket/swing/gui/print/PDFPrintStreamDoc.java
View File

@ -7,7 +7,11 @@ import javax.print.Doc;
import javax.print.DocFlavor;
import javax.print.attribute.AttributeSetUtilities;
import javax.print.attribute.DocAttributeSet;
import java.io.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
/**
* This class implements a javax Doc specifically for PDF printing. All reports in OpenRocket are PDF (iText) based.

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

@ -8,7 +8,7 @@ import info.openrocket.swing.gui.print.PrintableContext;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.rocketcomponent.AxialStage;
import javax.swing.*;
import javax.swing.JTree;
import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeWillExpandListener;
import javax.swing.tree.DefaultMutableTreeNode;

13
swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java
View File

@ -5,7 +5,18 @@ package info.openrocket.swing.gui.print.visitor;
import com.itextpdf.text.Document;
import com.itextpdf.text.pdf.PdfWriter;
import info.openrocket.core.rocketcomponent.*;
import info.openrocket.core.rocketcomponent.BodyTube;
import info.openrocket.core.rocketcomponent.Coaxial;
import info.openrocket.core.rocketcomponent.EllipticalFinSet;
import info.openrocket.core.rocketcomponent.FreeformFinSet;
import info.openrocket.core.rocketcomponent.InnerTube;
import info.openrocket.core.rocketcomponent.LaunchLug;
import info.openrocket.core.rocketcomponent.NoseCone;
import info.openrocket.core.rocketcomponent.RadiusRingComponent;
import info.openrocket.core.rocketcomponent.RingComponent;
import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.rocketcomponent.Transition;
import info.openrocket.core.rocketcomponent.TrapezoidFinSet;
import java.util.HashMap;
import java.util.List;

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

@ -5,7 +5,7 @@ import info.openrocket.core.rocketcomponent.Transition;
import info.openrocket.core.util.Coordinate;
import info.openrocket.core.util.Transformation;
import java.awt.*;
import java.awt.Shape;
import java.awt.geom.Ellipse2D;
import java.awt.geom.Path2D;

7
swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java
View File

@ -14,8 +14,13 @@ import java.awt.geom.Ellipse2D;
import java.awt.geom.NoninvertibleTransformException;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.LinkedHashSet;
import java.util.Map.Entry;
import java.util.PriorityQueue;
import java.util.Set;
import info.openrocket.core.rocketcomponent.AxialStage;
import info.openrocket.core.rocketcomponent.ParallelStage;

15
swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java
View File

@ -22,7 +22,20 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.stream.Collectors;
import javax.swing.*;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JSeparator;
import javax.swing.JSlider;
import javax.swing.JViewport;
import javax.swing.ListCellRenderer;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.TreeSelectionEvent;

4
swing/src/main/java/info/openrocket/swing/gui/util/FileHelper.java
View File

@ -7,13 +7,13 @@ import info.openrocket.core.logging.Markers;
import info.openrocket.core.startup.Application;
import javax.imageio.ImageIO;
import javax.swing.*;
import javax.swing.JOptionPane;
import javax.swing.filechooser.FileFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.awt.*;
import java.awt.Component;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;

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

@ -1,6 +1,14 @@
package info.openrocket.swing.gui.util;
import java.awt.*;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Image;
import java.awt.KeyboardFocusManager;
import java.awt.Point;
import java.awt.Toolkit;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ComponentAdapter;
@ -83,7 +91,7 @@ public class GUIUtil {
private static final KeyStroke ESCAPE = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
private static final String CLOSE_ACTION_KEY = "escape:WINDOW_CLOSING";
private static final List<Image> images = new ArrayList<Image>();
private static final List<Image> images = new ArrayList<>();
static {
loadImage("pix/icon/icon-256.png");
loadImage("pix/icon/icon-064.png");

5
swing/src/main/java/info/openrocket/swing/gui/util/Icons.java
View File

@ -7,7 +7,8 @@ import info.openrocket.core.startup.Application;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.*;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import java.awt.Component;
import java.awt.Graphics;
import java.awt.Image;
@ -34,7 +35,7 @@ public class Icons {
final String SIM_CANTRUN = "pix/icons/sim_cantrun.png";
final String SIM_OUTDATED = "pix/icons/refresh_sim.png";
HashMap<Simulation.Status, Icon> map = new HashMap<Simulation.Status, Icon>();
HashMap<Simulation.Status, Icon> map = new HashMap<>();
map.put(Simulation.Status.NOT_SIMULATED, loadImageIcon(SIM_OUTDATED, "Not simulated"));
map.put(Simulation.Status.CANT_RUN, loadImageIcon(SIM_CANTRUN, "Can't run, no motors assigned."));
map.put(Simulation.Status.UPTODATE, loadImageIcon(SIM_UPTODATE, "Up to date"));

5
swing/src/main/java/info/openrocket/swing/startup/OSXSetup.java
View File

@ -1,6 +1,9 @@
package info.openrocket.swing.startup;
import java.awt.*;
import java.awt.Desktop;
import java.awt.Image;
import java.awt.Taskbar;
import java.awt.Toolkit;
import java.awt.desktop.AboutHandler;
import java.awt.desktop.OpenFilesHandler;
import java.awt.desktop.PreferencesHandler;