diff --git a/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/TubeFinSetCalc.java b/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/TubeFinSetCalc.java index 6ecd955cb..6689e4044 100644 --- a/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/TubeFinSetCalc.java +++ b/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/TubeFinSetCalc.java @@ -6,7 +6,6 @@ import info.openrocket.core.aerodynamics.AerodynamicForces; import info.openrocket.core.aerodynamics.FlightConditions; import info.openrocket.core.logging.Warning; import info.openrocket.core.logging.WarningSet; -import info.openrocket.core.rocketcomponent.BodyTube; import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.rocketcomponent.TubeFinSet; import info.openrocket.core.util.Coordinate; diff --git a/core/src/main/java/info/openrocket/core/appearance/defaults/ResourceDecalImage.java b/core/src/main/java/info/openrocket/core/appearance/defaults/ResourceDecalImage.java index a2dca1f88..90b539f51 100644 --- a/core/src/main/java/info/openrocket/core/appearance/defaults/ResourceDecalImage.java +++ b/core/src/main/java/info/openrocket/core/appearance/defaults/ResourceDecalImage.java @@ -2,7 +2,6 @@ package info.openrocket.core.appearance.defaults; import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSet.java b/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSet.java index 5e2032f6c..ae3d7e521 100644 --- a/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSet.java +++ b/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSet.java @@ -7,8 +7,6 @@ import java.util.IdentityHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import info.openrocket.core.motor.DesignationComparator; import info.openrocket.core.motor.Manufacturer; diff --git a/core/src/main/java/info/openrocket/core/document/attachments/FileSystemAttachment.java b/core/src/main/java/info/openrocket/core/document/attachments/FileSystemAttachment.java index 0b6d99a0b..688c5106a 100644 --- a/core/src/main/java/info/openrocket/core/document/attachments/FileSystemAttachment.java +++ b/core/src/main/java/info/openrocket/core/document/attachments/FileSystemAttachment.java @@ -2,7 +2,6 @@ package info.openrocket.core.document.attachments; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/OpenRocketLoader.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/OpenRocketLoader.java index 91e2087f9..9dd9e127a 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/OpenRocketLoader.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/OpenRocketLoader.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -import info.openrocket.core.rocketcomponent.ComponentChangeEvent; import info.openrocket.core.rocketcomponent.FlightConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,7 +12,6 @@ import org.xml.sax.SAXException; import info.openrocket.core.document.OpenRocketDocument; import info.openrocket.core.document.Simulation; -import info.openrocket.core.document.StorageOptions; import info.openrocket.core.document.StorageOptions.FileType; import info.openrocket.core.file.AbstractRocketLoader; import info.openrocket.core.file.DocumentLoadingContext; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/FinSetSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/FinSetSaver.java index dd4a25d05..77268ac30 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/FinSetSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/FinSetSaver.java @@ -3,8 +3,6 @@ package info.openrocket.core.file.openrocket.savers; import java.util.List; import java.util.Locale; -import info.openrocket.core.rocketcomponent.FinSet; -import info.openrocket.core.rocketcomponent.position.AxialMethod; import info.openrocket.core.util.MathUtil; public class FinSetSaver extends ExternalComponentSaver { diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/NoseConeSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/NoseConeSaver.java index 0ca90caa1..c855ed5e8 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/NoseConeSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/NoseConeSaver.java @@ -4,7 +4,6 @@ import info.openrocket.core.rocketcomponent.NoseCone; import java.util.ArrayList; import java.util.List; -import java.util.Locale; public class NoseConeSaver extends TransitionSaver { diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/RASAeroMotorsLoader.java b/core/src/main/java/info/openrocket/core/file/rasaero/RASAeroMotorsLoader.java index ab2001809..dba114d0b 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/RASAeroMotorsLoader.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/RASAeroMotorsLoader.java @@ -1,6 +1,5 @@ package info.openrocket.core.file.rasaero; -import info.openrocket.core.file.motor.GeneralMotorLoader; import info.openrocket.core.file.motor.RASPMotorLoader; import info.openrocket.core.logging.WarningSet; import info.openrocket.core.database.motor.ThrustCurveMotorSet; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/PodSetDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/PodSetDTO.java index 78574661e..7a6018b4c 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/PodSetDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/PodSetDTO.java @@ -9,7 +9,6 @@ import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.rocketcomponent.position.AnglePositionable; import info.openrocket.core.rocketcomponent.position.AxialMethod; -import info.openrocket.core.rocketcomponent.position.RadiusMethod; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeCouplerDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeCouplerDTO.java index 9ba01a36d..cb0357713 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeCouplerDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeCouplerDTO.java @@ -1,26 +1,20 @@ package info.openrocket.core.file.rocksim.export; import info.openrocket.core.file.rocksim.RockSimCommonConstants; -import info.openrocket.core.rocketcomponent.BodyTube; import info.openrocket.core.rocketcomponent.Bulkhead; import info.openrocket.core.rocketcomponent.CenteringRing; import info.openrocket.core.rocketcomponent.EngineBlock; -import info.openrocket.core.rocketcomponent.FinSet; -import info.openrocket.core.rocketcomponent.FreeformFinSet; import info.openrocket.core.rocketcomponent.InnerTube; import info.openrocket.core.rocketcomponent.MassObject; import info.openrocket.core.rocketcomponent.Parachute; import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.rocketcomponent.Streamer; -import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.rocketcomponent.TubeCoupler; import info.openrocket.core.rocketcomponent.position.AxialMethod; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlRootElement; -import java.util.ArrayList; -import java.util.List; /** * Conversion DTO for a TubeCoupler. TubeCoupler's are represented as Rings in diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/shapes/PolygonExporter.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/shapes/PolygonExporter.java index 87c85ce8f..f539f8cd1 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/shapes/PolygonExporter.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/shapes/PolygonExporter.java @@ -3,7 +3,6 @@ package info.openrocket.core.file.wavefrontobj.export.shapes; import com.sun.istack.NotNull; import info.openrocket.core.file.wavefrontobj.CoordTransform; import info.openrocket.core.file.wavefrontobj.DefaultObj; -import info.openrocket.core.file.wavefrontobj.DefaultObjEdge; import info.openrocket.core.file.wavefrontobj.DefaultObjFace; import info.openrocket.core.file.wavefrontobj.ObjUtils; diff --git a/core/src/main/java/info/openrocket/core/logging/Warning.java b/core/src/main/java/info/openrocket/core/logging/Warning.java index 8e120d758..572d7fd94 100644 --- a/core/src/main/java/info/openrocket/core/logging/Warning.java +++ b/core/src/main/java/info/openrocket/core/logging/Warning.java @@ -2,7 +2,6 @@ package info.openrocket.core.logging; import info.openrocket.core.l10n.Translator; import info.openrocket.core.motor.Motor; -import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.startup.Application; import info.openrocket.core.simulation.FlightEvent; import info.openrocket.core.unit.UnitGroup; diff --git a/core/src/main/java/info/openrocket/core/masscalc/MassCalculator.java b/core/src/main/java/info/openrocket/core/masscalc/MassCalculator.java index 5dd40a0c0..dae4f9117 100644 --- a/core/src/main/java/info/openrocket/core/masscalc/MassCalculator.java +++ b/core/src/main/java/info/openrocket/core/masscalc/MassCalculator.java @@ -6,7 +6,6 @@ import java.util.Map; import info.openrocket.core.motor.Motor; import info.openrocket.core.rocketcomponent.FlightConfiguration; -import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.simulation.MotorClusterState; import info.openrocket.core.simulation.SimulationStatus; import info.openrocket.core.util.MathUtil; diff --git a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/RocketOptimizationFunction.java b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/RocketOptimizationFunction.java index 61ad46163..3204f4f18 100644 --- a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/RocketOptimizationFunction.java +++ b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/RocketOptimizationFunction.java @@ -11,7 +11,6 @@ import info.openrocket.core.document.Simulation; import info.openrocket.core.optimization.general.Function; import info.openrocket.core.optimization.general.OptimizationException; import info.openrocket.core.optimization.general.Point; -import info.openrocket.core.rocketcomponent.Rocket; import info.openrocket.core.unit.UnitGroup; import info.openrocket.core.unit.Value; import info.openrocket.core.util.Pair; diff --git a/core/src/main/java/info/openrocket/core/preset/ComponentPresetFactory.java b/core/src/main/java/info/openrocket/core/preset/ComponentPresetFactory.java index 12b325f75..58909c32f 100644 --- a/core/src/main/java/info/openrocket/core/preset/ComponentPresetFactory.java +++ b/core/src/main/java/info/openrocket/core/preset/ComponentPresetFactory.java @@ -3,7 +3,6 @@ package info.openrocket.core.preset; import static info.openrocket.core.preset.ComponentPreset.*; import info.openrocket.core.database.Databases; import info.openrocket.core.material.Material; -import info.openrocket.core.preset.ComponentPreset.Type; import info.openrocket.core.rocketcomponent.NoseCone; import info.openrocket.core.rocketcomponent.RailButton; import info.openrocket.core.rocketcomponent.Transition; diff --git a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java index 8ebd6756d..2f02cee45 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java @@ -10,7 +10,6 @@ import jakarta.xml.bind.annotation.XmlElementRef; import jakarta.xml.bind.annotation.XmlElementRefs; import jakarta.xml.bind.annotation.XmlElementWrapper; import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlValue; import info.openrocket.core.material.Material; import info.openrocket.core.preset.ComponentPreset; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/BodyTube.java b/core/src/main/java/info/openrocket/core/rocketcomponent/BodyTube.java index 3e13f48b1..b4d3126e3 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/BodyTube.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/BodyTube.java @@ -12,7 +12,6 @@ import info.openrocket.core.util.BoundingBox; import info.openrocket.core.util.BugException; import info.openrocket.core.util.Coordinate; import info.openrocket.core.util.MathUtil; -import info.openrocket.core.util.ModID; /** * Rocket body tube component. Has only two parameters, a radius and length. diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/ComponentAssembly.java b/core/src/main/java/info/openrocket/core/rocketcomponent/ComponentAssembly.java index 92076177b..63416f2c7 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/ComponentAssembly.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/ComponentAssembly.java @@ -2,7 +2,6 @@ package info.openrocket.core.rocketcomponent; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import info.openrocket.core.util.BoundingBox; import org.slf4j.Logger; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java index 72b0fef3e..ff89f82fc 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java @@ -13,7 +13,6 @@ import info.openrocket.core.formatting.RocketDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import info.openrocket.core.l10n.Translator; import info.openrocket.core.motor.MotorConfiguration; import info.openrocket.core.motor.MotorConfigurationId; import info.openrocket.core.startup.Application; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/InnerTube.java b/core/src/main/java/info/openrocket/core/rocketcomponent/InnerTube.java index ace83e476..d70a23e6d 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/InnerTube.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/InnerTube.java @@ -19,7 +19,6 @@ import info.openrocket.core.startup.Application; import info.openrocket.core.util.BugException; import info.openrocket.core.util.Coordinate; import info.openrocket.core.util.MathUtil; -import info.openrocket.core.util.ModID; /** * This class defines an inner tube that can be used as a motor mount. The diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/InsideColorComponent.java b/core/src/main/java/info/openrocket/core/rocketcomponent/InsideColorComponent.java index 35b7b1cf2..b03aed9cb 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/InsideColorComponent.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/InsideColorComponent.java @@ -1,14 +1,5 @@ package info.openrocket.core.rocketcomponent; -import info.openrocket.core.appearance.Appearance; -import info.openrocket.core.appearance.Decal; -import info.openrocket.core.rocketcomponent.ComponentChangeEvent; -import info.openrocket.core.rocketcomponent.RocketComponent; -import info.openrocket.core.rocketcomponent.position.AxialMethod; -import info.openrocket.core.util.StateChangeListener; - -import java.util.EventObject; - /** * This is a marker interface which, if applied to a component, will mark that * component as having the possibility to diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java b/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java index 577dc7714..703b85e50 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java @@ -12,7 +12,6 @@ import info.openrocket.core.startup.Application; import info.openrocket.core.util.BoundingBox; import info.openrocket.core.util.Coordinate; import info.openrocket.core.util.MathUtil; -import info.openrocket.core.util.ModID; import info.openrocket.core.util.StateChangeListener; import info.openrocket.core.util.ModID; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java b/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java index f56c514f4..e3e43bb63 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java @@ -2,11 +2,8 @@ package info.openrocket.core.rocketcomponent; import java.util.ArrayList; import java.util.Collection; -import java.util.EventObject; import java.util.List; -import info.openrocket.core.appearance.Appearance; -import info.openrocket.core.appearance.Decal; import info.openrocket.core.l10n.Translator; import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.ComponentPreset.Type; diff --git a/core/src/main/java/info/openrocket/core/simulation/AbstractEulerStepper.java b/core/src/main/java/info/openrocket/core/simulation/AbstractEulerStepper.java index d1042183e..9637a78a8 100644 --- a/core/src/main/java/info/openrocket/core/simulation/AbstractEulerStepper.java +++ b/core/src/main/java/info/openrocket/core/simulation/AbstractEulerStepper.java @@ -7,13 +7,9 @@ import org.slf4j.LoggerFactory; import info.openrocket.core.aerodynamics.AerodynamicForces; import info.openrocket.core.l10n.Translator; import info.openrocket.core.masscalc.RigidBody; -import info.openrocket.core.models.atmosphere.AtmosphericConditions; -import info.openrocket.core.rocketcomponent.InstanceMap; -import info.openrocket.core.rocketcomponent.RecoveryDevice; import info.openrocket.core.simulation.exception.SimulationException; import info.openrocket.core.startup.Application; import info.openrocket.core.util.Coordinate; -import info.openrocket.core.util.GeodeticComputationStrategy; import info.openrocket.core.util.MathUtil; import info.openrocket.core.util.WorldCoordinate; diff --git a/core/src/main/java/info/openrocket/core/simulation/BasicTumbleStepper.java b/core/src/main/java/info/openrocket/core/simulation/BasicTumbleStepper.java index a708729ac..7952ad944 100644 --- a/core/src/main/java/info/openrocket/core/simulation/BasicTumbleStepper.java +++ b/core/src/main/java/info/openrocket/core/simulation/BasicTumbleStepper.java @@ -1,7 +1,6 @@ package info.openrocket.core.simulation; import java.util.ArrayList; -import java.util.Iterator; import java.util.Map; import info.openrocket.core.rocketcomponent.FinSet; diff --git a/core/src/main/java/info/openrocket/core/simulation/GroundStepper.java b/core/src/main/java/info/openrocket/core/simulation/GroundStepper.java index e68bcebd2..cde355c62 100644 --- a/core/src/main/java/info/openrocket/core/simulation/GroundStepper.java +++ b/core/src/main/java/info/openrocket/core/simulation/GroundStepper.java @@ -3,10 +3,7 @@ package info.openrocket.core.simulation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import info.openrocket.core.models.atmosphere.AtmosphericConditions; import info.openrocket.core.simulation.exception.SimulationException; -import info.openrocket.core.util.MathUtil; -import info.openrocket.core.util.Coordinate; public class GroundStepper extends AbstractSimulationStepper { private static final Logger log = LoggerFactory.getLogger(GroundStepper.class); diff --git a/core/src/main/java/info/openrocket/core/simulation/RK4SimulationStepper.java b/core/src/main/java/info/openrocket/core/simulation/RK4SimulationStepper.java index 889e74d17..9ab38acd1 100644 --- a/core/src/main/java/info/openrocket/core/simulation/RK4SimulationStepper.java +++ b/core/src/main/java/info/openrocket/core/simulation/RK4SimulationStepper.java @@ -7,7 +7,6 @@ import info.openrocket.core.logging.SimulationAbort; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import info.openrocket.core.aerodynamics.AerodynamicForces; import info.openrocket.core.aerodynamics.FlightConditions; import info.openrocket.core.logging.WarningSet; import info.openrocket.core.l10n.Translator; @@ -18,7 +17,6 @@ import info.openrocket.core.simulation.exception.SimulationException; import info.openrocket.core.simulation.listeners.SimulationListenerHelper; import info.openrocket.core.startup.Application; import info.openrocket.core.util.Coordinate; -import info.openrocket.core.util.GeodeticComputationStrategy; import info.openrocket.core.util.MathUtil; import info.openrocket.core.util.Quaternion; import info.openrocket.core.util.Rotation2D; diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java b/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java index e9add9633..60b5f286f 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java @@ -5,7 +5,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectOutputStream; -import java.net.MalformedURLException; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/ThrustCurveAPI.java b/core/src/main/java/info/openrocket/core/thrustcurve/ThrustCurveAPI.java index 6efd3636e..e6f817964 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/ThrustCurveAPI.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/ThrustCurveAPI.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.HttpURLConnection; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.util.Collections; diff --git a/core/src/main/java/info/openrocket/core/unit/UnitGroup.java b/core/src/main/java/info/openrocket/core/unit/UnitGroup.java index 90d24d10e..5cb7cc5d5 100644 --- a/core/src/main/java/info/openrocket/core/unit/UnitGroup.java +++ b/core/src/main/java/info/openrocket/core/unit/UnitGroup.java @@ -20,7 +20,6 @@ import info.openrocket.core.l10n.Translator; import info.openrocket.core.rocketcomponent.FlightConfiguration; import info.openrocket.core.rocketcomponent.Rocket; import info.openrocket.core.startup.Application; -import info.openrocket.core.util.Chars; import info.openrocket.core.util.StringUtils; /** diff --git a/core/src/main/java/info/openrocket/core/util/TestRockets.java b/core/src/main/java/info/openrocket/core/util/TestRockets.java index 8f0549732..3deb1083d 100644 --- a/core/src/main/java/info/openrocket/core/util/TestRockets.java +++ b/core/src/main/java/info/openrocket/core/util/TestRockets.java @@ -10,7 +10,6 @@ import info.openrocket.core.database.Databases; import info.openrocket.core.document.OpenRocketDocument; import info.openrocket.core.document.OpenRocketDocumentFactory; import info.openrocket.core.document.Simulation; -import info.openrocket.core.document.StorageOptions; import info.openrocket.core.file.openrocket.OpenRocketSaver; import info.openrocket.core.logging.ErrorSet; import info.openrocket.core.logging.WarningSet; diff --git a/core/src/main/java/info/openrocket/core/util/TextUtil.java b/core/src/main/java/info/openrocket/core/util/TextUtil.java index 8c256534f..fe086429f 100644 --- a/core/src/main/java/info/openrocket/core/util/TextUtil.java +++ b/core/src/main/java/info/openrocket/core/util/TextUtil.java @@ -2,7 +2,6 @@ package info.openrocket.core.util; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import java.text.DecimalFormat; import java.util.Locale; public class TextUtil { diff --git a/core/src/test/java/info/openrocket/core/communication/HttpURLConnectionMock.java b/core/src/test/java/info/openrocket/core/communication/HttpURLConnectionMock.java index 0b7214279..c6fd23f27 100644 --- a/core/src/test/java/info/openrocket/core/communication/HttpURLConnectionMock.java +++ b/core/src/test/java/info/openrocket/core/communication/HttpURLConnectionMock.java @@ -5,7 +5,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.ProtocolException; diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/RockSimLoaderTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/RockSimLoaderTest.java index d75b40d1b..ebc0defad 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/RockSimLoaderTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/RockSimLoaderTest.java @@ -16,7 +16,6 @@ import info.openrocket.core.rocketcomponent.MassComponent; 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.RocketComponent; import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.rocketcomponent.TrapezoidFinSet; diff --git a/core/src/test/java/info/openrocket/core/masscalc/MassCalculatorTest.java b/core/src/test/java/info/openrocket/core/masscalc/MassCalculatorTest.java index 6c155e598..37228e930 100644 --- a/core/src/test/java/info/openrocket/core/masscalc/MassCalculatorTest.java +++ b/core/src/test/java/info/openrocket/core/masscalc/MassCalculatorTest.java @@ -9,7 +9,6 @@ import info.openrocket.core.rocketcomponent.*; 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.util.MathUtil; import org.junit.jupiter.api.Test; import info.openrocket.core.motor.Motor; diff --git a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/TestRocketOptimizationFunction.java b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/TestRocketOptimizationFunction.java index 0ec5b895d..003ebf043 100644 --- a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/TestRocketOptimizationFunction.java +++ b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/TestRocketOptimizationFunction.java @@ -11,7 +11,6 @@ import static org.mockito.Mockito.when; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.runner.RunWith; import info.openrocket.core.document.Simulation; import info.openrocket.core.optimization.general.OptimizationException; diff --git a/core/src/test/java/info/openrocket/core/preset/BodyTubePresetTests.java b/core/src/test/java/info/openrocket/core/preset/BodyTubePresetTests.java index ec4f4b442..c22507af4 100644 --- a/core/src/test/java/info/openrocket/core/preset/BodyTubePresetTests.java +++ b/core/src/test/java/info/openrocket/core/preset/BodyTubePresetTests.java @@ -1,7 +1,6 @@ package info.openrocket.core.preset; import static org.junit.jupiter.api.Assertions.assertEquals; -import info.openrocket.core.material.Material; import info.openrocket.core.motor.Manufacturer; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/info/openrocket/core/simulation/DisableStageTest.java b/core/src/test/java/info/openrocket/core/simulation/DisableStageTest.java index 4ab0c602c..e2c3cd7fb 100644 --- a/core/src/test/java/info/openrocket/core/simulation/DisableStageTest.java +++ b/core/src/test/java/info/openrocket/core/simulation/DisableStageTest.java @@ -12,7 +12,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import org.junit.Assert; import org.junit.jupiter.api.Test; /** diff --git a/core/src/test/java/info/openrocket/core/simulation/FlightEventsTest.java b/core/src/test/java/info/openrocket/core/simulation/FlightEventsTest.java index 72f63fdad..eaa5dcbc0 100644 --- a/core/src/test/java/info/openrocket/core/simulation/FlightEventsTest.java +++ b/core/src/test/java/info/openrocket/core/simulation/FlightEventsTest.java @@ -11,7 +11,6 @@ import info.openrocket.core.rocketcomponent.Rocket; import info.openrocket.core.simulation.exception.SimulationException; import info.openrocket.core.util.BaseTestCase; import info.openrocket.core.util.TestRockets; -import org.junit.Assert; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/swing/src/main/java/info/openrocket/swing/gui/adaptors/BooleanModel.java b/swing/src/main/java/info/openrocket/swing/gui/adaptors/BooleanModel.java index e6b1db549..7d347c373 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/adaptors/BooleanModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/adaptors/BooleanModel.java @@ -23,8 +23,6 @@ import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.util.BugException; import info.openrocket.core.util.ChangeSource; import info.openrocket.core.util.Invalidatable; -import info.openrocket.core.util.Invalidator; -import info.openrocket.core.util.MemoryManagement; import info.openrocket.core.util.Reflection; import info.openrocket.core.util.StateChangeListener; diff --git a/swing/src/main/java/info/openrocket/swing/gui/adaptors/DoubleModel.java b/swing/src/main/java/info/openrocket/swing/gui/adaptors/DoubleModel.java index f9c4344e4..eb373188c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/adaptors/DoubleModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/adaptors/DoubleModel.java @@ -30,9 +30,7 @@ import info.openrocket.core.util.ChangeSource; import info.openrocket.core.util.ExpressionParser; import info.openrocket.core.util.InvalidExpressionException; import info.openrocket.core.util.Invalidatable; -import info.openrocket.core.util.Invalidator; import info.openrocket.core.util.MathUtil; -import info.openrocket.core.util.MemoryManagement; import info.openrocket.core.util.Reflection; import info.openrocket.core.util.StateChangeListener; diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/BasicTree.java b/swing/src/main/java/info/openrocket/swing/gui/components/BasicTree.java index 8edaccf23..12efc73c2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/BasicTree.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/BasicTree.java @@ -3,9 +3,6 @@ package info.openrocket.swing.gui.components; import info.openrocket.swing.gui.util.GUIUtil; import info.openrocket.swing.gui.theme.UITheme; -import info.openrocket.swing.gui.util.GUIUtil; -import info.openrocket.swing.gui.theme.UITheme; - import java.awt.BasicStroke; import java.awt.Color; import java.awt.Component; diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/DescriptionArea.java b/swing/src/main/java/info/openrocket/swing/gui/components/DescriptionArea.java index 17e0dc5b9..83ffdc3eb 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/DescriptionArea.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/DescriptionArea.java @@ -1,7 +1,5 @@ package info.openrocket.swing.gui.components; -import info.openrocket.swing.gui.util.GUIUtil; -import info.openrocket.swing.gui.theme.UITheme; import info.openrocket.swing.gui.util.URLUtil; import java.awt.Color; diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/ComponentAssemblyConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/ComponentAssemblyConfig.java index 214b3a73a..728fe1763 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/ComponentAssemblyConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/ComponentAssemblyConfig.java @@ -18,7 +18,6 @@ import info.openrocket.core.rocketcomponent.ComponentAssembly; import info.openrocket.core.rocketcomponent.ParallelStage; import info.openrocket.core.rocketcomponent.PodSet; import info.openrocket.core.rocketcomponent.RocketComponent; -import info.openrocket.core.rocketcomponent.position.AxialMethod; import info.openrocket.core.rocketcomponent.position.RadiusMethod; import info.openrocket.core.startup.Application; import info.openrocket.core.unit.UnitGroup; diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/InstancesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/InstancesPanel.java index 88469618b..510dddc9e 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/InstancesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/InstancesPanel.java @@ -3,27 +3,21 @@ package info.openrocket.swing.gui.configdialog; import net.miginfocom.swing.MigLayout; import info.openrocket.swing.gui.SpinnerEditor; 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.components.BasicSlider; import info.openrocket.swing.gui.components.UnitSelector; import info.openrocket.core.l10n.Translator; import info.openrocket.core.rocketcomponent.RocketComponent; -import info.openrocket.core.rocketcomponent.position.AxialMethod; import info.openrocket.core.startup.Application; import info.openrocket.core.unit.UnitGroup; import info.openrocket.core.util.Invalidatable; import javax.swing.BorderFactory; -import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JSpinner; import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.util.ArrayList; -import java.util.EventObject; import java.util.List; /** diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/ParachuteConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/ParachuteConfig.java index aa32cb72c..77c53b1cc 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/ParachuteConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/ParachuteConfig.java @@ -7,16 +7,13 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import javax.swing.BorderFactory; -import javax.swing.ComboBoxModel; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JSeparator; import javax.swing.JSpinner; -import javax.swing.SwingConstants; import net.miginfocom.swing.MigLayout; diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/RailButtonConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/RailButtonConfig.java index cd3bc9974..e09abb1d9 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/RailButtonConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/RailButtonConfig.java @@ -18,7 +18,6 @@ import info.openrocket.core.unit.UnitGroup; import info.openrocket.swing.gui.SpinnerEditor; import info.openrocket.swing.gui.adaptors.CustomFocusTraversalPolicy; import info.openrocket.swing.gui.adaptors.DoubleModel; -import info.openrocket.swing.gui.adaptors.IntegerModel; import info.openrocket.swing.gui.components.BasicSlider; import info.openrocket.swing.gui.components.UnitSelector; 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 2975bb36e..3b21ae371 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 @@ -30,7 +30,6 @@ import javax.swing.JTabbedPane; import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.SwingUtilities; -import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/TrapezoidFinSetConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/TrapezoidFinSetConfig.java index 06222f54a..72f34b395 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/TrapezoidFinSetConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/TrapezoidFinSetConfig.java @@ -5,9 +5,7 @@ import javax.swing.JComboBox; import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JSeparator; import javax.swing.JSpinner; -import javax.swing.SwingConstants; import net.miginfocom.swing.MigLayout; diff --git a/swing/src/main/java/info/openrocket/swing/gui/customexpression/CustomExpressionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/customexpression/CustomExpressionPanel.java index 126821a85..3e095bb3e 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/customexpression/CustomExpressionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/customexpression/CustomExpressionPanel.java @@ -24,14 +24,6 @@ import info.openrocket.swing.gui.theme.UITheme; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import info.openrocket.core.document.OpenRocketDocument; -import info.openrocket.core.file.GeneralRocketLoader; -import info.openrocket.core.file.RocketLoadException; -import info.openrocket.core.l10n.Translator; -import info.openrocket.core.logging.Markers; -import info.openrocket.core.simulation.customexpression.CustomExpression; -import info.openrocket.core.startup.Application; - import net.miginfocom.swing.MigLayout; import info.openrocket.core.document.OpenRocketDocument; import info.openrocket.core.file.GeneralRocketLoader; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/AboutDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/AboutDialog.java index 430000058..acc9ee154 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/AboutDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/AboutDialog.java @@ -17,7 +17,6 @@ import info.openrocket.swing.gui.components.StyledLabel.Style; import info.openrocket.swing.gui.components.URLLabel; import info.openrocket.swing.gui.util.GUIUtil; import info.openrocket.swing.gui.util.Icons; -import info.openrocket.swing.gui.theme.UITheme; import info.openrocket.core.l10n.Translator; import info.openrocket.core.startup.Application; import info.openrocket.core.util.BuildProperties; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/CustomMaterialDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/CustomMaterialDialog.java index ea17b842a..88fa39bd6 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/CustomMaterialDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/CustomMaterialDialog.java @@ -4,7 +4,6 @@ import java.awt.Dialog; import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/WarningDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/WarningDialog.java index 63966d27d..007966fbe 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/WarningDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/WarningDialog.java @@ -2,11 +2,9 @@ package info.openrocket.swing.gui.dialogs; import java.awt.Component; -import javax.swing.BorderFactory; import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JScrollPane; -import javax.swing.border.Border; import info.openrocket.swing.gui.util.BetterListCellRenderer; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/MotorMountTableModel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/MotorMountTableModel.java index af3d59ab7..2e35848d8 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/MotorMountTableModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/MotorMountTableModel.java @@ -4,8 +4,6 @@ import java.util.List; import javax.swing.table.AbstractTableModel; -import org.jfree.util.Log; - import info.openrocket.core.rocketcomponent.ComponentChangeEvent; import info.openrocket.core.rocketcomponent.ComponentChangeListener; import info.openrocket.core.rocketcomponent.MotorMount; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java index 6cb4078c7..e1140d3c2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java @@ -1,6 +1,5 @@ package info.openrocket.swing.gui.dialogs.motor.thrustcurve; -import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; @@ -16,7 +15,6 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSpinner; -import javax.swing.border.Border; import javax.swing.border.TitledBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketRenderer.java index 17524e7a6..da117607e 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketRenderer.java @@ -29,7 +29,6 @@ import info.openrocket.core.rocketcomponent.InstanceMap; import info.openrocket.core.rocketcomponent.MotorMount; import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.util.Coordinate; -import info.openrocket.core.util.Transformation; /* * @author Bill Kuker diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/FinRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/FinRenderer.java index 7678b7db4..cd6fd1a00 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/FinRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/FinRenderer.java @@ -16,8 +16,6 @@ import info.openrocket.core.util.BoundingBox; import info.openrocket.core.util.Coordinate; import info.openrocket.swing.gui.figure3d.geometry.Geometry.Surface; -import java.util.Collections; - public class FinRenderer { private GLUtessellator tess = GLU.gluNewTess(); 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 d996c5125..55853e2b6 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 @@ -27,7 +27,7 @@ import com.jogamp.opengl.awt.GLJPanel; import com.jogamp.opengl.fixedfunc.GLLightingFunc; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.glu.GLU; -import com.jogamp.common.type.WriteCloneable; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JPopupMenu; diff --git a/swing/src/main/java/info/openrocket/swing/gui/figureelements/CGCaret.java b/swing/src/main/java/info/openrocket/swing/gui/figureelements/CGCaret.java index 5e6c5447f..46ade3630 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figureelements/CGCaret.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figureelements/CGCaret.java @@ -3,9 +3,6 @@ package info.openrocket.swing.gui.figureelements; import info.openrocket.swing.gui.util.GUIUtil; import info.openrocket.swing.gui.theme.UITheme; -import info.openrocket.swing.gui.util.GUIUtil; -import info.openrocket.swing.gui.theme.UITheme; - import java.awt.Color; import java.awt.geom.Area; import java.awt.geom.Ellipse2D; diff --git a/swing/src/main/java/info/openrocket/swing/gui/figureelements/CPCaret.java b/swing/src/main/java/info/openrocket/swing/gui/figureelements/CPCaret.java index 8dd6ff4bf..87369329e 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figureelements/CPCaret.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figureelements/CPCaret.java @@ -3,9 +3,6 @@ package info.openrocket.swing.gui.figureelements; import info.openrocket.swing.gui.util.GUIUtil; import info.openrocket.swing.gui.theme.UITheme; -import info.openrocket.swing.gui.util.GUIUtil; -import info.openrocket.swing.gui.theme.UITheme; - import java.awt.Color; import java.awt.geom.Area; import java.awt.geom.Ellipse2D; diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/GuidedTourSelectionDialog.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/GuidedTourSelectionDialog.java index 31fde8280..09d419b01 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/GuidedTourSelectionDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/GuidedTourSelectionDialog.java @@ -32,7 +32,6 @@ import info.openrocket.swing.gui.components.StyledLabel.Style; import info.openrocket.swing.gui.util.GUIUtil; import info.openrocket.swing.gui.util.Icons; import info.openrocket.swing.gui.widgets.SelectColorButton; -import org.fife.ui.rtextarea.IconGroup; public class GuidedTourSelectionDialog extends JDialog { private static final long serialVersionUID = -3643116444821710259L; diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideShowLinkListener.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideShowLinkListener.java index 59b33c969..f87babe6a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideShowLinkListener.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideShowLinkListener.java @@ -1,6 +1,5 @@ package info.openrocket.swing.gui.help.tours; -import java.awt.Desktop; import java.awt.Window; import java.net.URL; 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 6a8a5b3bc..cffa27488 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 @@ -4,7 +4,6 @@ package info.openrocket.swing.gui.main; import java.awt.Component; import java.awt.Dimension; import java.awt.Rectangle; -import java.awt.Font; import java.awt.event.ActionEvent; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/ExampleDesignFile.java b/swing/src/main/java/info/openrocket/swing/gui/main/ExampleDesignFile.java index ed2b4b09d..ca43c410c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/ExampleDesignFile.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/ExampleDesignFile.java @@ -4,22 +4,13 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; import java.net.URL; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Enumeration; import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import java.util.stream.Collectors; import info.openrocket.core.util.BugException; import info.openrocket.core.util.JarUtil; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/OpenRocketClipboard.java b/swing/src/main/java/info/openrocket/swing/gui/main/OpenRocketClipboard.java index 8856283ee..266e357cb 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/OpenRocketClipboard.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/OpenRocketClipboard.java @@ -1,7 +1,6 @@ package info.openrocket.swing.gui.main; import java.util.ArrayList; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/StorageOptionChooser.java b/swing/src/main/java/info/openrocket/swing/gui/main/StorageOptionChooser.java index 81fb278e1..b2b5b93b7 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/StorageOptionChooser.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/StorageOptionChooser.java @@ -11,17 +11,12 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JSpinner; -import javax.swing.SpinnerNumberModel; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import net.miginfocom.swing.MigLayout; import info.openrocket.core.document.OpenRocketDocument; import info.openrocket.core.document.Simulation; import info.openrocket.core.document.StorageOptions; -import info.openrocket.core.file.RocketSaver; -import info.openrocket.core.file.openrocket.OpenRocketSaver; import info.openrocket.core.l10n.Translator; import info.openrocket.core.simulation.FlightData; import info.openrocket.core.simulation.FlightDataBranch; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java index 2df8e6a5f..23005f0e8 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java @@ -10,7 +10,6 @@ import java.util.List; import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JComponent; -import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/DesignReport.java b/swing/src/main/java/info/openrocket/swing/gui/print/DesignReport.java index a9eed5f47..46f7660e4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/DesignReport.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/DesignReport.java @@ -3,7 +3,6 @@ */ package info.openrocket.swing.gui.print; -import java.awt.Graphics2D; import java.awt.Window; import java.text.DecimalFormat; import java.util.ArrayList; diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/FinMarkingGuideStrategy.java b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/FinMarkingGuideStrategy.java index e98e02184..96f5c7507 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/FinMarkingGuideStrategy.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/FinMarkingGuideStrategy.java @@ -10,7 +10,6 @@ import info.openrocket.swing.gui.print.FinMarkingGuide; import info.openrocket.swing.gui.print.ITextHelper; import info.openrocket.core.rocketcomponent.Rocket; -import java.awt.Graphics2D; import java.awt.image.BufferedImage; import org.slf4j.Logger; diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PageFitPrintStrategy.java b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PageFitPrintStrategy.java index 7372115dc..17000b9b8 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PageFitPrintStrategy.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PageFitPrintStrategy.java @@ -3,7 +3,6 @@ */ package info.openrocket.swing.gui.print.visitor; -import java.awt.Graphics2D; import java.util.ArrayList; import java.util.Collections; import java.util.ListIterator; diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsDetailVisitorStrategy.java b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsDetailVisitorStrategy.java index 67d686abe..6125ecccc 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsDetailVisitorStrategy.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsDetailVisitorStrategy.java @@ -35,7 +35,6 @@ import info.openrocket.core.rocketcomponent.RecoveryDevice; import info.openrocket.core.rocketcomponent.RingComponent; import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.rocketcomponent.ShockCord; -import info.openrocket.core.rocketcomponent.AxialStage; import info.openrocket.core.rocketcomponent.Streamer; import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.unit.Unit; diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/ScaleSelector.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/ScaleSelector.java index d476d41ff..7ed8f6eea 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/ScaleSelector.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/ScaleSelector.java @@ -1,6 +1,5 @@ package info.openrocket.swing.gui.scalefigure; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.text.DecimalFormat; diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConditionsPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConditionsPanel.java index ba9f133b8..9f4ffe584 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConditionsPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConditionsPanel.java @@ -26,7 +26,6 @@ import info.openrocket.core.simulation.SimulationOptions; import info.openrocket.core.simulation.SimulationOptionsInterface; import info.openrocket.core.startup.Application; import info.openrocket.core.unit.UnitGroup; -import info.openrocket.core.util.Chars; import info.openrocket.core.util.StateChangeListener; import net.miginfocom.swing.MigLayout; 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 de74183af..f6cd57463 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 @@ -20,7 +20,6 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; import javax.swing.JTable; -import javax.swing.border.Border; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationRunDialog.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationRunDialog.java index 30f5e0220..22b7a211d 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationRunDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationRunDialog.java @@ -23,7 +23,6 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; -import info.openrocket.core.document.events.DocumentChangeEvent; import info.openrocket.core.document.events.SimulationChangeEvent; import info.openrocket.core.document.OpenRocketDocument; import info.openrocket.core.document.Simulation; diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/CustomFinImporter.java b/swing/src/main/java/info/openrocket/swing/gui/util/CustomFinImporter.java index 502b615fc..84d175eb5 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/CustomFinImporter.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/CustomFinImporter.java @@ -3,7 +3,6 @@ package info.openrocket.swing.gui.util; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import java.util.List; import java.util.ListIterator; import javax.imageio.ImageIO; 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 1aed78a99..731272f6d 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 @@ -18,7 +18,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; -import java.util.Enumeration; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -45,13 +44,11 @@ import javax.swing.JTable; import javax.swing.JTree; import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; -import javax.swing.LookAndFeel; import javax.swing.RootPaneContainer; import javax.swing.SpinnerModel; import javax.swing.SpinnerNumberModel; import javax.swing.SwingUtilities; import javax.swing.Timer; -import javax.swing.UIManager; import javax.swing.border.TitledBorder; import javax.swing.event.ChangeListener; import javax.swing.table.AbstractTableModel; @@ -67,10 +64,8 @@ import javax.swing.tree.DefaultTreeSelectionModel; import javax.swing.tree.TreeModel; import javax.swing.tree.TreeSelectionModel; -import com.formdev.flatlaf.FlatLightLaf; import info.openrocket.swing.gui.Resettable; -import info.openrocket.core.arch.SystemInfo; import info.openrocket.core.logging.Markers; import info.openrocket.core.startup.Application; import info.openrocket.core.startup.Preferences; diff --git a/swing/src/main/java/info/openrocket/swing/gui/widgets/SelectColorToggleButton.java b/swing/src/main/java/info/openrocket/swing/gui/widgets/SelectColorToggleButton.java index 2e086b9a9..221b597a5 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/widgets/SelectColorToggleButton.java +++ b/swing/src/main/java/info/openrocket/swing/gui/widgets/SelectColorToggleButton.java @@ -3,9 +3,6 @@ package info.openrocket.swing.gui.widgets; import info.openrocket.swing.gui.util.GUIUtil; import info.openrocket.swing.gui.theme.UITheme; -import info.openrocket.swing.gui.util.GUIUtil; -import info.openrocket.swing.gui.theme.UITheme; - import javax.swing.JToggleButton; import javax.swing.Action; import javax.swing.Icon; diff --git a/swing/src/main/java/info/openrocket/swing/simulation/extension/example/StopSimulationConfigurator.java b/swing/src/main/java/info/openrocket/swing/simulation/extension/example/StopSimulationConfigurator.java index b30e3e312..541a587fa 100644 --- a/swing/src/main/java/info/openrocket/swing/simulation/extension/example/StopSimulationConfigurator.java +++ b/swing/src/main/java/info/openrocket/swing/simulation/extension/example/StopSimulationConfigurator.java @@ -4,9 +4,6 @@ import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JSpinner; -import javax.swing.JTextField; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; import info.openrocket.core.document.Simulation; import info.openrocket.core.simulation.extension.example.StopSimulation; @@ -15,7 +12,6 @@ import info.openrocket.swing.gui.adaptors.IntegerModel; import info.openrocket.swing.gui.components.BasicSlider; import info.openrocket.core.plugin.Plugin; import info.openrocket.swing.simulation.extension.AbstractSwingSimulationExtensionConfigurator; -import info.openrocket.core.unit.UnitGroup; @Plugin public class StopSimulationConfigurator extends AbstractSwingSimulationExtensionConfigurator { diff --git a/swing/src/main/java/info/openrocket/swing/simulation/extension/impl/ScriptingConfigurator.java b/swing/src/main/java/info/openrocket/swing/simulation/extension/impl/ScriptingConfigurator.java index 9f8fc0dcf..d8adb1ce2 100644 --- a/swing/src/main/java/info/openrocket/swing/simulation/extension/impl/ScriptingConfigurator.java +++ b/swing/src/main/java/info/openrocket/swing/simulation/extension/impl/ScriptingConfigurator.java @@ -1,6 +1,5 @@ package info.openrocket.swing.simulation.extension.impl; -import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; diff --git a/swing/src/main/java/info/openrocket/swing/startup/OSXSetup.java b/swing/src/main/java/info/openrocket/swing/startup/OSXSetup.java index 818fb9119..e330dd488 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/OSXSetup.java +++ b/swing/src/main/java/info/openrocket/swing/startup/OSXSetup.java @@ -6,7 +6,6 @@ import java.awt.desktop.OpenFilesHandler; import java.awt.desktop.PreferencesHandler; import java.awt.desktop.QuitHandler; import java.awt.desktop.AppReopenedListener; -import java.io.File; import info.openrocket.core.communication.UpdateInfoRetriever; import info.openrocket.core.arch.SystemInfo; diff --git a/swing/src/main/java/info/openrocket/swing/utils/TableRowTraversalPolicy.java b/swing/src/main/java/info/openrocket/swing/utils/TableRowTraversalPolicy.java index 54f4cff34..9f5a75d62 100644 --- a/swing/src/main/java/info/openrocket/swing/utils/TableRowTraversalPolicy.java +++ b/swing/src/main/java/info/openrocket/swing/utils/TableRowTraversalPolicy.java @@ -1,7 +1,5 @@ package info.openrocket.swing.utils; -import info.openrocket.swing.gui.main.SimulationPanel; - import javax.swing.AbstractAction; import javax.swing.ActionMap; import javax.swing.InputMap;