From af7f26ab48fd3c1d2ea38a5c8a976461068d9a86 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 04:36:51 +0200 Subject: [PATCH 01/25] Remove unused imports --- .../core/aerodynamics/barrowman/TubeFinSetCalc.java | 1 - .../core/appearance/defaults/ResourceDecalImage.java | 1 - .../core/database/motor/ThrustCurveMotorSet.java | 2 -- .../core/document/attachments/FileSystemAttachment.java | 1 - .../core/file/openrocket/importt/OpenRocketLoader.java | 2 -- .../core/file/openrocket/savers/FinSetSaver.java | 2 -- .../core/file/openrocket/savers/NoseConeSaver.java | 1 - .../core/file/rasaero/RASAeroMotorsLoader.java | 1 - .../openrocket/core/file/rocksim/export/PodSetDTO.java | 1 - .../core/file/rocksim/export/TubeCouplerDTO.java | 6 ------ .../file/wavefrontobj/export/shapes/PolygonExporter.java | 1 - .../main/java/info/openrocket/core/logging/Warning.java | 1 - .../info/openrocket/core/masscalc/MassCalculator.java | 1 - .../rocketoptimization/RocketOptimizationFunction.java | 1 - .../openrocket/core/preset/ComponentPresetFactory.java | 1 - .../core/preset/xml/OpenRocketComponentDTO.java | 1 - .../info/openrocket/core/rocketcomponent/BodyTube.java | 1 - .../core/rocketcomponent/ComponentAssembly.java | 1 - .../core/rocketcomponent/FlightConfiguration.java | 1 - .../info/openrocket/core/rocketcomponent/InnerTube.java | 1 - .../core/rocketcomponent/InsideColorComponent.java | 9 --------- .../info/openrocket/core/rocketcomponent/Rocket.java | 1 - .../info/openrocket/core/rocketcomponent/TubeFinSet.java | 3 --- .../openrocket/core/simulation/AbstractEulerStepper.java | 4 ---- .../openrocket/core/simulation/BasicTumbleStepper.java | 1 - .../info/openrocket/core/simulation/GroundStepper.java | 3 --- .../openrocket/core/simulation/RK4SimulationStepper.java | 2 -- .../core/thrustcurve/SerializeThrustcurveMotors.java | 1 - .../info/openrocket/core/thrustcurve/ThrustCurveAPI.java | 1 - .../main/java/info/openrocket/core/unit/UnitGroup.java | 1 - .../main/java/info/openrocket/core/util/TestRockets.java | 1 - .../main/java/info/openrocket/core/util/TextUtil.java | 1 - .../core/communication/HttpURLConnectionMock.java | 1 - .../core/file/rocksim/importt/RockSimLoaderTest.java | 1 - .../openrocket/core/masscalc/MassCalculatorTest.java | 1 - .../TestRocketOptimizationFunction.java | 1 - .../info/openrocket/core/preset/BodyTubePresetTests.java | 1 - .../openrocket/core/simulation/DisableStageTest.java | 1 - .../openrocket/core/simulation/FlightEventsTest.java | 1 - .../info/openrocket/swing/gui/adaptors/BooleanModel.java | 2 -- .../info/openrocket/swing/gui/adaptors/DoubleModel.java | 2 -- .../info/openrocket/swing/gui/components/BasicTree.java | 3 --- .../openrocket/swing/gui/components/DescriptionArea.java | 2 -- .../swing/gui/configdialog/ComponentAssemblyConfig.java | 1 - .../swing/gui/configdialog/InstancesPanel.java | 6 ------ .../swing/gui/configdialog/ParachuteConfig.java | 3 --- .../swing/gui/configdialog/RailButtonConfig.java | 1 - .../swing/gui/configdialog/RocketComponentConfig.java | 1 - .../swing/gui/configdialog/TrapezoidFinSetConfig.java | 2 -- .../gui/customexpression/CustomExpressionPanel.java | 8 -------- .../info/openrocket/swing/gui/dialogs/AboutDialog.java | 1 - .../swing/gui/dialogs/CustomMaterialDialog.java | 1 - .../info/openrocket/swing/gui/dialogs/WarningDialog.java | 2 -- .../flightconfiguration/MotorMountTableModel.java | 2 -- .../gui/dialogs/motor/thrustcurve/MotorFilterPanel.java | 2 -- .../openrocket/swing/gui/figure3d/RocketRenderer.java | 1 - .../swing/gui/figure3d/geometry/FinRenderer.java | 2 -- .../openrocket/swing/gui/figure3d/photo/PhotoPanel.java | 2 +- .../openrocket/swing/gui/figureelements/CGCaret.java | 3 --- .../openrocket/swing/gui/figureelements/CPCaret.java | 3 --- .../swing/gui/help/tours/GuidedTourSelectionDialog.java | 1 - .../swing/gui/help/tours/SlideShowLinkListener.java | 1 - .../openrocket/swing/gui/main/ComponentAddButtons.java | 1 - .../openrocket/swing/gui/main/ExampleDesignFile.java | 9 --------- .../openrocket/swing/gui/main/OpenRocketClipboard.java | 1 - .../openrocket/swing/gui/main/StorageOptionChooser.java | 5 ----- .../flightconfigpanel/RecoveryConfigurationPanel.java | 1 - .../info/openrocket/swing/gui/print/DesignReport.java | 1 - .../swing/gui/print/visitor/FinMarkingGuideStrategy.java | 1 - .../swing/gui/print/visitor/PageFitPrintStrategy.java | 1 - .../gui/print/visitor/PartsDetailVisitorStrategy.java | 1 - .../openrocket/swing/gui/scalefigure/ScaleSelector.java | 1 - .../swing/gui/simulation/SimulationConditionsPanel.java | 1 - .../swing/gui/simulation/SimulationPlotPanel.java | 1 - .../swing/gui/simulation/SimulationRunDialog.java | 1 - .../openrocket/swing/gui/util/CustomFinImporter.java | 1 - .../java/info/openrocket/swing/gui/util/GUIUtil.java | 5 ----- .../swing/gui/widgets/SelectColorToggleButton.java | 3 --- .../extension/example/StopSimulationConfigurator.java | 4 ---- .../simulation/extension/impl/ScriptingConfigurator.java | 1 - .../java/info/openrocket/swing/startup/OSXSetup.java | 1 - .../openrocket/swing/utils/TableRowTraversalPolicy.java | 2 -- 82 files changed, 1 insertion(+), 156 deletions(-) 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; From 8d8b6a93cfc9298d0c55746f0230d16bf2585e6a Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 04:37:27 +0200 Subject: [PATCH 02/25] Remove unnecessary imports from the same package --- core/src/main/java/info/openrocket/core/database/Database.java | 2 -- .../java/info/openrocket/core/rocketcomponent/InnerTube.java | 1 - .../core/simulation/customexpression/IndexExpression.java | 1 - .../src/main/java/info/openrocket/core/util/MonitorableSet.java | 2 -- core/src/test/java/info/openrocket/core/util/ModIDTest.java | 2 -- 5 files changed, 8 deletions(-) diff --git a/core/src/main/java/info/openrocket/core/database/Database.java b/core/src/main/java/info/openrocket/core/database/Database.java index d60859be8..8aed3e00e 100644 --- a/core/src/main/java/info/openrocket/core/database/Database.java +++ b/core/src/main/java/info/openrocket/core/database/Database.java @@ -6,8 +6,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import info.openrocket.core.database.DatabaseListener; - /** * A database set. This class functions as a Set that contains * items 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 d70a23e6d..2e188604a 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/InnerTube.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/InnerTube.java @@ -13,7 +13,6 @@ import info.openrocket.core.motor.Motor; import info.openrocket.core.motor.MotorConfiguration; import info.openrocket.core.motor.MotorConfigurationSet; import info.openrocket.core.preset.ComponentPreset; -import info.openrocket.core.rocketcomponent.ThicknessRingComponent; import info.openrocket.core.rocketcomponent.position.AxialPositionable; import info.openrocket.core.startup.Application; import info.openrocket.core.util.BugException; diff --git a/core/src/main/java/info/openrocket/core/simulation/customexpression/IndexExpression.java b/core/src/main/java/info/openrocket/core/simulation/customexpression/IndexExpression.java index bc3239e1f..101fa7c2a 100644 --- a/core/src/main/java/info/openrocket/core/simulation/customexpression/IndexExpression.java +++ b/core/src/main/java/info/openrocket/core/simulation/customexpression/IndexExpression.java @@ -9,7 +9,6 @@ import de.congrace.exp4j.Calculable; import de.congrace.exp4j.Variable; import info.openrocket.core.document.OpenRocketDocument; import info.openrocket.core.logging.Markers; -import info.openrocket.core.simulation.customexpression.CustomExpression; import info.openrocket.core.simulation.FlightDataBranch; import info.openrocket.core.simulation.FlightDataType; import info.openrocket.core.simulation.SimulationStatus; diff --git a/core/src/main/java/info/openrocket/core/util/MonitorableSet.java b/core/src/main/java/info/openrocket/core/util/MonitorableSet.java index 60e46e6d2..8ec934bcd 100644 --- a/core/src/main/java/info/openrocket/core/util/MonitorableSet.java +++ b/core/src/main/java/info/openrocket/core/util/MonitorableSet.java @@ -4,8 +4,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; -import info.openrocket.core.util.ModID; - /** * A Set that additionally implements the Monitorable interface. * diff --git a/core/src/test/java/info/openrocket/core/util/ModIDTest.java b/core/src/test/java/info/openrocket/core/util/ModIDTest.java index 9a9209a28..f4d85bef3 100644 --- a/core/src/test/java/info/openrocket/core/util/ModIDTest.java +++ b/core/src/test/java/info/openrocket/core/util/ModIDTest.java @@ -1,7 +1,5 @@ package info.openrocket.core.util; -import info.openrocket.core.util.ModID; - import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; From b0169b6a2ac5b646a547d02ff6922bc44b5b163f Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 04:37:46 +0200 Subject: [PATCH 03/25] Remove unnecessary imports from java.lang --- .../openrocket/core/aerodynamics/barrowman/RailButtonCalc.java | 1 - .../openrocket/core/file/openrocket/importt/MotorHandler.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/RailButtonCalc.java b/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/RailButtonCalc.java index 23813006c..17cb6d102 100644 --- a/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/RailButtonCalc.java +++ b/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/RailButtonCalc.java @@ -1,7 +1,6 @@ package info.openrocket.core.aerodynamics.barrowman; import java.util.List; -import java.lang.Math; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/MotorHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/MotorHandler.java index 23a6f3fdb..26e68cb0f 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/MotorHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/MotorHandler.java @@ -1,7 +1,5 @@ package info.openrocket.core.file.openrocket.importt; -import java.lang.Double; - import java.util.HashMap; import java.util.Locale; From 9cde5c976698b81cb356c1a2f0506ab6fee12cb8 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:07:41 +0200 Subject: [PATCH 04/25] Replace wildcard imports with single imports --- .../aerodynamics/BarrowmanCalculator.java | 11 ++++-- .../core/document/OpenRocketDocument.java | 19 ++++++---- .../core/file/openrocket/OpenRocketSaver.java | 6 +++- .../importt/FinTabPositionSetter.java | 2 +- .../importt/PhotoStudioHandler.java | 5 ++- .../savers/RocketComponentSaver.java | 18 ++++++++-- .../core/masscalc/MassCalculation.java | 15 ++++---- .../core/rocketcomponent/FinSet.java | 10 ++++-- .../core/rocketcomponent/LaunchLug.java | 4 ++- .../core/rocketcomponent/Rocket.java | 12 +++++-- .../core/rocketcomponent/TubeFinSet.java | 5 ++- .../scripting/GraalJSScriptEngineFactory.java | 5 ++- .../openrocket/core/util/TestRockets.java | 4 ++- .../core/masscalc/MassCalculatorTest.java | 20 ++++++++++- .../core/rocketcomponent/FinSetTest.java | 3 +- .../rocketcomponent/ParallelStageTest.java | 3 +- .../rocketcomponent/TrapezoidFinSetTest.java | 2 +- .../swing/file/photo/PhotoStudioGetter.java | 7 +++- .../gui/configdialog/ParachuteConfig.java | 8 +++-- .../configdialog/RocketComponentConfig.java | 4 ++- .../gui/configdialog/ShockCordConfig.java | 9 +++-- .../gui/dialogs/ComponentAnalysisDialog.java | 6 +++- .../swing/gui/dialogs/ScaleDialog.java | 35 +++++++++++++++---- .../swing/gui/main/RocketActions.java | 17 +++++++-- .../RecoveryConfigurationPanel.java | 8 ++++- .../swing/gui/plot/SimulationPlot.java | 8 ++++- .../gui/preset/DeselectableComboBox.java | 6 ++-- .../swing/gui/preset/ImagePreviewPanel.java | 11 +++--- .../swing/gui/print/PDFPrintStreamDoc.java | 6 +++- .../gui/print/components/RocketPrintTree.java | 2 +- .../visitor/PartsListVisitorStrategy.java | 13 ++++++- .../gui/rocketfigure/TransitionShapes.java | 2 +- .../swing/gui/scalefigure/RocketFigure.java | 7 +++- .../swing/gui/scalefigure/RocketPanel.java | 15 +++++++- .../openrocket/swing/gui/util/FileHelper.java | 4 +-- .../openrocket/swing/gui/util/GUIUtil.java | 12 +++++-- .../info/openrocket/swing/gui/util/Icons.java | 5 +-- .../openrocket/swing/startup/OSXSetup.java | 5 ++- 38 files changed, 265 insertions(+), 69 deletions(-) diff --git a/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java b/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java index 94f74ac2c..8ff8ee10f 100644 --- a/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java +++ b/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java @@ -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. diff --git a/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java b/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java index c71fb737b..a952ca535 100644 --- a/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java +++ b/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java @@ -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 getDecalList() { - return decalRegistry.getDecalList(); - } /** @@ -284,10 +291,8 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL */ public int countDecalUsage(DecalImage img) { int count = 0; - - Iterator it = rocket.iterator(); - while (it.hasNext()) { - RocketComponent c = it.next(); + + for (RocketComponent c : rocket) { if (hasDecal(c, img)) count++; else if (hasDecalInside(c, img)) diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java index 5e2bba244..c8dbbfbfa 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java @@ -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; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinTabPositionSetter.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinTabPositionSetter.java index 1bac5cb68..356176818 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinTabPositionSetter.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinTabPositionSetter.java @@ -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 { diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/PhotoStudioHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/PhotoStudioHandler.java index d048ca275..3e1e217c7 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/PhotoStudioHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/PhotoStudioHandler.java @@ -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 diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java index f56690a0c..37a161676 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java @@ -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(" " + defaultInstance.getIgnitionDelay() + ""); elements.add(" " + mount.getMotorOverhang() + ""); - for( FlightConfigurationId fcid : rkt.getIds()){ + for (FlightConfigurationId fcid : rkt.getIds()){ MotorConfiguration motorInstance = mount.getMotorConfig(fcid); // Nothing is stored if no motor loaded diff --git a/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java b/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java index be9af7562..01eec11f2 100644 --- a/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java +++ b/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java @@ -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 _activeMotorList, - final RocketComponent _root, final Transformation _transform, - Map _map) + public MassCalculation(final Type _type, final FlightConfiguration _config, final double _time, + final Collection _activeMotorList, + final RocketComponent _root, final Transformation _transform, + Map _map) { type = _type; config = _config; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/FinSet.java b/core/src/main/java/info/openrocket/core/rocketcomponent/FinSet.java index a142c2a4b..7bfe01c9f 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FinSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FinSet.java @@ -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; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java b/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java index e1c253448..8ae3a2663 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java @@ -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; 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 703b85e50..e5c95c614 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java @@ -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 entry : this.stageMap.entrySet()){ + for (Map.Entry entry : this.stageMap.entrySet()){ final AxialStage stage = (AxialStage)copyRocket.findComponent(entry.getValue().getID()); if (stage == null) { throw new IllegalStateException("Stage not found in copy"); 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 e3e43bb63..d64d8b41b 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java @@ -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(); diff --git a/core/src/main/java/info/openrocket/core/scripting/GraalJSScriptEngineFactory.java b/core/src/main/java/info/openrocket/core/scripting/GraalJSScriptEngineFactory.java index 0b93a4284..db61a866a 100644 --- a/core/src/main/java/info/openrocket/core/scripting/GraalJSScriptEngineFactory.java +++ b/core/src/main/java/info/openrocket/core/scripting/GraalJSScriptEngineFactory.java @@ -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"; 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 3deb1083d..c2333402b 100644 --- a/core/src/main/java/info/openrocket/core/util/TestRockets.java +++ b/core/src/main/java/info/openrocket/core/util/TestRockets.java @@ -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; 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 37228e930..3e91f261f 100644 --- a/core/src/test/java/info/openrocket/core/masscalc/MassCalculatorTest.java +++ b/core/src/test/java/info/openrocket/core/masscalc/MassCalculatorTest.java @@ -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; diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/FinSetTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/FinSetTest.java index 32c0fbfc2..e5aa84029 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/FinSetTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/FinSetTest.java @@ -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; diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/ParallelStageTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/ParallelStageTest.java index 82b69def9..147ef1d1e 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/ParallelStageTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/ParallelStageTest.java @@ -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; diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/TrapezoidFinSetTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/TrapezoidFinSetTest.java index bb63df79a..f9fcec471 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/TrapezoidFinSetTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/TrapezoidFinSetTest.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/file/photo/PhotoStudioGetter.java b/swing/src/main/java/info/openrocket/swing/file/photo/PhotoStudioGetter.java index 17eb41ed3..53957ee53 100644 --- a/swing/src/main/java/info/openrocket/swing/file/photo/PhotoStudioGetter.java +++ b/swing/src/main/java/info/openrocket/swing/file/photo/PhotoStudioGetter.java @@ -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; 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 77c53b1cc..0a8b38e13 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 @@ -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 deployOptionsModel = new EnumModel<>(deploymentConfig, "DeployEvent"); + EnumModel deployOptionsModel = new EnumModel<>(deploymentConfig, "DeployEvent"); register(deployOptionsModel); JComboBox eventCombo = new JComboBox<>(deployOptionsModel); if ((component.getStageNumber() + 1) == d.getRocket().getStageCount()) { 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 3b21ae371..241c42f52 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 @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/ShockCordConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/ShockCordConfig.java index 7a98a46e4..60556d656 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/ShockCordConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/ShockCordConfig.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java index 7ea53ebbb..33938617e 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java index 3d85e2b9a..16351fb82 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java @@ -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, List> SCALERS_NO_OFFSET = - new HashMap, List>(); - private static final Map, List> SCALERS_OFFSET = - new HashMap, List>(); + private static final Map, List> SCALERS_NO_OFFSET = new HashMap<>(); + private static final Map, List> SCALERS_OFFSET = new HashMap<>(); static { List 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); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/RocketActions.java b/swing/src/main/java/info/openrocket/swing/gui/main/RocketActions.java index 418b5ff3e..a46c58bf9 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/RocketActions.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/RocketActions.java @@ -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; 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 23005f0e8..5a185a8d8 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 @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java index 53b7f3336..bd1c3ca1f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java index ba4e3d397..5ebfb2271 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java +++ b/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/preset/ImagePreviewPanel.java b/swing/src/main/java/info/openrocket/swing/gui/preset/ImagePreviewPanel.java index 73227d0f3..93110ca30 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/preset/ImagePreviewPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/preset/ImagePreviewPanel.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/PDFPrintStreamDoc.java b/swing/src/main/java/info/openrocket/swing/gui/print/PDFPrintStreamDoc.java index 507b064a1..04803cda2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/PDFPrintStreamDoc.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/PDFPrintStreamDoc.java @@ -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. diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java b/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java index f6eb568f7..1ca2e5a9f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java index 642f6649e..fbc584f95 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/TransitionShapes.java b/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/TransitionShapes.java index 3efa822d0..4a8cbbfcf 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/TransitionShapes.java +++ b/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/TransitionShapes.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java index cf58cbc97..02bd3a525 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java index b82f28d58..dcaeb2ae2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java @@ -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; diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/FileHelper.java b/swing/src/main/java/info/openrocket/swing/gui/util/FileHelper.java index 8b52134e3..c03bcb14e 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/FileHelper.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/FileHelper.java @@ -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; 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 731272f6d..019e739ce 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 @@ -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 images = new ArrayList(); + private static final List images = new ArrayList<>(); static { loadImage("pix/icon/icon-256.png"); loadImage("pix/icon/icon-064.png"); diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/Icons.java b/swing/src/main/java/info/openrocket/swing/gui/util/Icons.java index 8711c980b..f81a6e5a8 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/Icons.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/Icons.java @@ -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 map = new HashMap(); + HashMap 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")); 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 e330dd488..f3d27d316 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/OSXSetup.java +++ b/swing/src/main/java/info/openrocket/swing/startup/OSXSetup.java @@ -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; From aef972699a9afea12c6831786194127808505059 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:14:37 +0200 Subject: [PATCH 05/25] Performance improvements --- .../java/de/congrace/exp4j/ExpressionBuilder.java | 2 +- .../src/main/java/de/congrace/exp4j/Tokenizer.java | 2 +- .../core/aerodynamics/BarrowmanCalculator.java | 6 +++--- .../core/file/motor/AbstractMotorLoader.java | 2 +- .../core/file/openrocket/importt/ColorSetter.java | 2 +- .../file/openrocket/importt/MaterialSetter.java | 2 +- .../importt/MotorConfigurationHandler.java | 5 +++-- .../file/openrocket/importt/OpenRocketHandler.java | 2 +- .../core/file/rasaero/importt/RecoveryHandler.java | 6 +++--- .../file/simplesax/AbstractElementHandler.java | 2 +- .../core/motor/MotorConfigurationSet.java | 7 +++++-- .../openrocket/core/motor/ThrustCurveMotor.java | 4 ++-- .../general/OptimizationControllerDelegator.java | 5 ++--- .../core/preset/loader/DoubleUnitColumnParser.java | 2 +- .../core/preset/loader/ShapeColumnParser.java | 2 +- .../FlightConfigurableParameterSet.java | 7 ++++--- .../core/rocketcomponent/FlightConfiguration.java | 4 ++-- .../rocketcomponent/FlightConfigurationId.java | 2 +- .../core/simulation/FlightDataBranch.java | 14 +++++++------- .../openrocket/core/thrustcurve/SearchRequest.java | 6 +++--- .../java/info/openrocket/core/unit/UnitGroup.java | 2 +- .../openrocket/core/util/QuaternionMultiply.java | 2 +- .../info/openrocket/core/util/StringUtils.java | 2 +- .../info/openrocket/core/util/Transformation.java | 6 ++---- .../core/rocketcomponent/FreeformFinSetTest.java | 2 +- .../swing/communication/AssetHandler.java | 12 ++++++------ .../swing/file/motor/MotorLoaderHelper.java | 4 +--- .../swing/file/photo/PhotoStudioGetter.java | 6 +++--- .../openrocket/swing/gui/adaptors/EnumModel.java | 7 +++---- .../gui/configdialog/FreeformFinSetConfig.java | 4 ++-- .../optimization/GeneralOptimizationDialog.java | 3 +-- .../optimization/OptimizationPlotDialog.java | 6 +++--- .../swing/gui/figure3d/RealisticRenderer.java | 4 +--- .../swing/gui/figure3d/RocketFigure3d.java | 4 ++-- .../ComponentTreeTransferHandler.java | 2 +- .../openrocket/swing/gui/plot/SimulationPlot.java | 3 ++- .../swing/gui/preset/PresetEditorDialog.java | 4 ++-- .../openrocket/swing/gui/print/DesignReport.java | 2 +- .../swing/gui/print/FinMarkingGuide.java | 6 +++--- .../print/components/CheckTreeSelectionModel.java | 2 +- .../gui/print/components/RocketPrintTree.java | 2 +- .../gui/simulation/SimulationConfigDialog.java | 2 +- .../swing/gui/util/SwingPreferences.java | 7 ++++--- .../openrocket/swing/gui/widgets/MultiSlider.java | 4 +--- .../SearchableAndCategorizableComboBox.java | 10 +++++----- 45 files changed, 94 insertions(+), 98 deletions(-) diff --git a/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java b/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java index 0b9fecc62..52feb0ba2 100644 --- a/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java +++ b/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java @@ -48,7 +48,7 @@ public class ExpressionBuilder { for (String name : variables.getVariableNames()) { function.append(name).append(','); } - expression = function.deleteCharAt(function.length() - 1).toString() + ")=" + expression; + expression = function.deleteCharAt(function.length() - 1) + ")=" + expression; } // create the PostfixExpression and return it as a Calculable PostfixExpression delegate = PostfixExpression.fromInfix(expression, customFunctions); diff --git a/core/src/main/java/de/congrace/exp4j/Tokenizer.java b/core/src/main/java/de/congrace/exp4j/Tokenizer.java index c2c99d974..d3784b58a 100644 --- a/core/src/main/java/de/congrace/exp4j/Tokenizer.java +++ b/core/src/main/java/de/congrace/exp4j/Tokenizer.java @@ -218,6 +218,6 @@ class Tokenizer { } tokens.add(lastToken); } - return tokens.toArray(new Token[tokens.size()]); + return tokens.toArray(new Token[0]); } } diff --git a/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java b/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java index 8ff8ee10f..a49a643f5 100644 --- a/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java +++ b/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java @@ -534,9 +534,9 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { // Correct body data in map if (forceMap != null) { - for (RocketComponent c : forceMap.keySet()) { - if (c instanceof SymmetricComponent) { - forceMap.get(c).setFrictionCD(forceMap.get(c).getFrictionCD() * correction); + for (Map.Entry entry : forceMap.entrySet()) { + if (entry.getKey() instanceof SymmetricComponent) { + entry.getValue().setFrictionCD(entry.getValue().getFrictionCD() * correction); } } } diff --git a/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java b/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java index 5e224e429..9aefcf05a 100644 --- a/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java +++ b/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java @@ -134,7 +134,7 @@ public abstract class AbstractMotorLoader implements MotorLoader { */ protected static String[] split(String str, String delim) { String[] pieces = str.split(delim); - if (pieces.length == 0 || !pieces[0].equals("")) + if (pieces.length == 0 || !pieces[0].isEmpty()) return pieces; return ArrayUtils.copyOfRange(pieces, 1, pieces.length); } diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/ColorSetter.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/ColorSetter.java index 042b60cf3..564e25685 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/ColorSetter.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/ColorSetter.java @@ -47,7 +47,7 @@ class ColorSetter implements Setter { ORColor color = new ORColor(r, g, b); setMethod.invoke(c, color); - if (!s.trim().equals("")) { + if (!s.trim().isEmpty()) { warnings.add(Warning.FILE_INVALID_PARAMETER); } } diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/MaterialSetter.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/MaterialSetter.java index d3435ed91..105911811 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/MaterialSetter.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/MaterialSetter.java @@ -28,7 +28,7 @@ class MaterialSetter implements Setter { // Check name != "" name = name.trim(); - if (name.equals("")) { + if (name.isEmpty()) { warnings.add(Warning.fromString("Illegal material specification, ignoring.")); return; } diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/MotorConfigurationHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/MotorConfigurationHandler.java index 4f5bf3a25..fe3753823 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/MotorConfigurationHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/MotorConfigurationHandler.java @@ -1,6 +1,7 @@ package info.openrocket.core.file.openrocket.importt; import java.util.HashMap; +import java.util.Map; import org.xml.sax.SAXException; @@ -69,8 +70,8 @@ class MotorConfigurationHandler extends AbstractElementHandler { rocket.getFlightConfiguration(fcid).setName(name); } - for (int stageNr : stageActiveness.keySet()) { - rocket.getFlightConfiguration(fcid).preloadStageActiveness(stageNr, stageActiveness.get(stageNr)); + for (Map.Entry entry : stageActiveness.entrySet()) { + rocket.getFlightConfiguration(fcid).preloadStageActiveness(entry.getKey(), entry.getValue()); } if ("true".equals(attributes.remove("default"))) { diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/OpenRocketHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/OpenRocketHandler.java index c44d62c35..95c5ac26e 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/OpenRocketHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/OpenRocketHandler.java @@ -72,7 +72,7 @@ public class OpenRocketHandler extends AbstractElementHandler { String str = "Unsupported document version"; if (docVersion != null) str += " " + docVersion; - if (creator != null && !creator.trim().equals("")) + if (creator != null && !creator.trim().isEmpty()) str += " (written using '" + creator.trim() + "')"; str += ", attempting to read file anyway."; warnings.add(str); diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/importt/RecoveryHandler.java b/core/src/main/java/info/openrocket/core/file/rasaero/importt/RecoveryHandler.java index 85901b820..664f1f145 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/importt/RecoveryHandler.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/importt/RecoveryHandler.java @@ -75,10 +75,10 @@ public class RecoveryHandler extends AbstractElementHandler { // Set the values of the recovery parameters for (int i = 1; i <= NR_OF_RECOVERY_DEVICES; i++) { - for (String e : mapParametersToVars.keySet()) { - String key = e + i; + for (Map.Entry entry : mapParametersToVars.entrySet()) { + String key = entry.getKey() + i; if (key.equals(element)) { - Object[] vars = mapParametersToVars.get(e); + Object[] vars = entry.getValue(); if (vars.length != NR_OF_RECOVERY_DEVICES) { throw new IllegalArgumentException("Recovery var array length is not 2"); } diff --git a/core/src/main/java/info/openrocket/core/file/simplesax/AbstractElementHandler.java b/core/src/main/java/info/openrocket/core/file/simplesax/AbstractElementHandler.java index ddf8c4f30..b2f743ed6 100644 --- a/core/src/main/java/info/openrocket/core/file/simplesax/AbstractElementHandler.java +++ b/core/src/main/java/info/openrocket/core/file/simplesax/AbstractElementHandler.java @@ -31,7 +31,7 @@ public abstract class AbstractElementHandler implements ElementHandler { public void closeElement(String element, HashMap attributes, String content, WarningSet warnings) throws SAXException { - if (!content.trim().equals("")) { + if (!content.trim().isEmpty()) { warnings.add(Warning.fromString("Unknown text in element '" + element + "', ignoring.")); } diff --git a/core/src/main/java/info/openrocket/core/motor/MotorConfigurationSet.java b/core/src/main/java/info/openrocket/core/motor/MotorConfigurationSet.java index 63e5f1402..8f1c87c5b 100644 --- a/core/src/main/java/info/openrocket/core/motor/MotorConfigurationSet.java +++ b/core/src/main/java/info/openrocket/core/motor/MotorConfigurationSet.java @@ -5,6 +5,8 @@ import info.openrocket.core.rocketcomponent.FlightConfigurableParameterSet; import info.openrocket.core.rocketcomponent.FlightConfigurationId; import info.openrocket.core.rocketcomponent.MotorMount; +import java.util.Map; + /** * FlightConfigurationSet for motors. * This is used for motors, where the default value is always no motor. @@ -49,8 +51,9 @@ public class MotorConfigurationSet extends FlightConfigurableParameterSet entry : this.map.entrySet()) { + FlightConfigurationId loopFCID = entry.getKey(); + MotorConfiguration curConfig = entry.getValue(); if (this.isDefault(loopFCID)) { buffer.append(" [DEF]"); } else { diff --git a/core/src/main/java/info/openrocket/core/motor/ThrustCurveMotor.java b/core/src/main/java/info/openrocket/core/motor/ThrustCurveMotor.java index 579c1a49c..0545738af 100644 --- a/core/src/main/java/info/openrocket/core/motor/ThrustCurveMotor.java +++ b/core/src/main/java/info/openrocket/core/motor/ThrustCurveMotor.java @@ -246,14 +246,14 @@ public class ThrustCurveMotor implements Motor, Comparable, Se // If I don't have a motor designation (will be the case if I read the // thrustcurve from a file) // use the motor code - if (motor.designation.equals("")) { + if (motor.designation.isEmpty()) { motor.designation = motor.code; } // If I don't have a motor common name (will be the case if I read the // thrustcurve from a flle) // apply the motor code simplification heuristics to generate a common name - if (motor.commonName.equals("")) { + if (motor.commonName.isEmpty()) { motor.commonName = simplifyDesignation(motor.designation); } diff --git a/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java b/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java index a6ced2706..7c89c09a5 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java @@ -1,6 +1,7 @@ package info.openrocket.core.optimization.general; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -21,9 +22,7 @@ public class OptimizationControllerDelegator implements OptimizationController { * @param controllers the controllers to use. */ public OptimizationControllerDelegator(OptimizationController... controllers) { - for (OptimizationController c : controllers) { - this.controllers.add(c); - } + this.controllers.addAll(Arrays.asList(controllers)); } /** diff --git a/core/src/main/java/info/openrocket/core/preset/loader/DoubleUnitColumnParser.java b/core/src/main/java/info/openrocket/core/preset/loader/DoubleUnitColumnParser.java index f422f92d1..18d100783 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/DoubleUnitColumnParser.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/DoubleUnitColumnParser.java @@ -29,7 +29,7 @@ public class DoubleUnitColumnParser extends BaseUnitColumnParser { Unit unit = rocksimUnits.get(unitName); if (unit == null) { - if (unitName == null || "".equals(unitName) || "?".equals(unitName)) { + if (unitName == null || unitName.isEmpty() || "?".equals(unitName)) { // Hmm no data... Lets assume SI if (propKey.getUnitGroup() == UnitGroup.UNITS_LENGTH) { unit = UnitGroup.UNITS_LENGTH.getUnit("in"); diff --git a/core/src/main/java/info/openrocket/core/preset/loader/ShapeColumnParser.java b/core/src/main/java/info/openrocket/core/preset/loader/ShapeColumnParser.java index 8381e9961..39fabdea8 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/ShapeColumnParser.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/ShapeColumnParser.java @@ -49,7 +49,7 @@ public class ShapeColumnParser extends BaseColumnParser { if ("0".equals(lc)) { shape = Shape.CONICAL; } - if ("".equals(lc)) { + if (lc.isEmpty()) { shape = Shape.CONICAL; } if ("3".equals(lc)) { diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java index fc81f55e2..647150288 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java @@ -3,6 +3,7 @@ package info.openrocket.core.rocketcomponent; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Map.Entry; import info.openrocket.core.util.ArrayList; @@ -38,9 +39,9 @@ public class FlightConfigurableParameterSet configSet) { - for (FlightConfigurationId key : configSet.map.keySet()) { - E cloneConfig = configSet.map.get(key).clone(); - this.map.put(key, cloneConfig); + for (Entry entry : configSet.map.entrySet()) { + E cloneConfig = entry.getValue().clone(); + this.map.put(entry.getKey(), cloneConfig); } } 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 ff89f82fc..1d9192bf8 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java @@ -313,8 +313,8 @@ public class FlightConfiguration implements FlightConfigurableParameter entry : preloadStageActiveness.entrySet()) { + _setStageActive(entry.getKey(), entry.getValue(), false); } preloadStageActiveness.clear(); preloadStageActiveness = null; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurationId.java b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurationId.java index 4a8f3c279..2d4547480 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurationId.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurationId.java @@ -36,7 +36,7 @@ public final class FlightConfigurationId implements Comparable> entry : values.entrySet()) { + sanityCheckValues(entry.getKey(), Double.NaN); + entry.getValue().add(Double.NaN); } modID = new ModID(); } @@ -249,8 +249,8 @@ public class FlightDataBranch implements Monitorable { * Return the number of data points in this branch. */ public int getLength() { - for (FlightDataType t : values.keySet()) { - return values.get(t).size(); + for (ArrayList doubles : values.values()) { + return doubles.size(); } return 0; } @@ -449,8 +449,8 @@ public class FlightDataBranch implements Monitorable { public FlightDataBranch clone() { FlightDataType[] types = getTypes(); FlightDataBranch clone = new FlightDataBranch(name, types); - for (FlightDataType type : values.keySet()) { - clone.values.put(type, values.get(type).clone()); + for (Map.Entry> entry : values.entrySet()) { + clone.values.put(entry.getKey(), entry.getValue().clone()); } clone.minValues.putAll(minValues); clone.maxValues.putAll(maxValues); diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/SearchRequest.java b/core/src/main/java/info/openrocket/core/thrustcurve/SearchRequest.java index 173fe28ac..4e65f5d12 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/SearchRequest.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/SearchRequest.java @@ -23,7 +23,7 @@ public class SearchRequest { this.manufacturer = null; if (manufacturer != null) { manufacturer = manufacturer.trim(); - if (!"".equals(manufacturer)) { + if (!manufacturer.isEmpty()) { this.manufacturer = manufacturer; } } @@ -43,7 +43,7 @@ public class SearchRequest { return; } this.common_name = common_name.trim(); - if ("".equals(this.common_name)) { + if (this.common_name.isEmpty()) { this.common_name = null; } } @@ -52,7 +52,7 @@ public class SearchRequest { this.impulse_class = null; if (impulse_class != null) { this.impulse_class = impulse_class.trim(); - if ("".equals(impulse_class)) { + if (impulse_class.isEmpty()) { this.impulse_class = null; } } 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 5cb7cc5d5..8acd23b18 100644 --- a/core/src/main/java/info/openrocket/core/unit/UnitGroup.java +++ b/core/src/main/java/info/openrocket/core/unit/UnitGroup.java @@ -758,7 +758,7 @@ public class UnitGroup { double value = StringUtils.convertToDouble(matcher.group(1)); String unit = matcher.group(2).trim(); - if (unit.equals("")) { + if (unit.isEmpty()) { value = this.getDefaultUnit().fromUnit(value); } else { int i; diff --git a/core/src/main/java/info/openrocket/core/util/QuaternionMultiply.java b/core/src/main/java/info/openrocket/core/util/QuaternionMultiply.java index 7bd28f564..d681d2029 100644 --- a/core/src/main/java/info/openrocket/core/util/QuaternionMultiply.java +++ b/core/src/main/java/info/openrocket/core/util/QuaternionMultiply.java @@ -50,7 +50,7 @@ public class QuaternionMultiply { for (int i = 0; i < arg.length; i++) { Value value = new Value(); - if (arg[i].equals("")) { + if (arg[i].isEmpty()) { value.sign = 0; } else { if (arg[i].startsWith("-")) { diff --git a/core/src/main/java/info/openrocket/core/util/StringUtils.java b/core/src/main/java/info/openrocket/core/util/StringUtils.java index ff5bb51a7..d918e473a 100644 --- a/core/src/main/java/info/openrocket/core/util/StringUtils.java +++ b/core/src/main/java/info/openrocket/core/util/StringUtils.java @@ -47,7 +47,7 @@ public class StringUtils { if (s == null) { return true; } - return "".equals(s.trim()); + return s.trim().isEmpty(); } /** diff --git a/core/src/main/java/info/openrocket/core/util/Transformation.java b/core/src/main/java/info/openrocket/core/util/Transformation.java index 9f699873f..db986e94d 100644 --- a/core/src/main/java/info/openrocket/core/util/Transformation.java +++ b/core/src/main/java/info/openrocket/core/util/Transformation.java @@ -88,8 +88,7 @@ public class Transformation implements java.io.Serializable { */ public Transformation(double[][] rotation, Coordinate translation) { for (int i = 0; i < 3; i++) - for (int j = 0; j < 3; j++) - this.rotation[i][j] = rotation[i][j]; + System.arraycopy(rotation[i], 0, this.rotation[i], 0, 3); this.translate = translation; } @@ -101,8 +100,7 @@ public class Transformation implements java.io.Serializable { */ public Transformation(double[][] rotation) { for (int i = 0; i < 3; i++) - for (int j = 0; j < 3; j++) - this.rotation[i][j] = rotation[i][j]; + System.arraycopy(rotation[i], 0, this.rotation[i], 0, 3); this.translate = Coordinate.NUL; } diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/FreeformFinSetTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/FreeformFinSetTest.java index a931b9d1e..7caa5be21 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/FreeformFinSetTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/FreeformFinSetTest.java @@ -1222,7 +1222,7 @@ public class FreeformFinSetTest extends BaseTestCase { final Coordinate[] actualPoints = fin.getFinPoints(); - final String rawPointDescr = "\n" + fin.toDebugDetail().toString() + "\n>> axial offset: " + x_delta; + final String rawPointDescr = "\n" + fin.toDebugDetail() + "\n>> axial offset: " + x_delta; Coordinate[] displayPoints = FinSet.translatePoints(actualPoints, x_delta, 0); for (int index = 0; index < displayPoints.length; ++index) { diff --git a/swing/src/main/java/info/openrocket/swing/communication/AssetHandler.java b/swing/src/main/java/info/openrocket/swing/communication/AssetHandler.java index 996512ff1..93faa814a 100644 --- a/swing/src/main/java/info/openrocket/swing/communication/AssetHandler.java +++ b/swing/src/main/java/info/openrocket/swing/communication/AssetHandler.java @@ -57,9 +57,9 @@ public class AssetHandler { if (urls == null) return null; for (String url : urls) { - for (String ext : mapExtensionToPlatform.keySet()) { - if (url.endsWith(ext)) { - output.put(mapExtensionToPlatform.get(ext)[0], url); // First Platform element is enough + for (Map.Entry entry : mapExtensionToPlatform.entrySet()) { + if (url.endsWith(entry.getKey())) { + output.put(entry.getValue()[0], url); // First Platform element is enough } } } @@ -73,10 +73,10 @@ public class AssetHandler { * @return URL to download the installer for the given platform */ public static String getInstallerURLForPlatform(UpdatePlatform platform, String version) { - for (UpdatePlatform[] platforms : mapPlatformToURL.keySet()) { - for (UpdatePlatform p : platforms) { + for (Map.Entry entry : mapPlatformToURL.entrySet()) { + for (UpdatePlatform p : entry.getKey()) { if (p == platform) { - return String.format(mapPlatformToURL.get(platforms), version); + return String.format(entry.getValue(), version); } } } diff --git a/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java b/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java index a0db2d9b5..481b2eff2 100644 --- a/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java +++ b/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java @@ -99,9 +99,7 @@ public final class MotorLoaderHelper { log.debug("Loading motors from file " + input.getU()); try { List motors = load(input.getV(), input.getU().getName()); - for (ThrustCurveMotor.Builder m : motors) { - list.add(m); - } + list.addAll(motors); } finally { try { input.getV().close(); diff --git a/swing/src/main/java/info/openrocket/swing/file/photo/PhotoStudioGetter.java b/swing/src/main/java/info/openrocket/swing/file/photo/PhotoStudioGetter.java index 53957ee53..333223391 100644 --- a/swing/src/main/java/info/openrocket/swing/file/photo/PhotoStudioGetter.java +++ b/swing/src/main/java/info/openrocket/swing/file/photo/PhotoStudioGetter.java @@ -36,8 +36,8 @@ public class PhotoStudioGetter { public PhotoSettings getPhotoSettings() { if (parameters != null) { - for (String element : parameters.keySet()) { - processElement(element, parameters.get(element)); + for (Map.Entry entry : parameters.entrySet()) { + processElement(entry.getKey(), entry.getValue()); } } return p; @@ -166,7 +166,7 @@ public class PhotoStudioGetter { } if ("sky".equals(element)) { - if (content.equals("")) { // Case where sky is null + if (content.isEmpty()) { // Case where sky is null p.setSky(null); return; } diff --git a/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java b/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java index 31580ebf6..444866ff3 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java @@ -1,6 +1,7 @@ package info.openrocket.swing.gui.adaptors; import java.util.ArrayList; +import java.util.Arrays; import java.util.EventObject; import javax.swing.AbstractListModel; @@ -65,10 +66,8 @@ public class EnumModel> extends AbstractListModel this.values = values; else this.values = (T[]) enumClass.getEnumConstants(); - - for (T e : this.values){ - this.displayedValues.add( e ); - } + + this.displayedValues.addAll(Arrays.asList(this.values)); this.nullText = nullText; stateChanged(null); // Update current value diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FreeformFinSetConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FreeformFinSetConfig.java index 206a12b4e..98cdab1e4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FreeformFinSetConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FreeformFinSetConfig.java @@ -366,7 +366,7 @@ public class FreeformFinSetConfig extends FinSetConfig { bufferHeader.append(table.getColumnName(j)); bufferHeader.append(", "); } - writer.write(bufferHeader.toString() + "\r\n"); + writer.write(bufferHeader + "\r\n"); //write row information for (int i = 0; i < nRow; i++) { @@ -375,7 +375,7 @@ public class FreeformFinSetConfig extends FinSetConfig { buffer.append(table.getValueAt(i, j)); buffer.append(", "); } - writer.write(buffer.toString() + "\r\n"); + writer.write(buffer + "\r\n"); } writer.close(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java index 74ef7c712..342acb217 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java @@ -1025,8 +1025,7 @@ public class GeneralOptimizationDialog extends JDialog { list.add(m); } - for (Object key : simulationModifiers.keySet()) { - List list = simulationModifiers.get(key); + for (List list : simulationModifiers.values()) { list.sort((o1, o2) -> o1.getName().compareTo(o2.getName())); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java index bfb5c66fa..7dc9d7115 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java @@ -144,8 +144,8 @@ public class OptimizationPlotDialog extends JDialog { // Create the optimization path (with autosort) XYSeries series = new XYSeries(trans.get("plot1d.series"), true, true); List tooltips = new ArrayList(); - for (Point p : evaluations.keySet()) { - FunctionEvaluationData data = evaluations.get(p); + for (Map.Entry entry : evaluations.entrySet()) { + FunctionEvaluationData data = entry.getValue(); if (data != null) { if (data.getParameterValue() != null) { Value[] state = data.getState(); @@ -153,7 +153,7 @@ public class OptimizationPlotDialog extends JDialog { tooltips.add(getTooltip(data, parameter)); } } else { - log.error("Could not find evaluation data for point " + p); + log.error("Could not find evaluation data for point " + entry.getKey()); } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java index 2ab341bd9..6e18bb3d8 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java @@ -127,9 +127,7 @@ public class RealisticRenderer extends RocketRenderer { gl.glLightModeli(GL2.GL_LIGHT_MODEL_COLOR_CONTROL, GL2.GL_SEPARATE_SPECULAR_COLOR); float[] convertedColor = this.convertColor(a, alpha); - for (int i=0; i < convertedColor.length; i++) { - color[i] = convertedColor[i]; - } + System.arraycopy(convertedColor, 0, color, 0, convertedColor.length); gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_DIFFUSE, color, 0); gl.glMaterialfv(GL.GL_FRONT, GLLightingFunc.GL_AMBIENT, color, 0); diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java index 296cc3149..841863cd1 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java @@ -13,6 +13,7 @@ import java.awt.event.MouseEvent; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.Set; @@ -600,8 +601,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { public void setSelection(final RocketComponent[] selection) { this.selection.clear(); if (selection != null) { - for (RocketComponent c : selection) - this.selection.add(c); + this.selection.addAll(Arrays.asList(selection)); } internalRepaint(); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeTransferHandler.java b/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeTransferHandler.java index e5c9c7962..0ac3ce054 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeTransferHandler.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeTransferHandler.java @@ -89,7 +89,7 @@ public class ComponentTreeTransferHandler extends TransferHandler { } } - log.info("Creating transferable from component " + sb.toString()); + log.info("Creating transferable from component " + sb); return new RocketComponentTransferable(components); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java index bd1c3ca1f..2f9edcbd3 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java @@ -21,6 +21,7 @@ import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Optional; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -453,7 +454,7 @@ public class SimulationPlot { private void fillEventLists(int branch, List eventTimes, List eventLabels, List eventColors, List eventImages) { - HashSet typeSet = new HashSet<>(); + Set typeSet = new HashSet<>(); double prevTime = -100; String text = null; Color color = null; diff --git a/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java b/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java index 5e0693753..ec6dfefec 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java @@ -2192,10 +2192,10 @@ public class PresetEditorDialog extends JDialog implements ItemListener { JOptionPane.showMessageDialog(null, "A material must be selected.", "Error", JOptionPane.ERROR_MESSAGE); return null; } - if (!pcLineCount.getText().equals("")) { + if (!pcLineCount.getText().isEmpty()) { props.put(ComponentPreset.LINE_COUNT, Integer.parseInt(pcLineCount.getText())); } - if (!pcSides.getText().equals("")) { + if (!pcSides.getText().isEmpty()) { props.put(ComponentPreset.SIDES, Integer.parseInt(pcSides.getText())); } props.put(ComponentPreset.LINE_LENGTH, pcLineLength.getValue()); 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 46f7660e4..4b0c02237 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 @@ -668,7 +668,7 @@ public class DesignReport { protected void runSimulations(List simulations) { if (window != null) { log.debug("Updating " + simulations.size() + "simulations using SimulationRunDialog"); - Simulation[] runMe = simulations.toArray(new Simulation[simulations.size()]); + Simulation[] runMe = simulations.toArray(new Simulation[0]); new SimulationRunDialog(window, rocketDocument, runMe).setVisible(true); } else { /* This code is left for compatibility with any developers who are diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java b/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java index c3b12c237..3d093dc48 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java @@ -255,10 +255,10 @@ public class FinMarkingGuide extends JPanel { int column = 0; - for (BodyTube next : markingGuideItems.keySet()) { - double circumferenceInPoints = PrintUnit.METERS.toPoints((next.getOuterRadius() + PAPER_THICKNESS_IN_METERS) * + for (Map.Entry> entry : markingGuideItems.entrySet()) { + double circumferenceInPoints = PrintUnit.METERS.toPoints((entry.getKey().getOuterRadius() + PAPER_THICKNESS_IN_METERS) * TWO_PI); - List componentList = markingGuideItems.get(next); + List componentList = entry.getValue(); //Don't draw the lug if there are no fins. if (hasFins(componentList)) { length = (int) Math.ceil(circumferenceInPoints); diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java b/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java index 02ea757d8..cc055772f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java @@ -134,7 +134,7 @@ public class CheckTreeSelectionModel extends DefaultTreeSelectionModel { toBeRemoved.add(selectionPath); } } - super.removeSelectionPaths(toBeRemoved.toArray(new TreePath[toBeRemoved.size()])); + super.removeSelectionPaths(toBeRemoved.toArray(new TreePath[0])); } // if all siblings are selected then deselect them and select parent recursively diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java b/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java index 1ca2e5a9f..83c829bdd 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java @@ -185,7 +185,7 @@ public class RocketPrintTree extends JTree { INITIAL_CHECKBOX_SELECTED)); } } - return nodes.toArray(new CheckBoxNode[nodes.size()]); + return nodes.toArray(new CheckBoxNode[0]); } /** diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java index 02c8257de..41ad1185c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java @@ -254,7 +254,7 @@ public class SimulationConfigDialog extends JDialog { private void setText() { String name = field.getText(); - if (name == null || name.equals("")) + if (name == null || name.isEmpty()) return; simulationList[0].setName(name); diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java b/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java index c769ff919..6640ac979 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java @@ -16,6 +16,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Set; import java.util.prefs.BackingStoreException; import java.util.prefs.Preferences; @@ -677,12 +678,12 @@ public class SwingPreferences extends info.openrocket.core.startup.Preferences i public void storeDefaultUnits() { Preferences prefs = PREFNODE.node("units"); - for (String key : UnitGroup.UNITS.keySet()) { - UnitGroup group = UnitGroup.UNITS.get(key); + for (Map.Entry entry : UnitGroup.UNITS.entrySet()) { + UnitGroup group = entry.getValue(); if (group == null || group.getUnitCount() < 2) continue; - prefs.put(key, group.getDefaultUnit().getUnit()); + prefs.put(entry.getKey(), group.getDefaultUnit().getUnit()); } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/widgets/MultiSlider.java b/swing/src/main/java/info/openrocket/swing/gui/widgets/MultiSlider.java index 990f60659..c0c185652 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/widgets/MultiSlider.java +++ b/swing/src/main/java/info/openrocket/swing/gui/widgets/MultiSlider.java @@ -228,9 +228,7 @@ public class MultiSlider extends JSlider { values[0] = getMinimum(); values[num_of_values - 1] = getMaximum(); int[] def = createDefaultValues(getMinimum(), getMaximum(), num_of_values - 2, false); - for (int i = 0; i < def.length; i++) { - values[i + 1] = def[i]; - } + System.arraycopy(def, 0, values, 1, def.length); } return values; } diff --git a/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java index d06ac7f49..bbd383314 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java +++ b/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java @@ -151,8 +151,8 @@ public class SearchableAndCategorizableComboBox extends JComboBox { private T[] extractItemsFromMap(Map itemGroupMap) { Set uniqueItems = new HashSet<>(); // Use a Set to ensure uniqueness - for (E group : itemGroupMap.keySet()) { - uniqueItems.addAll(Arrays.asList(itemGroupMap.get(group))); + for (T[] ts : itemGroupMap.values()) { + uniqueItems.addAll(Arrays.asList(ts)); } ArrayList items = new ArrayList<>(uniqueItems); return items.toArray((T[]) new Object[0]); @@ -166,9 +166,9 @@ public class SearchableAndCategorizableComboBox extends JComboBox { menu.addSeparator(); // Separator between search field and menu items // Fill the menu with the groups - for (E group : itemGroupMap.keySet()) { - JMenu groupList = new JMenu(group.toString()); - T[] itemsForGroup = itemGroupMap.get(group); + for (Map.Entry entry : itemGroupMap.entrySet()) { + JMenu groupList = new JMenu(entry.getKey().toString()); + T[] itemsForGroup = entry.getValue(); if (itemsForGroup != null) { for (T item : itemsForGroup) { From 595406ab68c2d7024ecb31904b275883eefa0ade Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:15:51 +0200 Subject: [PATCH 06/25] Replace explicit type with <> --- .../de/congrace/exp4j/CustomFunction.java | 2 +- .../de/congrace/exp4j/ExpressionBuilder.java | 2 +- .../de/congrace/exp4j/InfixTranslator.java | 2 +- .../de/congrace/exp4j/PostfixExpression.java | 2 +- .../java/de/congrace/exp4j/Tokenizer.java | 4 +- .../core/aerodynamics/FlightConditions.java | 4 +- .../defaults/DefaultAppearance.java | 2 +- .../database/ComponentPresetDatabase.java | 8 +- .../openrocket/core/database/Database.java | 4 +- .../openrocket/core/database/Databases.java | 6 +- .../database/motor/ThrustCurveMotorSet.java | 6 +- .../motor/ThrustCurveMotorSetDatabase.java | 8 +- .../core/document/DecalRegistry.java | 6 +- .../core/document/OpenRocketDocument.java | 14 ++-- .../openrocket/core/document/Simulation.java | 8 +- .../core/file/GeneralRocketSaver.java | 2 +- .../core/file/motor/AbstractMotorLoader.java | 4 +- .../core/file/motor/RASPMotorLoader.java | 6 +- .../core/file/motor/RockSimMotorLoader.java | 10 +-- .../core/file/openrocket/OpenRocketSaver.java | 2 +- .../openrocket/importt/ConfigHandler.java | 2 +- .../openrocket/importt/DocumentConfig.java | 20 ++--- .../importt/FinSetPointHandler.java | 2 +- .../openrocket/importt/FlightDataHandler.java | 2 +- .../importt/SingleSimulationHandler.java | 4 +- .../openrocket/savers/AxialStageSaver.java | 4 +- .../file/openrocket/savers/BodyTubeSaver.java | 2 +- .../file/openrocket/savers/BulkheadSaver.java | 2 +- .../openrocket/savers/CenteringRingSaver.java | 2 +- .../savers/ComponentAssemblySaver.java | 2 +- .../savers/EllipticalFinSetSaver.java | 2 +- .../openrocket/savers/EngineBlockSaver.java | 2 +- .../savers/FreeformFinSetSaver.java | 2 +- .../openrocket/savers/InnerTubeSaver.java | 2 +- .../openrocket/savers/LaunchLugSaver.java | 2 +- .../openrocket/savers/MassComponentSaver.java | 2 +- .../file/openrocket/savers/NoseConeSaver.java | 2 +- .../openrocket/savers/ParachuteSaver.java | 2 +- .../openrocket/savers/PhotoStudioSaver.java | 2 +- .../openrocket/savers/RailButtonSaver.java | 2 +- .../savers/RecoveryDeviceSaver.java | 2 +- .../savers/RocketComponentSaver.java | 2 +- .../file/openrocket/savers/RocketSaver.java | 2 +- .../openrocket/savers/ShockCordSaver.java | 2 +- .../file/openrocket/savers/StreamerSaver.java | 2 +- .../openrocket/savers/TransitionSaver.java | 2 +- .../savers/TrapezoidFinSetSaver.java | 2 +- .../openrocket/savers/TubeCouplerSaver.java | 2 +- .../openrocket/savers/TubeFinSetSaver.java | 2 +- .../file/rocksim/RockSimNoseConeCode.java | 2 +- .../rocksim/export/AbstractTransitionDTO.java | 2 +- .../core/file/rocksim/export/BodyTubeDTO.java | 2 +- .../core/file/rocksim/export/StageDTO.java | 2 +- .../core/file/simplesax/DelegatorHandler.java | 8 +- .../file/simplesax/NullElementHandler.java | 2 +- .../core/file/simplesax/SimpleSAX.java | 2 +- .../core/file/wavefrontobj/DefaultMtl.java | 2 +- .../file/wavefrontobj/DefaultObjGroup.java | 2 +- .../java/info/openrocket/core/l10n/L10N.java | 2 +- .../openrocket/core/logging/MessageSet.java | 30 +++---- .../core/masscalc/MassCalculation.java | 2 +- .../openrocket/core/motor/Manufacturer.java | 6 +- .../OptimizationControllerDelegator.java | 2 +- .../general/ParallelExecutorCache.java | 10 +-- .../MultidirectionalSearchOptimizer.java | 10 +-- .../general/multidim/SearchPattern.java | 4 +- .../domains/IdentitySimulationDomain.java | 2 +- .../domains/StabilityDomain.java | 10 +-- .../modifiers/AbstractSimulationModifier.java | 2 +- .../DefaultOptimizableParameterService.java | 2 +- .../DefaultSimulationModifierService.java | 16 ++-- .../services/OptimizationServiceHelper.java | 4 +- .../core/preset/ComponentPreset.java | 84 +++++++++---------- .../InvalidComponentPresetException.java | 4 +- .../core/preset/TypedPropertyMap.java | 2 +- .../preset/loader/BaseComponentLoader.java | 2 +- .../preset/loader/BaseUnitColumnParser.java | 2 +- .../core/preset/loader/MaterialHolder.java | 10 +-- .../core/preset/loader/MaterialLoader.java | 6 +- .../loader/RockSimComponentFileLoader.java | 2 +- .../preset/xml/OpenRocketComponentDTO.java | 8 +- .../preset/xml/OpenRocketComponentSaver.java | 32 +++---- .../core/rocketcomponent/AxialStage.java | 4 +- .../rocketcomponent/ClusterConfiguration.java | 4 +- .../FlightConfigurableParameterSet.java | 4 +- .../rocketcomponent/FlightConfiguration.java | 10 +-- .../core/rocketcomponent/LaunchLug.java | 2 +- .../core/rocketcomponent/MassObject.java | 2 +- .../core/rocketcomponent/ParallelStage.java | 2 +- .../core/rocketcomponent/RailButton.java | 2 +- .../core/rocketcomponent/RingComponent.java | 2 +- .../core/rocketcomponent/Rocket.java | 2 +- .../core/rocketcomponent/RocketComponent.java | 6 +- .../rocketcomponent/SymmetricComponent.java | 2 +- .../core/rocketcomponent/TubeFinSet.java | 2 +- .../core/rocketvisitors/ListComponents.java | 2 +- .../BasicEventSimulationEngine.java | 4 +- .../core/simulation/FlightData.java | 2 +- .../core/simulation/FlightDataBranch.java | 4 +- .../core/simulation/FlightDataType.java | 2 +- .../core/simulation/SimulationConditions.java | 4 +- .../core/simulation/SimulationOptions.java | 4 +- .../core/simulation/SimulationStatus.java | 8 +- .../customexpression/CustomExpression.java | 6 +- .../customexpression/Functions.java | 4 +- .../SimulationExtensionConfiguration.java | 2 +- .../extension/example/DampingMoment.java | 2 +- .../extension/example/RollControl.java | 2 +- .../impl/ScriptingSimulationListener.java | 4 +- .../openrocket/core/startup/Preferences.java | 6 +- .../core/thrustcurve/DownloadRequest.java | 2 +- .../core/thrustcurve/DownloadResponse.java | 4 +- .../core/thrustcurve/SearchResponse.java | 2 +- .../SerializeThrustcurveMotors.java | 2 +- .../core/unit/FixedPrecisionUnit.java | 2 +- .../openrocket/core/unit/FractionalUnit.java | 2 +- .../openrocket/core/unit/GeneralUnit.java | 4 +- .../info/openrocket/core/unit/UnitGroup.java | 6 +- .../core/util/AbstractChangeSource.java | 2 +- .../info/openrocket/core/util/Base64.java | 2 +- .../info/openrocket/core/util/Config.java | 4 +- .../core/util/LinearInterpolator.java | 2 +- .../openrocket/core/util/ListenerList.java | 4 +- .../info/openrocket/core/util/MathUtil.java | 4 +- .../core/util/MemoryManagement.java | 12 +-- .../openrocket/core/util/MonitorableSet.java | 2 +- .../openrocket/core/util/PrintProperties.java | 2 +- .../openrocket/core/util/SafetyMutex.java | 2 +- .../openrocket/core/util/Transformation.java | 2 +- .../openrocket/core/util/enums/EnumName.java | 4 +- .../core/utils/L10nPropertyReport.java | 6 +- .../core/utils/TestFunctionOptimizerLoop.java | 6 +- .../openrocket/core/ServicesForTesting.java | 2 +- .../communication/HttpURLConnectionMock.java | 2 +- .../file/openrocket/OpenRocketSaverTest.java | 2 +- .../rocksim/importt/BodyTubeHandlerTest.java | 2 +- .../rocksim/importt/FinSetHandlerTest.java | 2 +- .../importt/InnerBodyTubeHandlerTest.java | 2 +- .../rocksim/importt/LaunchLugHandlerTest.java | 2 +- .../importt/MassObjectHandlerTest.java | 2 +- .../rocksim/importt/NoseConeHandlerTest.java | 2 +- .../rocksim/importt/ParachuteHandlerTest.java | 4 +- .../file/rocksim/importt/RingHandlerTest.java | 10 +-- .../rocksim/importt/StreamerHandlerTest.java | 4 +- .../importt/TransitionHandlerTest.java | 2 +- .../TestRocketOptimizationFunction.java | 6 +- .../modifiers/TestGenericModifier.java | 2 +- .../openrocket/core/plugin/PluginTester.java | 2 +- .../rocketcomponent/ParameterSetTest.java | 6 +- .../openrocket/core/util/MathUtilTest.java | 24 +++--- .../info/openrocket/core/util/TestConfig.java | 10 +-- .../swing/file/motor/MotorLoaderHelper.java | 2 +- .../swing/gui/adaptors/BooleanModel.java | 4 +- .../swing/gui/adaptors/DoubleModel.java | 2 +- .../swing/gui/adaptors/EnumModel.java | 2 +- .../swing/gui/adaptors/ParameterSetModel.java | 2 +- .../swing/gui/components/CsvOptionPanel.java | 4 +- .../swing/gui/components/StageSelector.java | 2 +- .../swing/gui/components/URLLabel.java | 2 +- .../swing/gui/components/UnitCellEditor.java | 2 +- .../swing/gui/components/UnitSelector.java | 2 +- .../gui/configdialog/AppearancePanel.java | 4 +- .../swing/gui/configdialog/FinSetConfig.java | 6 +- .../swing/gui/configdialog/MotorConfig.java | 4 +- .../configdialog/RecoveryDeviceConfig.java | 2 +- .../customexpression/VariableTableModel.java | 2 +- .../swing/gui/dialogs/BugReportDialog.java | 2 +- .../gui/dialogs/ComponentAnalysisDialog.java | 6 +- .../swing/gui/dialogs/DebugLogDialog.java | 10 +-- .../gui/dialogs/PrintSettingsDialog.java | 4 +- .../swing/gui/dialogs/ScaleDialog.java | 6 +- .../swing/gui/dialogs/WarningDialog.java | 2 +- .../IgnitionSelectionDialog.java | 4 +- .../MotorMountTableModel.java | 2 +- .../SeparationSelectionDialog.java | 2 +- .../motor/thrustcurve/MotorFilterPanel.java | 16 ++-- .../motor/thrustcurve/MotorRowFilter.java | 6 +- .../ThrustCurveMotorSelectionPanel.java | 16 ++-- .../optimization/OptimizationPlotDialog.java | 6 +- .../preferences/DesignPreferencesPanel.java | 14 ++-- .../preferences/DisplayPreferencesPanel.java | 6 +- .../preferences/GeneralPreferencesPanel.java | 10 +-- .../dialogs/preferences/PreferencesPanel.java | 2 +- .../SimulationPreferencesPanel.java | 4 +- .../preferences/UnitsPreferencesPanel.java | 38 ++++----- .../preset/ComponentPresetChooserDialog.java | 2 +- .../dialogs/preset/ComponentPresetTable.java | 2 +- .../gui/dialogs/preset/XTableColumnModel.java | 2 +- .../swing/gui/figure3d/FigureRenderer.java | 2 +- .../swing/gui/figure3d/RocketFigure3d.java | 6 +- .../swing/gui/figure3d/RocketRenderer.java | 2 +- .../swing/gui/figure3d/TextureCache.java | 6 +- .../DisplayListComponentRenderer.java | 2 +- .../swing/gui/figure3d/photo/PhotoPanel.java | 6 +- .../figure3d/photo/PhotoSettingsConfig.java | 7 +- .../help/tours/GuidedTourSelectionDialog.java | 4 +- .../swing/gui/help/tours/Slide.java | 2 +- .../swing/gui/help/tours/SlideSet.java | 2 +- .../swing/gui/help/tours/SlideSetLoader.java | 2 +- .../swing/gui/help/tours/SlideSetManager.java | 6 +- .../openrocket/swing/gui/main/BasicFrame.java | 4 +- .../swing/gui/main/ComponentAddButtons.java | 14 ++-- .../swing/gui/main/ComponentIcons.java | 8 +- .../gui/main/DocumentSelectionModel.java | 4 +- .../swing/gui/main/ExampleDesignFile.java | 2 +- .../swing/gui/main/ExportDecalDialog.java | 2 +- .../swing/gui/main/MRUDesignFile.java | 2 +- .../swing/gui/main/OpenRocketClipboard.java | 2 +- .../componenttree/ComponentTreeModel.java | 6 +- .../FlightConfigurableTableModel.java | 4 +- .../MotorConfigurationPanel.java | 2 +- .../RecoveryConfigurationPanel.java | 2 +- .../SeparationConfigurationPanel.java | 2 +- .../swing/gui/plot/EventGraphics.java | 4 +- .../swing/gui/plot/PlotConfiguration.java | 18 ++-- .../swing/gui/plot/SimulationPlot.java | 14 ++-- .../swing/gui/plot/SimulationPlotDialog.java | 2 +- .../info/openrocket/swing/gui/plot/Util.java | 2 +- .../gui/preset/DeselectableComboBox.java | 4 +- .../swing/gui/preset/PresetEditorDialog.java | 18 ++-- .../swing/gui/print/DesignReport.java | 6 +- .../swing/gui/print/FinMarkingGuide.java | 6 +- .../swing/gui/print/OpenRocketPrintable.java | 2 +- .../gui/print/PrintableCenteringRing.java | 6 +- .../swing/gui/print/PrintableContext.java | 14 ++-- .../components/CheckTreeSelectionModel.java | 4 +- .../gui/print/components/RocketPrintTree.java | 2 +- .../print/visitor/CenteringRingStrategy.java | 2 +- .../print/visitor/PageFitPrintStrategy.java | 2 +- .../visitor/PartsListVisitorStrategy.java | 2 +- .../SymmetricComponentShapes.java | 2 +- .../gui/scalefigure/AbstractScaleFigure.java | 2 +- .../swing/gui/scalefigure/RocketFigure.java | 6 +- .../swing/gui/scalefigure/RocketPanel.java | 2 +- .../gui/simulation/SimulationExportPanel.java | 4 +- .../simulation/SimulationOptionsPanel.java | 8 +- .../gui/simulation/SimulationPlotPanel.java | 4 +- .../gui/simulation/SimulationRunDialog.java | 2 +- .../openrocket/swing/gui/util/CheckList.java | 6 +- .../swing/gui/util/CustomFinImporter.java | 2 +- .../swing/gui/util/DefaultCheckListModel.java | 10 +-- .../openrocket/swing/gui/util/GUIUtil.java | 6 +- .../swing/gui/util/SwingPreferences.java | 8 +- .../SearchableAndCategorizableComboBox.java | 2 +- .../swing/logging/BufferLogger.java | 6 +- .../swing/logging/CyclicBuffer.java | 4 +- .../swing/logging/DelegatorLogger.java | 2 +- .../swing/logging/LogLevelBufferLogger.java | 4 +- .../swing/logging/LoggingSystemSetup.java | 2 +- .../swing/logging/PrintStreamLogger.java | 2 +- .../jij/ConfigurableStreamHandlerFactory.java | 2 +- .../startup/jij/CurrentClasspathProvider.java | 2 +- .../swing/startup/jij/JarInJarStarter.java | 2 +- .../jij/ManifestClasspathProvider.java | 4 +- .../startup/jij/PluginClasspathProvider.java | 2 +- .../startup/providers/TranslatorProvider.java | 2 +- .../swing/utils/ComponentPresetEditor.java | 8 +- .../utils/RockSimComponentFileTranslator.java | 4 +- .../openrocket/swing/utils/Scripting.java | 2 +- .../openrocket/swing/ServicesForTesting.java | 2 +- .../gui/configdialog/FinSetConfigTest.java | 18 ++-- .../motor/thrustcurve/MotorRowFilterTest.java | 6 +- .../swing/logging/CyclicBufferTest.java | 10 +-- 263 files changed, 643 insertions(+), 644 deletions(-) diff --git a/core/src/main/java/de/congrace/exp4j/CustomFunction.java b/core/src/main/java/de/congrace/exp4j/CustomFunction.java index e8ec22cbf..2af79c2ec 100644 --- a/core/src/main/java/de/congrace/exp4j/CustomFunction.java +++ b/core/src/main/java/de/congrace/exp4j/CustomFunction.java @@ -70,7 +70,7 @@ public abstract class CustomFunction extends CalculationToken { @Override void mutateStackForCalculation(Stack stack, VariableSet variables) { - List args = new ArrayList(argc); + List args = new ArrayList<>(argc); for (int i=0; i < argc; i++) { args.add(i, stack.pop() ); } diff --git a/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java b/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java index 52feb0ba2..b05b9468a 100644 --- a/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java +++ b/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java @@ -13,7 +13,7 @@ import java.util.Set; */ public class ExpressionBuilder { private VariableSet variables = new VariableSet(); - private final Set customFunctions = new HashSet(); + private final Set customFunctions = new HashSet<>(); private String expression; diff --git a/core/src/main/java/de/congrace/exp4j/InfixTranslator.java b/core/src/main/java/de/congrace/exp4j/InfixTranslator.java index 9712bce38..3eb67f420 100644 --- a/core/src/main/java/de/congrace/exp4j/InfixTranslator.java +++ b/core/src/main/java/de/congrace/exp4j/InfixTranslator.java @@ -96,7 +96,7 @@ class InfixTranslator { infixExpression = substituteUnaryOperators(infixExpression); final Token[] tokens = new Tokenizer(variableStrings, customFunctions).tokenize(infixExpression); final StringBuilder output = new StringBuilder(tokens.length); - final Stack operatorStack = new Stack(); + final Stack operatorStack = new Stack<>(); for (final Token token : tokens) { token.mutateStackForInfixTranslation(operatorStack, output); } diff --git a/core/src/main/java/de/congrace/exp4j/PostfixExpression.java b/core/src/main/java/de/congrace/exp4j/PostfixExpression.java index e4ca42f9f..45b806787 100644 --- a/core/src/main/java/de/congrace/exp4j/PostfixExpression.java +++ b/core/src/main/java/de/congrace/exp4j/PostfixExpression.java @@ -103,7 +103,7 @@ public final class PostfixExpression extends AbstractExpression implements Calcu @Override public Variable calculate() throws IllegalArgumentException { - final Stack stack = new Stack(); + final Stack stack = new Stack<>(); for (final Token t : getTokens()) { ((CalculationToken) t).mutateStackForCalculation(stack, variables); } diff --git a/core/src/main/java/de/congrace/exp4j/Tokenizer.java b/core/src/main/java/de/congrace/exp4j/Tokenizer.java index d3784b58a..ea8d8a9a2 100644 --- a/core/src/main/java/de/congrace/exp4j/Tokenizer.java +++ b/core/src/main/java/de/congrace/exp4j/Tokenizer.java @@ -31,7 +31,7 @@ import de.congrace.exp4j.FunctionToken.Function; */ class Tokenizer { private String[] variableNames; - private final Set functionNames = new HashSet(); + private final Set functionNames = new HashSet<>(); private final Set customFunctions; { @@ -160,7 +160,7 @@ class Tokenizer { * when an unknown function name has been used. */ Token[] tokenize(String infix) throws UnparsableExpressionException, UnknownFunctionException { - final List tokens = new ArrayList(); + final List tokens = new ArrayList<>(); final char[] chars = infix.toCharArray(); // iterate over the chars and fork on different types of input Token lastToken; diff --git a/core/src/main/java/info/openrocket/core/aerodynamics/FlightConditions.java b/core/src/main/java/info/openrocket/core/aerodynamics/FlightConditions.java index 33a5e3a30..4e18d2914 100644 --- a/core/src/main/java/info/openrocket/core/aerodynamics/FlightConditions.java +++ b/core/src/main/java/info/openrocket/core/aerodynamics/FlightConditions.java @@ -23,7 +23,7 @@ import info.openrocket.core.util.ModID; */ public class FlightConditions implements Cloneable, ChangeSource, Monitorable { - private List listenerList = new ArrayList(); + private List listenerList = new ArrayList<>(); private EventObject event = new EventObject(this); /** Reference length used in calculations. */ @@ -419,7 +419,7 @@ public class FlightConditions implements Cloneable, ChangeSource, Monitorable { public FlightConditions clone() { try { FlightConditions cond = (FlightConditions) super.clone(); - cond.listenerList = new ArrayList(); + cond.listenerList = new ArrayList<>(); cond.event = new EventObject(cond); cond.atmosphericConditions = atmosphericConditions.clone(); return cond; diff --git a/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java b/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java index 83b3bf2da..2ce1c5ec3 100644 --- a/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java +++ b/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java @@ -89,7 +89,7 @@ public class DefaultAppearance { private static final Appearance KLIMA_MOTOR = simple("/datafiles/textures/motors/klima.jpg"); private static final Appearance REUSABLE_MOTOR = simpleAlpha(new ORColor(195, 60, 50), .6f, "/datafiles/textures/motors/reusable.png"); - private static final HashMap plastics = new HashMap(); + private static final HashMap plastics = new HashMap<>(); /** * gets the appearance correspondent to the plastic with the given color diff --git a/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java b/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java index ed52ecb67..c28177570 100644 --- a/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java +++ b/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java @@ -35,7 +35,7 @@ public class ComponentPresetDatabase extends Database implement return Collections.emptyList(); } - List result = new ArrayList(list.size() / 6); + List result = new ArrayList<>(list.size() / 6); for (ComponentPreset preset : list) { if (preset.get(ComponentPreset.TYPE).equals(type)) { @@ -61,7 +61,7 @@ public class ComponentPresetDatabase extends Database implement return listForType(type); } - List result = new ArrayList(list.size() / 6); + List result = new ArrayList<>(list.size() / 6); Set favorites = Application.getPreferences().getComponentFavorites(type); @@ -83,7 +83,7 @@ public class ComponentPresetDatabase extends Database implement return listForType(type[0]); } - List result = new ArrayList(list.size() / 6); + List result = new ArrayList<>(list.size() / 6); for (ComponentPreset preset : list) { ComponentPreset.Type presetType = preset.get(ComponentPreset.TYPE); @@ -105,7 +105,7 @@ public class ComponentPresetDatabase extends Database implement @Override public List find(String manufacturer, String partNo) { - List presets = new ArrayList(); + List presets = new ArrayList<>(); for (ComponentPreset preset : list) { if (preset.getManufacturer().matches(manufacturer) && preset.getPartNo().equals(partNo)) { presets.add(preset); diff --git a/core/src/main/java/info/openrocket/core/database/Database.java b/core/src/main/java/info/openrocket/core/database/Database.java index 8aed3e00e..21bd1342a 100644 --- a/core/src/main/java/info/openrocket/core/database/Database.java +++ b/core/src/main/java/info/openrocket/core/database/Database.java @@ -18,8 +18,8 @@ import java.util.List; public class Database> extends AbstractSet { /** the list that contains the data from the database itself */ - protected final List list = new ArrayList(); - private final ArrayList> listeners = new ArrayList>(); + protected final List list = new ArrayList<>(); + private final ArrayList> listeners = new ArrayList<>(); @Override public Iterator iterator() { diff --git a/core/src/main/java/info/openrocket/core/database/Databases.java b/core/src/main/java/info/openrocket/core/database/Databases.java index cf9c8c0b4..f60171f63 100644 --- a/core/src/main/java/info/openrocket/core/database/Databases.java +++ b/core/src/main/java/info/openrocket/core/database/Databases.java @@ -25,15 +25,15 @@ public class Databases { /** * A database of bulk materials (with bulk densities). */ - public static final Database BULK_MATERIAL = new Database(); + public static final Database BULK_MATERIAL = new Database<>(); /** * A database of surface materials (with surface densities). */ - public static final Database SURFACE_MATERIAL = new Database(); + public static final Database SURFACE_MATERIAL = new Database<>(); /** * A database of linear material (with length densities). */ - public static final Database LINE_MATERIAL = new Database(); + public static final Database LINE_MATERIAL = new Database<>(); 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 ae3d7e521..7d7997776 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 @@ -28,10 +28,10 @@ public class ThrustCurveMotorSet implements Comparable { private static final DesignationComparator DESIGNATION_COMPARATOR = new DesignationComparator(); private static final ThrustCurveMotorComparator comparator = new ThrustCurveMotorComparator(); - private final ArrayList motors = new ArrayList(); - private final Map digestMap = new IdentityHashMap(); + private final ArrayList motors = new ArrayList<>(); + private final Map digestMap = new IdentityHashMap<>(); - private final List delays = new ArrayList(); + private final List delays = new ArrayList<>(); private Manufacturer manufacturer = null; private String commonName = null; diff --git a/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java b/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java index 2f756afac..427cd3825 100644 --- a/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java +++ b/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java @@ -19,14 +19,14 @@ import info.openrocket.core.motor.ThrustCurveMotor; public class ThrustCurveMotorSetDatabase implements MotorDatabase { private static final Logger log = LoggerFactory.getLogger(ThrustCurveMotorSetDatabase.class); - private final List motorSets = new ArrayList(); + private final List motorSets = new ArrayList<>(); @Override public List findMotors(String digest, Motor.Type type, String manufacturer, String designation, double diameter, double length) { - ArrayList fullMatches = new ArrayList(); - ArrayList digestMatches = new ArrayList(); - ArrayList descriptionMatches = new ArrayList(); + ArrayList fullMatches = new ArrayList<>(); + ArrayList digestMatches = new ArrayList<>(); + ArrayList descriptionMatches = new ArrayList<>(); // Apply filters to see if we can find any motors that match the given criteria. // We'll return diff --git a/core/src/main/java/info/openrocket/core/document/DecalRegistry.java b/core/src/main/java/info/openrocket/core/document/DecalRegistry.java index 928430423..f5eed91bc 100644 --- a/core/src/main/java/info/openrocket/core/document/DecalRegistry.java +++ b/core/src/main/java/info/openrocket/core/document/DecalRegistry.java @@ -41,7 +41,7 @@ public class DecalRegistry { } /** the decal usage map */ - private final Map registeredDecals = new HashMap(); + private final Map registeredDecals = new HashMap<>(); /** * returns a new decal with the same image but with unique names @@ -113,7 +113,7 @@ public class DecalRegistry { public Collection getDecalList() { - Set decals = new TreeSet(); + Set decals = new TreeSet<>(); decals.addAll(registeredDecals.values()); @@ -299,7 +299,7 @@ public class DecalRegistry { String basename = getGroup(BASE_NAME_INDEX, fileNamePattern.matcher(newName)); String extension = getGroup(EXTENSION_INDEX, fileNamePattern.matcher(newName)); - Set counts = new TreeSet(); + Set counts = new TreeSet<>(); boolean needsRewrite = false; diff --git a/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java b/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java index a952ca535..1e59e1439 100644 --- a/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java +++ b/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java @@ -72,8 +72,8 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL private final Rocket rocket; - private final ArrayList simulations = new ArrayList(); - private final ArrayList customExpressions = new ArrayList(); + private final ArrayList simulations = new ArrayList<>(); + private final ArrayList customExpressions = new ArrayList<>(); // The Photo Settings will be saved in the core module as a map of key values with corresponding content private Map photoSettings = new HashMap<>(); @@ -86,8 +86,8 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL * The undo history of the rocket. Whenever a new undo position is created while the * rocket is in "dirty" state, the rocket is copied here. */ - private final LinkedList undoHistory = new LinkedList(); - private final LinkedList undoDescription = new LinkedList(); + private final LinkedList undoHistory = new LinkedList<>(); + private final LinkedList undoDescription = new LinkedList<>(); /** * The position in the undoHistory we are currently at. If modifications have been @@ -103,7 +103,7 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL private String storedDescription = null; - private final ArrayList undoRedoListeners = new ArrayList(2); + private final ArrayList undoRedoListeners = new ArrayList<>(2); private File file = null; private ModID modID = ModID.INVALID; @@ -114,7 +114,7 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL private final DecalRegistry decalRegistry = new DecalRegistry(); - private final List listeners = new ArrayList(); + private final List listeners = new ArrayList<>(); /** * main constructor, enable events in the rocket @@ -169,7 +169,7 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL * @returns a set of all the flight data types defined or available in any way in the rocket document */ public Set getFlightDataTypes() { - Set allTypes = new LinkedHashSet(); + Set allTypes = new LinkedHashSet<>(); // built in Collections.addAll(allTypes, FlightDataType.ALL_TYPES); diff --git a/core/src/main/java/info/openrocket/core/document/Simulation.java b/core/src/main/java/info/openrocket/core/document/Simulation.java index 9ae81a92c..c661ace65 100644 --- a/core/src/main/java/info/openrocket/core/document/Simulation.java +++ b/core/src/main/java/info/openrocket/core/document/Simulation.java @@ -84,7 +84,7 @@ public class Simulation implements ChangeSource, Cloneable { // TODO: HIGH: Change to use actual conditions class?? private SimulationOptions options = new SimulationOptions(); - private ArrayList simulationExtensions = new ArrayList(); + private ArrayList simulationExtensions = new ArrayList<>(); private final Class simulationEngineClass = BasicEventSimulationEngine.class; @@ -94,7 +94,7 @@ public class Simulation implements ChangeSource, Cloneable { private final Class massCalculatorClass = MassCalculator.class; /** Listeners for this object */ - private List listeners = new ArrayList(); + private List listeners = new ArrayList<>(); /** The conditions actually used in the previous simulation, or null */ @@ -547,11 +547,11 @@ public class Simulation implements ChangeSource, Cloneable { copy.mutex = SafetyMutex.newInstance(); copy.status = Status.NOT_SIMULATED; copy.options = this.options.clone(); - copy.simulationExtensions = new ArrayList(); + copy.simulationExtensions = new ArrayList<>(); for (SimulationExtension c : this.simulationExtensions) { copy.simulationExtensions.add(c.clone()); } - copy.listeners = new ArrayList(); + copy.listeners = new ArrayList<>(); copy.simulatedConditions = null; copy.simulatedConfigurationDescription = null; copy.simulatedData = null; diff --git a/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java b/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java index 2c2282714..88e8a0eed 100644 --- a/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java +++ b/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java @@ -180,7 +180,7 @@ public class GeneralRocketSaver { return; } - Set usedDecals = new TreeSet(); + Set usedDecals = new TreeSet<>(); // Look for all decals used in the rocket. for (RocketComponent c : document.getRocket()) { diff --git a/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java b/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java index 9aefcf05a..0efb7e4b3 100644 --- a/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java +++ b/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java @@ -69,8 +69,8 @@ public abstract class AbstractMotorLoader implements MotorLoader { */ protected static List calculateMass(List time, List thrust, double total, double prop) { - List mass = new ArrayList(); - List deltam = new ArrayList(); + List mass = new ArrayList<>(); + List deltam = new ArrayList<>(); double t0, f0; double totalMassChange = 0; diff --git a/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java b/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java index 6dd529ad7..aac788b1c 100644 --- a/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java +++ b/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java @@ -62,8 +62,8 @@ public class RASPMotorLoader extends AbstractMotorLoader { double diameter = 0; ArrayList delays = null; - List time = new ArrayList(); - List thrust = new ArrayList(); + List time = new ArrayList<>(); + List thrust = new ArrayList<>(); double propW = 0; double totalW = 0; @@ -80,7 +80,7 @@ public class RASPMotorLoader extends AbstractMotorLoader { comment = ""; length = 0; diameter = 0; - delays = new ArrayList(); + delays = new ArrayList<>(); propW = 0; totalW = 0; time.clear(); diff --git a/core/src/main/java/info/openrocket/core/file/motor/RockSimMotorLoader.java b/core/src/main/java/info/openrocket/core/file/motor/RockSimMotorLoader.java index e0e99c9d4..3a221378d 100644 --- a/core/src/main/java/info/openrocket/core/file/motor/RockSimMotorLoader.java +++ b/core/src/main/java/info/openrocket/core/file/motor/RockSimMotorLoader.java @@ -160,7 +160,7 @@ public class RockSimMotorLoader extends AbstractMotorLoader { designation = removeDelay(str); // Delays - ArrayList delayList = new ArrayList(); + ArrayList delayList = new ArrayList<>(); str = attributes.get("delays"); if (str != null) { String[] split = str.split(","); @@ -397,10 +397,10 @@ public class RockSimMotorLoader extends AbstractMotorLoader { */ private static class RSEMotorDataHandler extends AbstractElementHandler { - private final List time = new ArrayList(); - private final List force = new ArrayList(); - private final List mass = new ArrayList(); - private final List cg = new ArrayList(); + private final List time = new ArrayList<>(); + private final List force = new ArrayList<>(); + private final List mass = new ArrayList<>(); + private final List cg = new ArrayList<>(); public List getTime() { return time; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java index c8dbbfbfa..3878fe24d 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java @@ -479,7 +479,7 @@ public class OpenRocketSaver extends RocketSaver { return; // Retrieve the data from the branch - List> data = new ArrayList>(types.length); + List> data = new ArrayList<>(types.length); for (int i = 0; i < types.length; i++) { data.add(branch.get(types[i])); } diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java index f8283317c..c72f415c0 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java @@ -18,7 +18,7 @@ public class ConfigHandler extends AbstractElementHandler { private ConfigHandler listHandler; private final Config config = new Config(); - private final List list = new ArrayList(); + private final List list = new ArrayList<>(); @Override public ElementHandler openElement(String element, HashMap attributes, WarningSet warnings) diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/DocumentConfig.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/DocumentConfig.java index 3b31a2a58..f20ebef17 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/DocumentConfig.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/DocumentConfig.java @@ -63,7 +63,7 @@ class DocumentConfig { //////// Component constructors - static final HashMap> constructors = new HashMap>(); + static final HashMap> constructors = new HashMap<>(); static { try { // External components @@ -108,7 +108,7 @@ class DocumentConfig { * the element name. Setters are searched for in descending class order. * A setter of null means setting the parameter is not allowed. */ - static final HashMap setters = new HashMap(); + static final HashMap setters = new HashMap<>(); static { // RocketComponent setters.put("RocketComponent:name", new StringSetter( @@ -117,7 +117,7 @@ class DocumentConfig { Reflection.findMethod(RocketComponent.class, "setID", String.class))); setters.put("RocketComponent:color", new ColorSetter( Reflection.findMethod(RocketComponent.class, "setColor", ORColor.class))); - setters.put("RocketComponent:linestyle", new EnumSetter( + setters.put("RocketComponent:linestyle", new EnumSetter<>( Reflection.findMethod(RocketComponent.class, "setLineStyle", LineStyle.class), LineStyle.class)); setters.put("RocketComponent:position", new AxialPositionSetter()); @@ -149,7 +149,7 @@ class DocumentConfig { // ExternalComponent - setters.put("ExternalComponent:finish", new EnumSetter( + setters.put("ExternalComponent:finish", new EnumSetter<>( Reflection.findMethod(ExternalComponent.class, "setFinish", Finish.class), Finish.class)); setters.put("ExternalComponent:material", new MaterialSetter( @@ -215,7 +215,7 @@ class DocumentConfig { // Transition - setters.put("Transition:shape", new EnumSetter( + setters.put("Transition:shape", new EnumSetter<>( Reflection.findMethod(Transition.class, "setShapeType", Transition.Shape.class), Transition.Shape.class)); setters.put("Transition:shapeclipped", new BooleanSetter( @@ -274,7 +274,7 @@ class DocumentConfig { setters.put("FinSet:radiusoffset", new RadiusPositionSetter()); setters.put("FinSet:thickness", new DoubleSetter( Reflection.findMethod(FinSet.class, "setThickness", double.class))); - setters.put("FinSet:crosssection", new EnumSetter( + setters.put("FinSet:crosssection", new EnumSetter<>( Reflection.findMethod(FinSet.class, "setCrossSection", FinSet.CrossSection.class), FinSet.CrossSection.class)); setters.put("FinSet:cant", new DoubleSetter( @@ -414,7 +414,7 @@ class DocumentConfig { * Reflection.findMethod(MassComponent.class, "setMassComponentType", * double.class))); */ - setters.put("MassComponent:masscomponenttype", new EnumSetter( + setters.put("MassComponent:masscomponenttype", new EnumSetter<>( Reflection.findMethod(MassComponent.class, "setMassComponentType", MassComponent.MassComponentType.class), MassComponent.MassComponentType.class)); @@ -437,7 +437,7 @@ class DocumentConfig { Reflection.findMethod(RecoveryDevice.class, "setCD", double.class), "auto", Reflection.findMethod(RecoveryDevice.class, "setCDAutomatic", boolean.class))); - setters.put("RecoveryDevice:deployevent", new EnumSetter( + setters.put("RecoveryDevice:deployevent", new EnumSetter<>( Reflection.findMethod(RecoveryDevice.class, "getDeploymentConfigurations"), Reflection.findMethod(DeploymentConfiguration.class, "setDeployEvent", DeployEvent.class), DeployEvent.class)); @@ -479,7 +479,7 @@ class DocumentConfig { // Rocket // handled by separate handler - setters.put("Rocket:referencetype", new EnumSetter( + setters.put("Rocket:referencetype", new EnumSetter<>( Reflection.findMethod(Rocket.class, "setReferenceType", ReferenceType.class), ReferenceType.class)); setters.put("Rocket:customreference", new DoubleSetter( @@ -490,7 +490,7 @@ class DocumentConfig { Reflection.findMethod(Rocket.class, "setRevision", String.class))); // Axial Stage - setters.put("AxialStage:separationevent", new EnumSetter( + setters.put("AxialStage:separationevent", new EnumSetter<>( Reflection.findMethod(AxialStage.class, "getSeparationConfigurations"), Reflection.findMethod(StageSeparationConfiguration.class, "setSeparationEvent", StageSeparationConfiguration.SeparationEvent.class), diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinSetPointHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinSetPointHandler.java index 5fc582f4e..fa7a107bf 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinSetPointHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinSetPointHandler.java @@ -22,7 +22,7 @@ class FinSetPointHandler extends AbstractElementHandler { @SuppressWarnings("unused") private final DocumentLoadingContext context; private final FreeformFinSet finset; - private final ArrayList coordinates = new ArrayList(); + private final ArrayList coordinates = new ArrayList<>(); public FinSetPointHandler(FreeformFinSet finset, DocumentLoadingContext context) { this.finset = finset; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/FlightDataHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/FlightDataHandler.java index 85f2bee93..6ce1573f1 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/FlightDataHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/FlightDataHandler.java @@ -19,7 +19,7 @@ class FlightDataHandler extends AbstractElementHandler { private FlightDataBranchHandler dataHandler; private final WarningSet warningSet = new WarningSet(); - private final List branches = new ArrayList(); + private final List branches = new ArrayList<>(); private final SingleSimulationHandler simHandler; private FlightData data; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/SingleSimulationHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/SingleSimulationHandler.java index 829425a06..92ee0035b 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/SingleSimulationHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/SingleSimulationHandler.java @@ -36,7 +36,7 @@ class SingleSimulationHandler extends AbstractElementHandler { private ConfigHandler configHandler; private FlightDataHandler dataHandler; - private final List extensions = new ArrayList(); + private final List extensions = new ArrayList<>(); public SingleSimulationHandler(OpenRocketDocument doc, DocumentLoadingContext context) { this.doc = doc; @@ -89,7 +89,7 @@ class SingleSimulationHandler extends AbstractElementHandler { String id = attributes.get("extensionid"); SimulationExtension extension = null; Set extensionProviders = Application.getInjector() - .getInstance(new Key>() { + .getInstance(new Key<>() { }); for (SimulationExtensionProvider p : extensionProviders) { if (p.getIds().contains(id)) { diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/AxialStageSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/AxialStageSaver.java index 4cca96ac7..d793a2f28 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/AxialStageSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/AxialStageSaver.java @@ -15,7 +15,7 @@ public class AxialStageSaver extends ComponentAssemblySaver { private static final AxialStageSaver instance = new AxialStageSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); if (c.isAfter()) { // yes, this test is redundant. I'm merely paranoid, and attempting to @@ -67,7 +67,7 @@ public class AxialStageSaver extends ComponentAssemblySaver { } private List addSeparationConfigParams(StageSeparationConfiguration config, boolean indent) { - List elements = new ArrayList(2); + List elements = new ArrayList<>(2); elements.add((indent ? " " : "") + "" + config.getSeparationEvent().name().toLowerCase(Locale.ENGLISH).replace("_", "") + ""); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/BodyTubeSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/BodyTubeSaver.java index 0228f31df..d4d5519bd 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/BodyTubeSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/BodyTubeSaver.java @@ -8,7 +8,7 @@ public class BodyTubeSaver extends SymmetricComponentSaver { private static final BodyTubeSaver instance = new BodyTubeSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/BulkheadSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/BulkheadSaver.java index 747824156..0f2505df9 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/BulkheadSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/BulkheadSaver.java @@ -8,7 +8,7 @@ public class BulkheadSaver extends RadiusRingComponentSaver { private static final BulkheadSaver instance = new BulkheadSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/CenteringRingSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/CenteringRingSaver.java index 54f50d390..89b206024 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/CenteringRingSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/CenteringRingSaver.java @@ -8,7 +8,7 @@ public class CenteringRingSaver extends RadiusRingComponentSaver { private static final CenteringRingSaver instance = new CenteringRingSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ComponentAssemblySaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ComponentAssemblySaver.java index 121259c0b..5817d6c69 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ComponentAssemblySaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ComponentAssemblySaver.java @@ -9,7 +9,7 @@ public class ComponentAssemblySaver extends RocketComponentSaver { private static final ComponentAssemblySaver instance = new ComponentAssemblySaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); if (!c.isAfter()) { if (c instanceof PodSet) { diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/EllipticalFinSetSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/EllipticalFinSetSaver.java index b7979eafe..1e58a2790 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/EllipticalFinSetSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/EllipticalFinSetSaver.java @@ -8,7 +8,7 @@ public class EllipticalFinSetSaver extends FinSetSaver { private static final EllipticalFinSetSaver instance = new EllipticalFinSetSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/EngineBlockSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/EngineBlockSaver.java index 5e8d0497a..fe755c2e7 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/EngineBlockSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/EngineBlockSaver.java @@ -8,7 +8,7 @@ public class EngineBlockSaver extends ThicknessRingComponentSaver { private static final EngineBlockSaver instance = new EngineBlockSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/FreeformFinSetSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/FreeformFinSetSaver.java index 64e3e61ac..55accf3b1 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/FreeformFinSetSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/FreeformFinSetSaver.java @@ -11,7 +11,7 @@ public class FreeformFinSetSaver extends FinSetSaver { private static final FreeformFinSetSaver instance = new FreeformFinSetSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/InnerTubeSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/InnerTubeSaver.java index 2c0f39aa0..b352f5aab 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/InnerTubeSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/InnerTubeSaver.java @@ -10,7 +10,7 @@ public class InnerTubeSaver extends ThicknessRingComponentSaver { private static final InnerTubeSaver instance = new InnerTubeSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/LaunchLugSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/LaunchLugSaver.java index 4138e62e6..fe52b8d48 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/LaunchLugSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/LaunchLugSaver.java @@ -10,7 +10,7 @@ public class LaunchLugSaver extends ExternalComponentSaver { private static final LaunchLugSaver instance = new LaunchLugSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/MassComponentSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/MassComponentSaver.java index 032b185d4..46bb242c3 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/MassComponentSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/MassComponentSaver.java @@ -12,7 +12,7 @@ public class MassComponentSaver extends MassObjectSaver { private static final MassComponentSaver instance = new MassComponentSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); 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 c855ed5e8..78b73c11c 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 @@ -10,7 +10,7 @@ public class NoseConeSaver extends TransitionSaver { private static final NoseConeSaver instance = new NoseConeSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ParachuteSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ParachuteSaver.java index 99d9e04f4..48bda7ece 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ParachuteSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ParachuteSaver.java @@ -10,7 +10,7 @@ public class ParachuteSaver extends RecoveryDeviceSaver { private static final ParachuteSaver instance = new ParachuteSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/PhotoStudioSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/PhotoStudioSaver.java index c271974e9..5db0357c0 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/PhotoStudioSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/PhotoStudioSaver.java @@ -17,7 +17,7 @@ import java.util.Map; */ public class PhotoStudioSaver { public static List getElements(Map photoSettings) { - List elements = new ArrayList(); + List elements = new ArrayList<>(); if (photoSettings == null || photoSettings.size() == 0) return elements; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RailButtonSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RailButtonSaver.java index ce8177c4f..8e3fbfd4a 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RailButtonSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RailButtonSaver.java @@ -10,7 +10,7 @@ public class RailButtonSaver extends ExternalComponentSaver { private static final RailButtonSaver instance = new RailButtonSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RecoveryDeviceSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RecoveryDeviceSaver.java index 3eea56a09..6ef4183c0 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RecoveryDeviceSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RecoveryDeviceSaver.java @@ -43,7 +43,7 @@ public class RecoveryDeviceSaver extends MassObjectSaver { } private List addDeploymentConfigurationParams(DeploymentConfiguration config, boolean indent) { - List elements = new ArrayList(3); + List elements = new ArrayList<>(3); elements.add((indent ? " " : "") + "" + config.getDeployEvent().name().toLowerCase(Locale.ENGLISH).replace("_", "") + ""); elements.add((indent ? " " : "") + "" + config.getDeployAltitude() + ""); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java index 37a161676..84ec7f73a 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java @@ -226,7 +226,7 @@ public class RocketComponentSaver { //FlightConfigurationID[] motorConfigIDs = ((RocketComponent) mount).getRocket().getFlightConfigurationIDs(); //ParameterSet configs = ((RocketComponent) mount).getRocket().getConfigurationSet(); - List elements = new ArrayList(); + List elements = new ArrayList<>(); MotorConfiguration defaultInstance = mount.getDefaultMotorConfig(); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketSaver.java index 774a9fd25..e7ede446f 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketSaver.java @@ -16,7 +16,7 @@ public class RocketSaver extends RocketComponentSaver { private static final RocketSaver instance = new RocketSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ShockCordSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ShockCordSaver.java index a950658d1..a036c3102 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ShockCordSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ShockCordSaver.java @@ -10,7 +10,7 @@ public class ShockCordSaver extends MassObjectSaver { private static final ShockCordSaver instance = new ShockCordSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/StreamerSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/StreamerSaver.java index dc345acfb..d34c9baf3 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/StreamerSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/StreamerSaver.java @@ -10,7 +10,7 @@ public class StreamerSaver extends RecoveryDeviceSaver { private static final StreamerSaver instance = new StreamerSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TransitionSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TransitionSaver.java index 8d2ed1da4..8a2421cfa 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TransitionSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TransitionSaver.java @@ -12,7 +12,7 @@ public class TransitionSaver extends SymmetricComponentSaver { private static final TransitionSaver instance = new TransitionSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TrapezoidFinSetSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TrapezoidFinSetSaver.java index e0ef34cee..8c08d17a5 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TrapezoidFinSetSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TrapezoidFinSetSaver.java @@ -8,7 +8,7 @@ public class TrapezoidFinSetSaver extends FinSetSaver { private static final TrapezoidFinSetSaver instance = new TrapezoidFinSetSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeCouplerSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeCouplerSaver.java index b49d895f9..8848e3368 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeCouplerSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeCouplerSaver.java @@ -8,7 +8,7 @@ public class TubeCouplerSaver extends ThicknessRingComponentSaver { private static final TubeCouplerSaver instance = new TubeCouplerSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeFinSetSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeFinSetSaver.java index 6d3f5f0f0..721d7cf91 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeFinSetSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeFinSetSaver.java @@ -10,7 +10,7 @@ public class TubeFinSetSaver extends ExternalComponentSaver { private static final TubeFinSetSaver instance = new TubeFinSetSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/RockSimNoseConeCode.java b/core/src/main/java/info/openrocket/core/file/rocksim/RockSimNoseConeCode.java index e186093dc..dbfa90cdc 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/RockSimNoseConeCode.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/RockSimNoseConeCode.java @@ -34,7 +34,7 @@ public enum RockSimNoseConeCode { /** * Names of the shape that are sometimes found in NCDATA.CSV */ - private final Set shapeNames = new HashSet(); + private final Set shapeNames = new HashSet<>(); /** * Constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java index 6f81db496..a4011fe10 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java @@ -51,7 +51,7 @@ public class AbstractTransitionDTO extends BasePartDTO implements AttachablePart @XmlElementRef(name = RockSimCommonConstants.STREAMER, type = StreamerDTO.class), @XmlElementRef(name = RockSimCommonConstants.PARACHUTE, type = ParachuteDTO.class), @XmlElementRef(name = RockSimCommonConstants.MASS_OBJECT, type = MassObjectDTO.class) }) - List attachedParts = new ArrayList(); + List attachedParts = new ArrayList<>(); /** * Default constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java index 2cc94c43d..deb3a6b2f 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java @@ -62,7 +62,7 @@ public class BodyTubeDTO extends BasePartDTO implements AttachableParts { @XmlElementRef(name = RockSimCommonConstants.PARACHUTE, type = ParachuteDTO.class), @XmlElementRef(name = RockSimCommonConstants.MASS_OBJECT, type = MassObjectDTO.class), @XmlElementRef(name = RockSimCommonConstants.EXTERNAL_POD, type = PodSetDTO.class) }) - List attachedParts = new ArrayList(); + List attachedParts = new ArrayList<>(); /** * Constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java index 58588f748..b6dbfecf6 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java @@ -25,7 +25,7 @@ public class StageDTO { @XmlElementRef(name = RockSimCommonConstants.NOSE_CONE, type = NoseConeDTO.class), @XmlElementRef(name = RockSimCommonConstants.TRANSITION, type = TransitionDTO.class) }) - private final List externalPart = new ArrayList(); + private final List externalPart = new ArrayList<>(); /** * Default constructor. diff --git a/core/src/main/java/info/openrocket/core/file/simplesax/DelegatorHandler.java b/core/src/main/java/info/openrocket/core/file/simplesax/DelegatorHandler.java index 4d62e4a47..8876f79a4 100644 --- a/core/src/main/java/info/openrocket/core/file/simplesax/DelegatorHandler.java +++ b/core/src/main/java/info/openrocket/core/file/simplesax/DelegatorHandler.java @@ -18,9 +18,9 @@ import info.openrocket.core.logging.WarningSet; class DelegatorHandler extends DefaultHandler { private final WarningSet warnings; - private final Deque handlerStack = new ArrayDeque(); - private final Deque elementData = new ArrayDeque(); - private final Deque> elementAttributes = new ArrayDeque>(); + private final Deque handlerStack = new ArrayDeque<>(); + private final Deque elementData = new ArrayDeque<>(); + private final Deque> elementAttributes = new ArrayDeque<>(); // Ignore all elements as long as ignore > 0 private int ignore = 0; @@ -98,7 +98,7 @@ class DelegatorHandler extends DefaultHandler { } private static HashMap copyAttributes(Attributes atts) { - HashMap ret = new HashMap(); + HashMap ret = new HashMap<>(); for (int i = 0; i < atts.getLength(); i++) { ret.put(atts.getLocalName(i), atts.getValue(i)); } diff --git a/core/src/main/java/info/openrocket/core/file/simplesax/NullElementHandler.java b/core/src/main/java/info/openrocket/core/file/simplesax/NullElementHandler.java index 3bb68d8b6..25b1043ee 100644 --- a/core/src/main/java/info/openrocket/core/file/simplesax/NullElementHandler.java +++ b/core/src/main/java/info/openrocket/core/file/simplesax/NullElementHandler.java @@ -21,7 +21,7 @@ import org.xml.sax.SAXException; public class NullElementHandler extends AbstractElementHandler { public static final NullElementHandler INSTANCE = new NullElementHandler(); - private static final HashMap EMPTY_MAP = new HashMap(); + private static final HashMap EMPTY_MAP = new HashMap<>(); private NullElementHandler() { } diff --git a/core/src/main/java/info/openrocket/core/file/simplesax/SimpleSAX.java b/core/src/main/java/info/openrocket/core/file/simplesax/SimpleSAX.java index 923bec4ee..32f1f2f33 100644 --- a/core/src/main/java/info/openrocket/core/file/simplesax/SimpleSAX.java +++ b/core/src/main/java/info/openrocket/core/file/simplesax/SimpleSAX.java @@ -69,7 +69,7 @@ public class SimpleSAX { private XMLReaderCache(int maxSize) { parserFactory = SAXParserFactory.newInstance(); parserFactory.setNamespaceAware(true); - queue = new LinkedBlockingQueue(maxSize); + queue = new LinkedBlockingQueue<>(maxSize); } private XMLReader createXMLReader() throws SAXException { diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultMtl.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultMtl.java index 8b2a41c07..544135352 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultMtl.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultMtl.java @@ -212,7 +212,7 @@ public final class DefaultMtl implements Mtl { */ public DefaultMtl(String name) { this.name = name; - this.reflOptions = new ArrayList(); + this.reflOptions = new ArrayList<>(); } @Override diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObjGroup.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObjGroup.java index 87db310f1..718b347fb 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObjGroup.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObjGroup.java @@ -54,7 +54,7 @@ public final class DefaultObjGroup implements ObjGroup { */ public DefaultObjGroup(String name) { this.name = name; - faces = new ArrayList(); + faces = new ArrayList<>(); } @Override diff --git a/core/src/main/java/info/openrocket/core/l10n/L10N.java b/core/src/main/java/info/openrocket/core/l10n/L10N.java index 919e590d8..d1221fd62 100644 --- a/core/src/main/java/info/openrocket/core/l10n/L10N.java +++ b/core/src/main/java/info/openrocket/core/l10n/L10N.java @@ -103,7 +103,7 @@ public final class L10N { /* * This list is generated using the L10NGenerator utility. */ - Map m = new HashMap(); + Map m = new HashMap<>(); m.put('\u00aa', "a"); m.put('\u00b2', "2"); m.put('\u00b3', "3"); diff --git a/core/src/main/java/info/openrocket/core/logging/MessageSet.java b/core/src/main/java/info/openrocket/core/logging/MessageSet.java index 20aa0fd03..be11b51d7 100644 --- a/core/src/main/java/info/openrocket/core/logging/MessageSet.java +++ b/core/src/main/java/info/openrocket/core/logging/MessageSet.java @@ -94,23 +94,23 @@ public abstract class MessageSet extends AbstractSet imple @Override public Iterator iterator() { final Iterator iterator = messages.iterator(); - return new Iterator() { - @Override - public boolean hasNext() { - return iterator.hasNext(); - } + return new Iterator<>() { + @Override + public boolean hasNext() { + return iterator.hasNext(); + } - @Override - public E next() { - return iterator.next(); - } + @Override + public E next() { + return iterator.next(); + } - @Override - public void remove() { - mutable.check(); - iterator.remove(); - } - }; + @Override + public void remove() { + mutable.check(); + iterator.remove(); + } + }; } @Override diff --git a/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java b/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java index 01eec11f2..ff8cb8a8d 100644 --- a/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java +++ b/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java @@ -185,7 +185,7 @@ public class MassCalculation { RigidBody inertia = RigidBody.EMPTY; // center-of-mass AND moment-of-inertia data. - final ArrayList bodies = new ArrayList(); + final ArrayList bodies = new ArrayList<>(); String prefix = ""; diff --git a/core/src/main/java/info/openrocket/core/motor/Manufacturer.java b/core/src/main/java/info/openrocket/core/motor/Manufacturer.java index 4a2856f09..d30f774f9 100644 --- a/core/src/main/java/info/openrocket/core/motor/Manufacturer.java +++ b/core/src/main/java/info/openrocket/core/motor/Manufacturer.java @@ -41,7 +41,7 @@ public class Manufacturer implements Serializable { static { // AeroTech has many name combinations... - List names = new ArrayList(); + List names = new ArrayList<>(); for (String s : new String[] { "A", "AT", "AERO", "AEROT", "AEROTECH" }) { names.add(s); names.add(s + "-RMS"); @@ -141,8 +141,8 @@ public class Manufacturer implements Serializable { throw new IllegalArgumentException("motorType cannot be null"); } - Set all = new HashSet(); - Set search = new HashSet(); + Set all = new HashSet<>(); + Set search = new HashSet<>(); all.add(displayName); all.add(simpleName); diff --git a/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java b/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java index 7c89c09a5..21aebee6d 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java @@ -14,7 +14,7 @@ import java.util.List; */ public class OptimizationControllerDelegator implements OptimizationController { - private final List controllers = new ArrayList(); + private final List controllers = new ArrayList<>(); /** * Construct the controlled based on an array of controllers. diff --git a/core/src/main/java/info/openrocket/core/optimization/general/ParallelExecutorCache.java b/core/src/main/java/info/openrocket/core/optimization/general/ParallelExecutorCache.java index 94297c895..2345eec09 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/ParallelExecutorCache.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/ParallelExecutorCache.java @@ -32,8 +32,8 @@ import info.openrocket.core.util.BugException; */ public class ParallelExecutorCache implements ParallelFunctionCache { - private final Map functionCache = new HashMap(); - private final Map> futureMap = new HashMap>(); + private final Map functionCache = new HashMap<>(); + private final Map> futureMap = new HashMap<>(); private final ExecutorService executor; @@ -57,7 +57,7 @@ public class ParallelExecutorCache implements ParallelFunctionCache { */ public ParallelExecutorCache(int threadCount) { this(new ThreadPoolExecutor(threadCount, threadCount, 60, TimeUnit.SECONDS, - new LinkedBlockingQueue(), + new LinkedBlockingQueue<>(), new ThreadFactory() { @Override public Thread newThread(Runnable r) { @@ -152,7 +152,7 @@ public class ParallelExecutorCache implements ParallelFunctionCache { @Override public List abort(Collection points) { - List computed = new ArrayList(Math.min(points.size(), 10)); + List computed = new ArrayList<>(Math.min(points.size(), 10)); for (Point p : points) { if (abort(p)) { @@ -244,7 +244,7 @@ public class ParallelExecutorCache implements ParallelFunctionCache { @Override public void clearCache() { - List list = new ArrayList(futureMap.keySet()); + List list = new ArrayList<>(futureMap.keySet()); abort(list); functionCache.clear(); } diff --git a/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java b/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java index 65bfd769d..1de7d5844 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java @@ -31,7 +31,7 @@ import info.openrocket.core.util.Statistics; public class MultidirectionalSearchOptimizer implements FunctionOptimizer, Statistics { private static final Logger log = LoggerFactory.getLogger(MultidirectionalSearchOptimizer.class); - private final List simplex = new ArrayList(); + private final List simplex = new ArrayList<>(); private ParallelFunctionCache functionExecutor; @@ -72,9 +72,9 @@ public class MultidirectionalSearchOptimizer implements FunctionOptimizer, Stati } // Normal iterations - List reflection = new ArrayList(simplex.size()); - List expansion = new ArrayList(simplex.size()); - List coordinateSearch = new ArrayList(simplex.size()); + List reflection = new ArrayList<>(simplex.size()); + List expansion = new ArrayList<>(simplex.size()); + List coordinateSearch = new ArrayList<>(simplex.size()); Point current; double currentValue; boolean continueOptimization = true; @@ -177,7 +177,7 @@ public class MultidirectionalSearchOptimizer implements FunctionOptimizer, Stati if (accept(coordinateSearch, currentValue)) { log.debug("Coordinate search successful, resetting simplex"); - List toAbort = new LinkedList(simplex); + List toAbort = new LinkedList<>(simplex); simplex.clear(); simplex.add(current); for (Point p : pattern) { diff --git a/core/src/main/java/info/openrocket/core/optimization/general/multidim/SearchPattern.java b/core/src/main/java/info/openrocket/core/optimization/general/multidim/SearchPattern.java index ce78091c8..01be44b4a 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/multidim/SearchPattern.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/multidim/SearchPattern.java @@ -19,7 +19,7 @@ public class SearchPattern { * @param dimensionality the dimensionality */ public static List square(int dimensionality) { - List pattern = new ArrayList(dimensionality); + List pattern = new ArrayList<>(dimensionality); for (int i = 0; i < dimensionality; i++) { double[] p = new double[dimensionality]; @@ -39,7 +39,7 @@ public class SearchPattern { throw new IllegalArgumentException("Illegal dimensionality " + dimensionality); } - List pattern = new ArrayList(dimensionality); + List pattern = new ArrayList<>(dimensionality); double[] coordinates = new double[dimensionality]; double dot = -1.0 / dimensionality; diff --git a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/IdentitySimulationDomain.java b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/IdentitySimulationDomain.java index 7fc2aa61d..f2697f22a 100644 --- a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/IdentitySimulationDomain.java +++ b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/IdentitySimulationDomain.java @@ -14,7 +14,7 @@ public class IdentitySimulationDomain implements SimulationDomain { @Override public Pair getDistanceToDomain(Simulation simulation) { - return new Pair(-1.0, null); + return new Pair<>(-1.0, null); } } diff --git a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/StabilityDomain.java b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/StabilityDomain.java index f3fa5dd0f..bedaa96f9 100644 --- a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/StabilityDomain.java +++ b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/StabilityDomain.java @@ -108,27 +108,27 @@ public class StabilityDomain implements SimulationDomain { if (minAbsolute) { ref = minimum - absolute; if (ref > 0) { - return new Pair(ref, desc); + return new Pair<>(ref, desc); } } else { ref = minimum - relative; if (ref > 0) { - return new Pair(ref, desc); + return new Pair<>(ref, desc); } } if (maxAbsolute) { ref = absolute - maximum; if (ref > 0) { - return new Pair(ref, desc); + return new Pair<>(ref, desc); } } else { ref = relative - maximum; if (ref > 0) { - return new Pair(ref, desc); + return new Pair<>(ref, desc); } } - return new Pair(0.0, desc); + return new Pair<>(0.0, desc); } } diff --git a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java index 0e8562617..bb392e59b 100644 --- a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java +++ b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java @@ -30,7 +30,7 @@ public abstract class AbstractSimulationModifier implements SimulationModifier { private double minValue = 0.0; private double maxValue = 1.0; - private final List listeners = new ArrayList(); + private final List listeners = new ArrayList<>(); /** * Sole constructor. diff --git a/core/src/main/java/info/openrocket/core/optimization/services/DefaultOptimizableParameterService.java b/core/src/main/java/info/openrocket/core/optimization/services/DefaultOptimizableParameterService.java index 589b213e2..af713a9e4 100644 --- a/core/src/main/java/info/openrocket/core/optimization/services/DefaultOptimizableParameterService.java +++ b/core/src/main/java/info/openrocket/core/optimization/services/DefaultOptimizableParameterService.java @@ -24,7 +24,7 @@ public class DefaultOptimizableParameterService implements OptimizableParameterS @Override public Collection getParameters(OpenRocketDocument document) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(new MaximumAltitudeParameter()); list.add(new MaximumVelocityParameter()); diff --git a/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java b/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java index d838fec7e..8775059e7 100644 --- a/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java +++ b/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java @@ -46,7 +46,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi private static final double DEFAULT_RANGE_MULTIPLIER = 2.0; - private static final Map, List> definitions = new HashMap, List>(); + private static final Map, List> definitions = new HashMap<>(); static { //addModifier("optimization.modifier.", unitGroup, multiplier, componentClass, methodName); @@ -110,7 +110,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi List list = definitions.get(componentClass); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); definitions.put(componentClass, list); } @@ -124,7 +124,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi @Override public Collection getModifiers(OpenRocketDocument document) { - List modifiers = new ArrayList(); + List modifiers = new ArrayList<>(); Rocket rocket = document.getRocket(); @@ -192,7 +192,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi modifiers.add(mod); // Motor ignition delay - mod = new FlightConfigurationModifier( + mod = new FlightConfigurationModifier<>( trans.get("optimization.modifier.motormount.delay"), trans.get("optimization.modifier.motormount.delay.desc"), c, UnitGroup.UNITS_SHORT_TIME, @@ -250,7 +250,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi // Recovery device deployment altitude and delay if (c instanceof RecoveryDevice) { - SimulationModifier mod = new FlightConfigurationModifier( + SimulationModifier mod = new FlightConfigurationModifier<>( trans.get("optimization.modifier.recoverydevice.deployDelay"), trans.get("optimization.modifier.recoverydevice.deployDelay.desc"), c, @@ -266,7 +266,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi mod.setMaxValue(10); modifiers.add(mod); - mod = new FlightConfigurationModifier( + mod = new FlightConfigurationModifier<>( trans.get("optimization.modifier.recoverydevice.deployAltitude"), trans.get("optimization.modifier.recoverydevice.deployAltitude.desc"), c, @@ -277,13 +277,13 @@ public class DefaultSimulationModifierService implements SimulationModifierServi "DeploymentConfigurations", DeploymentConfiguration.class, "DeployAltitude") { - + @Override public void initialize(Simulation simulation) throws OptimizationException { DeploymentConfiguration config = getModifiedObject(simulation); config.setDeployEvent(DeployEvent.APOGEE); } - + }; setDefaultMinMax(mod, simulation); modifiers.add(mod); diff --git a/core/src/main/java/info/openrocket/core/optimization/services/OptimizationServiceHelper.java b/core/src/main/java/info/openrocket/core/optimization/services/OptimizationServiceHelper.java index 6421e0df7..652d392d9 100644 --- a/core/src/main/java/info/openrocket/core/optimization/services/OptimizationServiceHelper.java +++ b/core/src/main/java/info/openrocket/core/optimization/services/OptimizationServiceHelper.java @@ -25,7 +25,7 @@ public final class OptimizationServiceHelper { * @return a collection of all simulation modifiers applicable to the document. */ public static Collection getSimulationModifiers(OpenRocketDocument document) { - List list = new ArrayList(); + List list = new ArrayList<>(); ServiceLoader loader = ServiceLoader.load(SimulationModifierService.class); for (SimulationModifierService service : loader) { @@ -47,7 +47,7 @@ public final class OptimizationServiceHelper { * document. */ public static Collection getOptimizableParameters(OpenRocketDocument document) { - List list = new ArrayList(); + List list = new ArrayList<>(); ServiceLoader loader = ServiceLoader.load(OptimizableParameterService.class); for (OptimizableParameterService service : loader) { diff --git a/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java b/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java index 4f7b5a918..0b0ba1524 100644 --- a/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java +++ b/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java @@ -180,75 +180,75 @@ public class ComponentPreset implements Comparable, Serializabl } - public final static TypedKey LEGACY = new TypedKey("Legacy", Boolean.class); - public final static TypedKey MANUFACTURER = new TypedKey("Manufacturer", + public final static TypedKey LEGACY = new TypedKey<>("Legacy", Boolean.class); + public final static TypedKey MANUFACTURER = new TypedKey<>("Manufacturer", Manufacturer.class); - public final static TypedKey PARTNO = new TypedKey("PartNo", String.class); - public final static TypedKey DESCRIPTION = new TypedKey("Description", String.class); - public final static TypedKey TYPE = new TypedKey("Type", Type.class); - public final static TypedKey LENGTH = new TypedKey("Length", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey HEIGHT = new TypedKey("Height", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey WIDTH = new TypedKey("Width", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey INNER_DIAMETER = new TypedKey("InnerDiameter", Double.class, + public final static TypedKey PARTNO = new TypedKey<>("PartNo", String.class); + public final static TypedKey DESCRIPTION = new TypedKey<>("Description", String.class); + public final static TypedKey TYPE = new TypedKey<>("Type", Type.class); + public final static TypedKey LENGTH = new TypedKey<>("Length", Double.class, UnitGroup.UNITS_LENGTH); + public final static TypedKey HEIGHT = new TypedKey<>("Height", Double.class, UnitGroup.UNITS_LENGTH); + public final static TypedKey WIDTH = new TypedKey<>("Width", Double.class, UnitGroup.UNITS_LENGTH); + public final static TypedKey INNER_DIAMETER = new TypedKey<>("InnerDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey OUTER_DIAMETER = new TypedKey("OuterDiameter", Double.class, + public final static TypedKey OUTER_DIAMETER = new TypedKey<>("OuterDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey FORE_SHOULDER_LENGTH = new TypedKey("ForeShoulderLength", Double.class, + public final static TypedKey FORE_SHOULDER_LENGTH = new TypedKey<>("ForeShoulderLength", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey FORE_SHOULDER_DIAMETER = new TypedKey("ForeShoulderDiameter", + public final static TypedKey FORE_SHOULDER_DIAMETER = new TypedKey<>("ForeShoulderDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey FORE_OUTER_DIAMETER = new TypedKey("ForeOuterDiameter", Double.class, + public final static TypedKey FORE_OUTER_DIAMETER = new TypedKey<>("ForeOuterDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey AFT_SHOULDER_LENGTH = new TypedKey("AftShoulderLength", Double.class, + public final static TypedKey AFT_SHOULDER_LENGTH = new TypedKey<>("AftShoulderLength", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey AFT_SHOULDER_DIAMETER = new TypedKey("AftShoulderDiameter", + public final static TypedKey AFT_SHOULDER_DIAMETER = new TypedKey<>("AftShoulderDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey AFT_OUTER_DIAMETER = new TypedKey("AftOuterDiameter", Double.class, + public final static TypedKey AFT_OUTER_DIAMETER = new TypedKey<>("AftOuterDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public static final TypedKey CD = new TypedKey("DragCoefficient", Double.class, + public static final TypedKey CD = new TypedKey<>("DragCoefficient", Double.class, UnitGroup.UNITS_COEFFICIENT); - public final static TypedKey SHAPE = new TypedKey("Shape", Shape.class); - public final static TypedKey MATERIAL = new TypedKey("Material", Material.class); - public final static TypedKey FINISH = new TypedKey("Finish", Finish.class); - public final static TypedKey THICKNESS = new TypedKey("Thickness", Double.class, + public final static TypedKey SHAPE = new TypedKey<>("Shape", Shape.class); + public final static TypedKey MATERIAL = new TypedKey<>("Material", Material.class); + public final static TypedKey FINISH = new TypedKey<>("Finish", Finish.class); + public final static TypedKey THICKNESS = new TypedKey<>("Thickness", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey FILLED = new TypedKey("Filled", Boolean.class); - public final static TypedKey MASS = new TypedKey("Mass", Double.class, UnitGroup.UNITS_MASS); - public final static TypedKey DIAMETER = new TypedKey("Diameter", Double.class, + public final static TypedKey FILLED = new TypedKey<>("Filled", Boolean.class); + public final static TypedKey MASS = new TypedKey<>("Mass", Double.class, UnitGroup.UNITS_MASS); + public final static TypedKey DIAMETER = new TypedKey<>("Diameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey IMAGE = new TypedKey("Image", byte[].class); + public final static TypedKey IMAGE = new TypedKey<>("Image", byte[].class); // RAIL BUTTON SPECIFIC - public final static TypedKey BASE_HEIGHT = new TypedKey("BaseHeight", Double.class, + public final static TypedKey BASE_HEIGHT = new TypedKey<>("BaseHeight", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey FLANGE_HEIGHT = new TypedKey("FlangeHeight", Double.class, + public final static TypedKey FLANGE_HEIGHT = new TypedKey<>("FlangeHeight", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey SCREW_HEIGHT = new TypedKey("ScrewHeight", Double.class, + public final static TypedKey SCREW_HEIGHT = new TypedKey<>("ScrewHeight", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey SCREW_MASS = new TypedKey("ScrewMass", Double.class, + public final static TypedKey SCREW_MASS = new TypedKey<>("ScrewMass", Double.class, UnitGroup.UNITS_MASS); - public final static TypedKey NUT_MASS = new TypedKey("NutMass", Double.class, UnitGroup.UNITS_MASS); + public final static TypedKey NUT_MASS = new TypedKey<>("NutMass", Double.class, UnitGroup.UNITS_MASS); // PARACHUTE SPECIFIC // Parachute Manufacturer declaration see: MANUFACTURER // Parachute Part Number declaration see: PARTNO // Parachute Description declaration see: DESCRIPTION - public final static TypedKey CANOPY_SHAPE = new TypedKey("CanopyShape", Shape.class); + public final static TypedKey CANOPY_SHAPE = new TypedKey<>("CanopyShape", Shape.class); // Parachute diameter declaration see: DIAMETER - public final static TypedKey SPILL_DIA = new TypedKey("SpillDia", Double.class, + public final static TypedKey SPILL_DIA = new TypedKey<>("SpillDia", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey SURFACE_AREA = new TypedKey("SurfaceArea", Double.class, + public final static TypedKey SURFACE_AREA = new TypedKey<>("SurfaceArea", Double.class, UnitGroup.UNITS_LENGTH); // Parachute canopy material declaration see: MATERIAL - public final static TypedKey SIDES = new TypedKey("Sides", Integer.class); - public final static TypedKey LINE_COUNT = new TypedKey("LineCount", Integer.class); - public final static TypedKey LINE_LENGTH = new TypedKey("LineLength", Double.class, + public final static TypedKey SIDES = new TypedKey<>("Sides", Integer.class); + public final static TypedKey LINE_COUNT = new TypedKey<>("LineCount", Integer.class); + public final static TypedKey LINE_LENGTH = new TypedKey<>("LineLength", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey LINE_MATERIAL = new TypedKey("LineMaterial", Material.class); - public final static TypedKey PACKED_LENGTH = new TypedKey("PackedLength", Double.class, + public final static TypedKey LINE_MATERIAL = new TypedKey<>("LineMaterial", Material.class); + public final static TypedKey PACKED_LENGTH = new TypedKey<>("PackedLength", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey PACKED_DIAMETER = new TypedKey("PackedDiameter", Double.class, + public final static TypedKey PACKED_DIAMETER = new TypedKey<>("PackedDiameter", Double.class, UnitGroup.UNITS_LENGTH); // Parachute Mass declaration see: MASS @@ -410,9 +410,9 @@ public class ComponentPreset implements Comparable, Serializabl ByteArrayOutputStream bos = new ByteArrayOutputStream(); DataOutputStream os = new DataOutputStream(bos); - List> keys = new ArrayList>(properties.keySet()); + List> keys = new ArrayList<>(properties.keySet()); - Collections.sort(keys, new Comparator>() { + Collections.sort(keys, new Comparator<>() { @Override public int compare(TypedKey a, TypedKey b) { return a.getName().compareTo(b.getName()); @@ -481,7 +481,7 @@ public class ComponentPreset implements Comparable, Serializabl } private void writeObject(ObjectOutputStream oos) throws IOException { - Map DTO = new HashMap(); + Map DTO = new HashMap<>(); for (Entry, Object> entry : properties.entrySet()) { diff --git a/core/src/main/java/info/openrocket/core/preset/InvalidComponentPresetException.java b/core/src/main/java/info/openrocket/core/preset/InvalidComponentPresetException.java index 507b1fa5a..b1f85083d 100644 --- a/core/src/main/java/info/openrocket/core/preset/InvalidComponentPresetException.java +++ b/core/src/main/java/info/openrocket/core/preset/InvalidComponentPresetException.java @@ -5,8 +5,8 @@ import java.util.List; public class InvalidComponentPresetException extends Exception { - private final List errors = new ArrayList(); - private final List> invalidParameters = new ArrayList>(); + private final List errors = new ArrayList<>(); + private final List> invalidParameters = new ArrayList<>(); public InvalidComponentPresetException() { super(); diff --git a/core/src/main/java/info/openrocket/core/preset/TypedPropertyMap.java b/core/src/main/java/info/openrocket/core/preset/TypedPropertyMap.java index 336ec8ab2..461f499c1 100644 --- a/core/src/main/java/info/openrocket/core/preset/TypedPropertyMap.java +++ b/core/src/main/java/info/openrocket/core/preset/TypedPropertyMap.java @@ -11,7 +11,7 @@ public class TypedPropertyMap implements Cloneable { private final Map, Object> delegate; public TypedPropertyMap() { - delegate = new LinkedHashMap, Object>(); + delegate = new LinkedHashMap<>(); } public int size() { diff --git a/core/src/main/java/info/openrocket/core/preset/loader/BaseComponentLoader.java b/core/src/main/java/info/openrocket/core/preset/loader/BaseComponentLoader.java index 36d2a3ebf..a161a7fa0 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/BaseComponentLoader.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/BaseComponentLoader.java @@ -15,7 +15,7 @@ public abstract class BaseComponentLoader extends RockSimComponentFileLoader { public BaseComponentLoader(MaterialHolder materials, File theBasePathToLoadFrom) { super(theBasePathToLoadFrom); - presets = new ArrayList(); + presets = new ArrayList<>(); fileColumns.add(new ManufacturerColumnParser()); fileColumns.add(new StringColumnParser("Part No.", ComponentPreset.PARTNO)); diff --git a/core/src/main/java/info/openrocket/core/preset/loader/BaseUnitColumnParser.java b/core/src/main/java/info/openrocket/core/preset/loader/BaseUnitColumnParser.java index f27393002..edec1fa34 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/BaseUnitColumnParser.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/BaseUnitColumnParser.java @@ -16,7 +16,7 @@ public abstract class BaseUnitColumnParser extends BaseColumnParser { protected static Map rocksimUnits; static { - rocksimUnits = new HashMap(); + rocksimUnits = new HashMap<>(); rocksimUnits.put("0", UnitGroup.UNITS_LENGTH.getUnit("in")); rocksimUnits.put("1", UnitGroup.UNITS_LENGTH.getUnit("mm")); } diff --git a/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java b/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java index 624ee980e..7c112be8a 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java @@ -13,11 +13,11 @@ import info.openrocket.core.unit.UnitGroup; public class MaterialHolder { - private final Map bulkMaterials = new HashMap(); + private final Map bulkMaterials = new HashMap<>(); - private final Map surfaceMaterials = new HashMap(); + private final Map surfaceMaterials = new HashMap<>(); - private final Map lineMaterials = new HashMap(); + private final Map lineMaterials = new HashMap<>(); public MaterialHolder() { } @@ -108,7 +108,7 @@ public class MaterialHolder { public Collection values() { - HashSet allMats = new HashSet(); + HashSet allMats = new HashSet<>(); allMats.addAll(bulkMaterials.values()); allMats.addAll(surfaceMaterials.values()); allMats.addAll(lineMaterials.values()); @@ -118,7 +118,7 @@ public class MaterialHolder { } public Database asDatabase(Material.Type theType) { - Database result = new Database(); + Database result = new Database<>(); switch (theType) { case LINE: result.addAll(lineMaterials.values()); diff --git a/core/src/main/java/info/openrocket/core/preset/loader/MaterialLoader.java b/core/src/main/java/info/openrocket/core/preset/loader/MaterialLoader.java index e015a0049..d7656ae74 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/MaterialLoader.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/MaterialLoader.java @@ -12,9 +12,9 @@ public class MaterialLoader extends RockSimComponentFileLoader { private final MaterialHolder materialMap = new MaterialHolder(); - private final static TypedKey MATERIALNAME = new TypedKey("MaterialName", String.class); - private final static TypedKey UNITS = new TypedKey("Units", String.class); - private final static TypedKey DENSITY = new TypedKey("Density", Double.class); + private final static TypedKey MATERIALNAME = new TypedKey<>("MaterialName", String.class); + private final static TypedKey UNITS = new TypedKey<>("Units", String.class); + private final static TypedKey DENSITY = new TypedKey<>("Density", Double.class); public MaterialLoader(File theBasePathToLoadFrom) { super(theBasePathToLoadFrom); diff --git a/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java b/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java index 12ef8fa57..d4a3c571e 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java @@ -33,7 +33,7 @@ public abstract class RockSimComponentFileLoader { private final File dir; - protected List fileColumns = new ArrayList(); + protected List fileColumns = new ArrayList<>(); /** * Constructor. 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 2f02cee45..dec18a69b 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 @@ -30,7 +30,7 @@ public class OpenRocketComponentDTO { @XmlElementWrapper(name = "Materials") @XmlElement(name = "Material") - List materials = new ArrayList(); + List materials = new ArrayList<>(); @XmlElementWrapper(name = "Components") @XmlElementRefs({ @@ -45,7 +45,7 @@ public class OpenRocketComponentDTO { @XmlElementRef(name = "RailButtons", type = RailButtonDTO.class), @XmlElementRef(name = "Streamers", type = StreamerDTO.class), @XmlElementRef(name = "Parachutes", type = ParachuteDTO.class) }) - private List components = new ArrayList(); + private List components = new ArrayList<>(); public OpenRocketComponentDTO() { } @@ -97,7 +97,7 @@ public class OpenRocketComponentDTO { } public List asComponentPresets() throws InvalidComponentPresetException { - List result = new ArrayList(components.size()); + List result = new ArrayList<>(components.size()); for (int i = 0; i < components.size(); i++) { result.add(components.get(i).asComponentPreset(getLegacy(), materials)); } @@ -105,7 +105,7 @@ public class OpenRocketComponentDTO { } public List asMaterialList() { - List result = new ArrayList(materials.size()); + List result = new ArrayList<>(materials.size()); for (MaterialDTO material : materials) { result.add(material.asMaterial()); } diff --git a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java index b3a422e1a..d45d6a49e 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java @@ -77,29 +77,29 @@ public class OpenRocketComponentSaver { // We're going to sort the initial data since that makes the output much easier // on the eyes. - Collections.sort(theMaterialList, new Comparator() { + Collections.sort(theMaterialList, new Comparator<>() { - @Override - public int compare(Material o1, Material o2) { - return o1.getName().compareTo(o2.getName()); - } + @Override + public int compare(Material o1, Material o2) { + return o1.getName().compareTo(o2.getName()); + } - }); + }); - Collections.sort(thePresetList, new Comparator() { + Collections.sort(thePresetList, new Comparator<>() { - @Override - public int compare(ComponentPreset o1, ComponentPreset o2) { - int manucmp = o1.getManufacturer().getSimpleName().compareTo(o2.getManufacturer().getSimpleName()); + @Override + public int compare(ComponentPreset o1, ComponentPreset o2) { + int manucmp = o1.getManufacturer().getSimpleName().compareTo(o2.getManufacturer().getSimpleName()); - if (manucmp != 0) { - return manucmp; - } + if (manucmp != 0) { + return manucmp; + } - return o1.getPartNo().compareTo(o2.getPartNo()); - } + return o1.getPartNo().compareTo(o2.getPartNo()); + } - }); + }); marshaller.marshal(toOpenRocketComponentDTO(theMaterialList, thePresetList, isLegacy), sw); return sw.toString(); diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/AxialStage.java b/core/src/main/java/info/openrocket/core/rocketcomponent/AxialStage.java index 696aa5749..27fcf16af 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/AxialStage.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/AxialStage.java @@ -18,7 +18,7 @@ public class AxialStage extends ComponentAssembly implements FlightConfigurableC * default constructor, builds a rocket with zero stages */ public AxialStage() { - this.separations = new FlightConfigurableParameterSet( + this.separations = new FlightConfigurableParameterSet<>( new StageSeparationConfiguration()); this.axialMethod = AxialMethod.AFTER; this.stageNumber = 0; @@ -93,7 +93,7 @@ public class AxialStage extends ComponentAssembly implements FlightConfigurableC @Override protected RocketComponent copyWithOriginalID() { AxialStage copy = (AxialStage) super.copyWithOriginalID(); - copy.separations = new FlightConfigurableParameterSet(separations); + copy.separations = new FlightConfigurableParameterSet<>(separations); return copy; } diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java b/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java index e0b5b4777..932dbd349 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java @@ -71,7 +71,7 @@ public class ClusterConfiguration { throw new IllegalArgumentException("Illegal number of points specified: " + points.length); } - List l = new ArrayList(points.length); + List l = new ArrayList<>(points.length); for (double d : points) l.add(d); @@ -108,7 +108,7 @@ public class ClusterConfiguration { public List getPoints(double rotation) { double cos = Math.cos(rotation); double sin = Math.sin(rotation); - List ret = new ArrayList(points.size()); + List ret = new ArrayList<>(points.size()); for (int i = 0; i < points.size() / 2; i++) { double x = points.get(2 * i); double y = points.get(2 * i + 1); diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java index 647150288..4ed49b818 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java @@ -22,7 +22,7 @@ public class FlightConfigurableParameterSet map = new LinkedHashMap(); + protected final LinkedHashMap map = new LinkedHashMap<>(); /** * Construct a FlightConfiguration that has no overrides. @@ -153,7 +153,7 @@ public class FlightConfigurableParameterSet getIds() { - ArrayList toReturn = new ArrayList(); + ArrayList toReturn = new ArrayList<>(); toReturn.addAll(this.map.keySet()); toReturn.remove(FlightConfigurationId.DEFAULT_VALUE_FCID); 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 1d9192bf8..6da889418 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java @@ -65,9 +65,9 @@ public class FlightConfiguration implements FlightConfigurableParameter stages = new HashMap<>(); // Map of stage number to StageFlags of the // corresponding stage - final protected Map motors = new HashMap(); + final protected Map motors = new HashMap<>(); private Map preloadStageActiveness = null; - final private Collection activeMotors = new ConcurrentLinkedQueue(); + final private Collection activeMotors = new ConcurrentLinkedQueue<>(); final private InstanceMap activeInstances = new InstanceMap(); final private InstanceMap extraRenderInstances = new InstanceMap(); // Extra instances to be rendered, besides the // active instances @@ -321,7 +321,7 @@ public class FlightConfiguration implements FlightConfigurableParameter getAllComponents() { - List traversalOrder = new ArrayList(); + List traversalOrder = new ArrayList<>(); recurseAllComponentsDepthFirst(this.rocket, traversalOrder); return traversalOrder; } @@ -339,7 +339,7 @@ public class FlightConfiguration implements FlightConfigurableParameter getCoreComponents() { - Queue toProcess = new ArrayDeque(); + Queue toProcess = new ArrayDeque<>(); toProcess.offer(this.rocket); ArrayList toReturn = new ArrayList<>(); @@ -377,7 +377,7 @@ public class FlightConfiguration implements FlightConfigurableParameter getActiveComponents() { - Queue toProcess = new ArrayDeque(this.getActiveStages()); + Queue toProcess = new ArrayDeque<>(this.getActiveStages()); ArrayList toReturn = new ArrayList<>(); while (!toProcess.isEmpty()) { diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java b/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java index 8ae3a2663..1ddc08ff3 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java @@ -221,7 +221,7 @@ public class LaunchLug extends Tube implements AnglePositionable, BoxBounded, Li @Override public Collection getComponentBounds() { - ArrayList set = new ArrayList(); + ArrayList set = new ArrayList<>(); addBound(set, 0, radius); addBound(set, length, radius); return set; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/MassObject.java b/core/src/main/java/info/openrocket/core/rocketcomponent/MassObject.java index 931e815de..1e78b063e 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/MassObject.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/MassObject.java @@ -235,7 +235,7 @@ public abstract class MassObject extends InternalComponent { @Override public final Collection getComponentBounds() { - Collection c = new ArrayList(); + Collection c = new ArrayList<>(); addBound(c, 0, getRadius()); addBound(c, getLength(), getRadius()); return c; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java b/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java index 223eddfcd..40737108a 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java @@ -49,7 +49,7 @@ public class ParallelStage extends AxialStage implements FlightConfigurableCompo // not strictly accurate, but this should provide an acceptable estimate for total vehicle size @Override public Collection getComponentBounds() { - Collection bounds = new ArrayList(8); + Collection bounds = new ArrayList<>(8); double x_min = Double.MAX_VALUE; double x_max = Double.MIN_VALUE; double r_max = 0; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java b/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java index a2ae2031f..bef61f53f 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java @@ -353,7 +353,7 @@ public class RailButton extends ExternalComponent @Override public Collection getComponentBounds() { final double r = outerDiameter_m / 2.0; - ArrayList set = new ArrayList(); + ArrayList set = new ArrayList<>(); set.add(new Coordinate(r, totalHeight_m, r)); set.add(new Coordinate(r, totalHeight_m, -r)); set.add(new Coordinate(r, 0, r)); diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/RingComponent.java b/core/src/main/java/info/openrocket/core/rocketcomponent/RingComponent.java index 342890c44..031da83ec 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/RingComponent.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/RingComponent.java @@ -203,7 +203,7 @@ public abstract class RingComponent extends StructuralComponent implements BoxBo @Override public Collection getComponentBounds() { - List bounds = new ArrayList(); + List bounds = new ArrayList<>(); addBound(bounds, 0, getOuterRadius()); addBound(bounds, length, getOuterRadius()); return bounds; 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 e5c95c614..02161ed32 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java @@ -486,7 +486,7 @@ public class Rocket extends ComponentAssembly { */ public void resetListeners() { // System.out.println("RESETTING LISTENER LIST of Rocket "+this); - listenerList = new HashSet(); + listenerList = new HashSet<>(); } diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java b/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java index cc8dd9d98..479b624eb 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java @@ -70,7 +70,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab /** * List of child components of this component. */ - protected ArrayList children = new ArrayList(); + protected ArrayList children = new ArrayList<>(); //////// Parameters common to all components: @@ -438,7 +438,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab // Reset all parent/child information clone.parent = null; - clone.children = new ArrayList(); + clone.children = new ArrayList<>(); // Add copied children to the structure without firing events. for (RocketComponent child : this.children) { @@ -2960,7 +2960,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab */ private static class RocketComponentIterator implements Iterator { // Stack holds iterators which still have some components left. - private final Deque> iteratorStack = new ArrayDeque>(); + private final Deque> iteratorStack = new ArrayDeque<>(); private final Rocket root; private final ModID treeModID; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/SymmetricComponent.java b/core/src/main/java/info/openrocket/core/rocketcomponent/SymmetricComponent.java index 2dc94d29a..f0de49103 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/SymmetricComponent.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/SymmetricComponent.java @@ -174,7 +174,7 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou */ @Override public Collection getComponentBounds() { - List list = new ArrayList(20); + List list = new ArrayList<>(20); for (int n = 0; n <= 5; n++) { double x = n * getLength() / 5; double r = getRadius(x); 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 d64d8b41b..ccee1854e 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java @@ -360,7 +360,7 @@ public class TubeFinSet extends Tube implements AxialPositionable, BoxBounded, R @Override public Collection getComponentBounds() { - List bounds = new ArrayList(); + List bounds = new ArrayList<>(); double r = getBodyRadius(); addBound(bounds, 0, 2 * getBoundingRadius()); diff --git a/core/src/main/java/info/openrocket/core/rocketvisitors/ListComponents.java b/core/src/main/java/info/openrocket/core/rocketvisitors/ListComponents.java index 38201f85f..32cb2a92c 100644 --- a/core/src/main/java/info/openrocket/core/rocketvisitors/ListComponents.java +++ b/core/src/main/java/info/openrocket/core/rocketvisitors/ListComponents.java @@ -8,7 +8,7 @@ import info.openrocket.core.rocketcomponent.RocketComponent; public class ListComponents extends DepthFirstRecursiveVisitor> { private final Class componentClazz; - protected List components = new ArrayList(); + protected List components = new ArrayList<>(); public ListComponents(Class componentClazz) { super(); diff --git a/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java b/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java index aeae329b3..0a1c15a69 100644 --- a/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java +++ b/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java @@ -57,7 +57,7 @@ public class BasicEventSimulationEngine implements SimulationEngine { private FlightConfigurationId fcid; // this is just a list of simulation branches to - Deque toSimulate = new ArrayDeque(); + Deque toSimulate = new ArrayDeque<>(); FlightData flightData; @@ -202,7 +202,7 @@ public class BasicEventSimulationEngine implements SimulationEngine { if (!currentStatus.isLanded()) currentStatus.addEvent(new FlightEvent(FlightEvent.Type.ALTITUDE, currentStatus.getSimulationTime(), currentStatus.getConfiguration().getRocket(), - new Pair(oldAlt, currentStatus.getRocketPosition().z))); + new Pair<>(oldAlt, currentStatus.getRocketPosition().z))); if (currentStatus.getRocketPosition().z > currentStatus.getMaxAlt()) { currentStatus.setMaxAlt(currentStatus.getRocketPosition().z); diff --git a/core/src/main/java/info/openrocket/core/simulation/FlightData.java b/core/src/main/java/info/openrocket/core/simulation/FlightData.java index 3fae1cad8..87924c448 100644 --- a/core/src/main/java/info/openrocket/core/simulation/FlightData.java +++ b/core/src/main/java/info/openrocket/core/simulation/FlightData.java @@ -40,7 +40,7 @@ public class FlightData { private final Mutable mutable = new Mutable(); - private final ArrayList branches = new ArrayList(); + private final ArrayList branches = new ArrayList<>(); private final WarningSet warnings = new WarningSet(); diff --git a/core/src/main/java/info/openrocket/core/simulation/FlightDataBranch.java b/core/src/main/java/info/openrocket/core/simulation/FlightDataBranch.java index b4b28750a..10fdd1147 100644 --- a/core/src/main/java/info/openrocket/core/simulation/FlightDataBranch.java +++ b/core/src/main/java/info/openrocket/core/simulation/FlightDataBranch.java @@ -48,7 +48,7 @@ public class FlightDataBranch implements Monitorable { */ private double optimumAltitude = Double.NaN; - private final ArrayList events = new ArrayList(); + private final ArrayList events = new ArrayList<>(); private final Mutable mutable = new Mutable(); @@ -73,7 +73,7 @@ public class FlightDataBranch implements Monitorable { "times in constructor."); } - values.put(t, new ArrayList()); + values.put(t, new ArrayList<>()); minValues.put(t, Double.NaN); maxValues.put(t, Double.NaN); } diff --git a/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java b/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java index 15b4174bc..245e6d8d6 100644 --- a/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java +++ b/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java @@ -41,7 +41,7 @@ public class FlightDataType implements Comparable { /** List of existing types. MUST BE DEFINED BEFORE ANY TYPES!! */ /** NOTE: The String key here is now the symbol */ - private static final Map EXISTING_TYPES = new HashMap(); + private static final Map EXISTING_TYPES = new HashMap<>(); //// Time public static final FlightDataType TYPE_TIME = newType(trans.get("FlightDataType.TYPE_TIME"), "t", diff --git a/core/src/main/java/info/openrocket/core/simulation/SimulationConditions.java b/core/src/main/java/info/openrocket/core/simulation/SimulationConditions.java index 4dc71864a..96d2559fc 100644 --- a/core/src/main/java/info/openrocket/core/simulation/SimulationConditions.java +++ b/core/src/main/java/info/openrocket/core/simulation/SimulationConditions.java @@ -59,7 +59,7 @@ public class SimulationConditions implements Monitorable, Cloneable { private double maximumAngleStep = RK4SimulationStepper.RECOMMENDED_ANGLE_STEP; - private List simulationListeners = new ArrayList(); + private List simulationListeners = new ArrayList<>(); private int randomSeed = 0; @@ -251,7 +251,7 @@ public class SimulationConditions implements Monitorable, Cloneable { try { // TODO: HIGH: Deep clone models SimulationConditions clone = (SimulationConditions) super.clone(); - clone.simulationListeners = new ArrayList(this.simulationListeners.size()); + clone.simulationListeners = new ArrayList<>(this.simulationListeners.size()); for (SimulationListener listener : this.simulationListeners) { clone.simulationListeners.add(listener.clone()); } diff --git a/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java b/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java index 0d3796ea3..7779ebdab 100644 --- a/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java +++ b/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java @@ -79,7 +79,7 @@ public class SimulationOptions implements ChangeSource, Cloneable, SimulationOpt private int randomSeed = new Random().nextInt(); - private List listeners = new ArrayList(); + private List listeners = new ArrayList<>(); public SimulationOptions() { } @@ -349,7 +349,7 @@ public class SimulationOptions implements ChangeSource, Cloneable, SimulationOpt public SimulationOptions clone() { try { SimulationOptions copy = (SimulationOptions) super.clone(); - copy.listeners = new ArrayList(); + copy.listeners = new ArrayList<>(); return copy; } catch (CloneNotSupportedException e) { throw new BugException(e); diff --git a/core/src/main/java/info/openrocket/core/simulation/SimulationStatus.java b/core/src/main/java/info/openrocket/core/simulation/SimulationStatus.java index b16f43b72..4768bc3d5 100644 --- a/core/src/main/java/info/openrocket/core/simulation/SimulationStatus.java +++ b/core/src/main/java/info/openrocket/core/simulation/SimulationStatus.java @@ -56,7 +56,7 @@ public class SimulationStatus implements Cloneable, Monitorable { private double effectiveLaunchRodLength; // Set of all motors - private final List motorStateList = new ArrayList(); + private final List motorStateList = new ArrayList<>(); /** Nanosecond time when the simulation was started. */ private long simulationStartWallTime = Long.MIN_VALUE; @@ -80,7 +80,7 @@ public class SimulationStatus implements Cloneable, Monitorable { private boolean landed = false; /** Contains a list of deployed recovery devices. */ - private final MonitorableSet deployedRecoveryDevices = new MonitorableSet(); + private final MonitorableSet deployedRecoveryDevices = new MonitorableSet<>(); /** The flight event queue */ private final EventQueue eventQueue = new EventQueue(); @@ -88,7 +88,7 @@ public class SimulationStatus implements Cloneable, Monitorable { private WarningSet warnings; /** Available for special purposes by the listeners. */ - private final Map extraData = new HashMap(); + private final Map extraData = new HashMap<>(); double maxAlt = Double.NEGATIVE_INFINITY; double maxAltTime = 0; @@ -230,7 +230,7 @@ public class SimulationStatus implements Cloneable, Monitorable { } public Collection getActiveMotors() { - List activeList = new ArrayList(); + List activeList = new ArrayList<>(); for (MotorClusterState state : this.motorStateList) { if (this.configuration.isComponentActive(state.getMount())) { activeList.add(state); diff --git a/core/src/main/java/info/openrocket/core/simulation/customexpression/CustomExpression.java b/core/src/main/java/info/openrocket/core/simulation/customexpression/CustomExpression.java index 3158cb1f5..f6487b7ce 100644 --- a/core/src/main/java/info/openrocket/core/simulation/customexpression/CustomExpression.java +++ b/core/src/main/java/info/openrocket/core/simulation/customexpression/CustomExpression.java @@ -38,7 +38,7 @@ public class CustomExpression implements Cloneable { protected String expression; private ExpressionBuilder builder; - private final List subExpressions = new ArrayList(); + private final List subExpressions = new ArrayList<>(); public CustomExpression(OpenRocketDocument doc) { this.doc = doc; @@ -185,7 +185,7 @@ public class CustomExpression implements Cloneable { // get a list of all the names of all the available variables protected ArrayList getAllNames() { - ArrayList names = new ArrayList(); + ArrayList names = new ArrayList<>(); /* * for (FlightDataType type : FlightDataType.ALL_TYPES) * names.add(type.getName()); @@ -212,7 +212,7 @@ public class CustomExpression implements Cloneable { // get a list of all the symbols of the available variables ignoring this one protected ArrayList getAllSymbols() { - ArrayList symbols = new ArrayList(); + ArrayList symbols = new ArrayList<>(); /* * for (FlightDataType type : FlightDataType.ALL_TYPES) * symbols.add(type.getSymbol()); diff --git a/core/src/main/java/info/openrocket/core/simulation/customexpression/Functions.java b/core/src/main/java/info/openrocket/core/simulation/customexpression/Functions.java index f5d678da7..827045984 100644 --- a/core/src/main/java/info/openrocket/core/simulation/customexpression/Functions.java +++ b/core/src/main/java/info/openrocket/core/simulation/customexpression/Functions.java @@ -25,7 +25,7 @@ public class Functions { private static final Logger log = LoggerFactory.getLogger(Functions.class); private static final Translator trans = Application.getTranslator(); - private final List allFunctions = new ArrayList(); + private final List allFunctions = new ArrayList<>(); public static Functions getInstance() { if (instance == null) { @@ -44,7 +44,7 @@ public class Functions { // A map of available operator strings (keys) and description of function // (value) - public static final SortedMap AVAILABLE_OPERATORS = new TreeMap() { + public static final SortedMap AVAILABLE_OPERATORS = new TreeMap<>() { { put("+", trans.get("Operator.plus")); put("-", trans.get("Operator.minus")); diff --git a/core/src/main/java/info/openrocket/core/simulation/extension/SimulationExtensionConfiguration.java b/core/src/main/java/info/openrocket/core/simulation/extension/SimulationExtensionConfiguration.java index a0c004310..b7656ac9a 100644 --- a/core/src/main/java/info/openrocket/core/simulation/extension/SimulationExtensionConfiguration.java +++ b/core/src/main/java/info/openrocket/core/simulation/extension/SimulationExtensionConfiguration.java @@ -112,7 +112,7 @@ public final class SimulationExtensionConfiguration extends HashMap original) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (Object value : original) { if (value instanceof SimulationExtensionConfiguration) { list.add(((SimulationExtensionConfiguration) value).clone()); diff --git a/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java b/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java index 2525e21e3..6d092fde1 100644 --- a/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java +++ b/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java @@ -31,7 +31,7 @@ public class DampingMoment extends AbstractSimulationExtension { // Save it as a FlightDataType private static final FlightDataType cdm = FlightDataType.getType("Damping moment coefficient", "Cdm", UnitGroup.UNITS_COEFFICIENT); - private static final ArrayList types = new ArrayList(); + private static final ArrayList types = new ArrayList<>(); DampingMoment() { types.add(cdm); diff --git a/core/src/main/java/info/openrocket/core/simulation/extension/example/RollControl.java b/core/src/main/java/info/openrocket/core/simulation/extension/example/RollControl.java index 976a232fb..cdfc2b529 100644 --- a/core/src/main/java/info/openrocket/core/simulation/extension/example/RollControl.java +++ b/core/src/main/java/info/openrocket/core/simulation/extension/example/RollControl.java @@ -28,7 +28,7 @@ import info.openrocket.core.util.MathUtil; public class RollControl extends AbstractSimulationExtension { // save fin cant angle as a FlightDataType - private static final ArrayList types = new ArrayList(); + private static final ArrayList types = new ArrayList<>(); private static final FlightDataType FIN_CANT_TYPE = FlightDataType.getType("Control fin cant", "\u03B1fc", UnitGroup.UNITS_ANGLE); diff --git a/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingSimulationListener.java b/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingSimulationListener.java index 146a78084..7f7fff3bd 100644 --- a/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingSimulationListener.java +++ b/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingSimulationListener.java @@ -39,7 +39,7 @@ public class ScriptingSimulationListener */ private final Invocable invocable; - private Set missing = new HashSet(); + private Set missing = new HashSet<>(); public ScriptingSimulationListener(Invocable invocable) { this.invocable = invocable; @@ -54,7 +54,7 @@ public class ScriptingSimulationListener public SimulationListener clone() { try { ScriptingSimulationListener clone = (ScriptingSimulationListener) super.clone(); - clone.missing = new HashSet(missing); + clone.missing = new HashSet<>(missing); return clone; } catch (CloneNotSupportedException e) { throw new BugException(e); diff --git a/core/src/main/java/info/openrocket/core/startup/Preferences.java b/core/src/main/java/info/openrocket/core/startup/Preferences.java index c165e8c00..22f5e9ad0 100644 --- a/core/src/main/java/info/openrocket/core/startup/Preferences.java +++ b/core/src/main/java/info/openrocket/core/startup/Preferences.java @@ -1031,7 +1031,7 @@ public abstract class Preferences implements ChangeSource { * @return a list of files to load as thrust curves. */ public List getUserThrustCurveFiles() { - List list = new ArrayList(); + List list = new ArrayList<>(); String files = getString(USER_THRUST_CURVES_KEY, null); if (files == null) { @@ -1247,7 +1247,7 @@ public abstract class Preferences implements ChangeSource { * Map of default line styles */ - private static final HashMap, String> DEFAULT_LINE_STYLES = new HashMap, String>(); + private static final HashMap, String> DEFAULT_LINE_STYLES = new HashMap<>(); static { DEFAULT_LINE_STYLES.put(RocketComponent.class, LineStyle.SOLID.name()); @@ -1255,7 +1255,7 @@ public abstract class Preferences implements ChangeSource { } } - private final List listeners = new ArrayList(); + private final List listeners = new ArrayList<>(); private final EventObject event = new EventObject(this); @Override diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/DownloadRequest.java b/core/src/main/java/info/openrocket/core/thrustcurve/DownloadRequest.java index 891c476cf..d42d05204 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/DownloadRequest.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/DownloadRequest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; class DownloadRequest { - private final ArrayList motorIds = new ArrayList(); + private final ArrayList motorIds = new ArrayList<>(); private String format = null; diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java b/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java index f27a49146..1b1c017cb 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java @@ -7,14 +7,14 @@ import java.util.Map; public class DownloadResponse { - private final Map> data = new HashMap>(); + private final Map> data = new HashMap<>(); private String error = null; public void add(MotorBurnFile mbd) { List currentData = data.get(mbd.getMotorId()); if (currentData == null) { - currentData = new ArrayList(); + currentData = new ArrayList<>(); data.put(mbd.getMotorId(), currentData); } currentData.add(mbd); diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/SearchResponse.java b/core/src/main/java/info/openrocket/core/thrustcurve/SearchResponse.java index a28242376..85a4ab969 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/SearchResponse.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/SearchResponse.java @@ -5,7 +5,7 @@ import java.util.List; public class SearchResponse { - private final List results = new ArrayList(); + private final List results = new ArrayList<>(); private int matches; 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 60b5f286f..ff498925e 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java @@ -56,7 +56,7 @@ public class SerializeThrustcurveMotors { String inputDir = args[0]; String outputFile = args[1]; - final List allMotors = new ArrayList(); + final List allMotors = new ArrayList<>(); loadFromLocalMotorFiles(allMotors, inputDir); diff --git a/core/src/main/java/info/openrocket/core/unit/FixedPrecisionUnit.java b/core/src/main/java/info/openrocket/core/unit/FixedPrecisionUnit.java index 05fd2ac85..81d5716ab 100644 --- a/core/src/main/java/info/openrocket/core/unit/FixedPrecisionUnit.java +++ b/core/src/main/java/info/openrocket/core/unit/FixedPrecisionUnit.java @@ -58,7 +58,7 @@ public class FixedPrecisionUnit extends Unit { throw new IllegalArgumentException("getTicks called with minor=" + minor + " major=" + major); } - ArrayList ticks = new ArrayList(); + ArrayList ticks = new ArrayList<>(); int mod2, mod3, mod4; // Moduli for minor-notable, major-nonnotable, major-notable double minstep; diff --git a/core/src/main/java/info/openrocket/core/unit/FractionalUnit.java b/core/src/main/java/info/openrocket/core/unit/FractionalUnit.java index 705850266..f0881f2de 100644 --- a/core/src/main/java/info/openrocket/core/unit/FractionalUnit.java +++ b/core/src/main/java/info/openrocket/core/unit/FractionalUnit.java @@ -105,7 +105,7 @@ public class FractionalUnit extends Unit { throw new IllegalArgumentException("getTicks called with minor=" + minor + " major=" + major); } - ArrayList ticks = new ArrayList(); + ArrayList ticks = new ArrayList<>(); int mod2, mod3, mod4; // Moduli for minor-notable, major-nonnotable, major-notable double minstep; diff --git a/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java b/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java index ee75878b3..eba013def 100644 --- a/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java +++ b/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java @@ -67,7 +67,7 @@ public class GeneralUnit extends Unit { // start, end and scale in this units // @Override public ArrayList getTicks(double start, double end, double scale) { - ArrayList ticks = new ArrayList(); + ArrayList ticks = new ArrayList<>(); @SuppressWarnings("unused") double delta; @SuppressWarnings("unused") @@ -121,7 +121,7 @@ public class GeneralUnit extends Unit { throw new IllegalArgumentException("getTicks called with minor="+minor+" major="+major); } - ArrayList ticks = new ArrayList(); + ArrayList ticks = new ArrayList<>(); int mod2,mod3,mod4; // Moduli for minor-notable, major-nonnotable, major-notable double minstep; 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 8acd23b18..77f38025e 100644 --- a/core/src/main/java/info/openrocket/core/unit/UnitGroup.java +++ b/core/src/main/java/info/openrocket/core/unit/UnitGroup.java @@ -324,7 +324,7 @@ public class UnitGroup { resetDefaultUnits(); - HashMap map = new HashMap(); + HashMap map = new HashMap<>(); map.put("NONE", UNITS_NONE); map.put("LENGTH", UNITS_LENGTH); map.put("ALL_LENGTHS", UNITS_ALL_LENGTHS); @@ -366,7 +366,7 @@ public class UnitGroup { UNITS = Collections.unmodifiableMap(map); - HashMap simap = new HashMap(); + HashMap simap = new HashMap<>(); simap.put("m", UNITS_ALL_LENGTHS); simap.put("m^2", UNITS_AREA); simap.put("m/s", UNITS_VELOCITY); @@ -566,7 +566,7 @@ public class UnitGroup { ////////////////////////////////////////////////////// - protected ArrayList units = new ArrayList(); + protected ArrayList units = new ArrayList<>(); protected int defaultUnit = 0; public int getUnitCount() { diff --git a/core/src/main/java/info/openrocket/core/util/AbstractChangeSource.java b/core/src/main/java/info/openrocket/core/util/AbstractChangeSource.java index cb59675d5..d5d5a285b 100644 --- a/core/src/main/java/info/openrocket/core/util/AbstractChangeSource.java +++ b/core/src/main/java/info/openrocket/core/util/AbstractChangeSource.java @@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory; public class AbstractChangeSource implements ChangeSource { private static final Logger log = LoggerFactory.getLogger(AbstractChangeSource.class); - private final List listeners = new ArrayList(); + private final List listeners = new ArrayList<>(); @Override public final void addChangeListener(StateChangeListener listener) { diff --git a/core/src/main/java/info/openrocket/core/util/Base64.java b/core/src/main/java/info/openrocket/core/util/Base64.java index dfa1bf4b1..d85b62546 100644 --- a/core/src/main/java/info/openrocket/core/util/Base64.java +++ b/core/src/main/java/info/openrocket/core/util/Base64.java @@ -28,7 +28,7 @@ public class Base64 { // REVERSE[PAD] = 0; // } - private static final Map REVERSE = new HashMap(); + private static final Map REVERSE = new HashMap<>(); static { for (int i = 0; i < 64; i++) { REVERSE.put(ALPHABET[i], i); diff --git a/core/src/main/java/info/openrocket/core/util/Config.java b/core/src/main/java/info/openrocket/core/util/Config.java index c9a1fe352..9756e0ec0 100644 --- a/core/src/main/java/info/openrocket/core/util/Config.java +++ b/core/src/main/java/info/openrocket/core/util/Config.java @@ -9,7 +9,7 @@ import java.util.Set; public class Config { - private final LinkedHashMap map = new LinkedHashMap(); + private final LinkedHashMap map = new LinkedHashMap<>(); public void put(String key, String value) { validateType(value); @@ -136,7 +136,7 @@ public class Config { return new BigDecimal(value.toString()); } else if (value instanceof List) { List list = (List) value; - ArrayList copy = new ArrayList(list.size()); + ArrayList copy = new ArrayList<>(list.size()); for (Object o : list) { copy.add(clone(o)); } diff --git a/core/src/main/java/info/openrocket/core/util/LinearInterpolator.java b/core/src/main/java/info/openrocket/core/util/LinearInterpolator.java index 17da9ae71..59a6220ba 100644 --- a/core/src/main/java/info/openrocket/core/util/LinearInterpolator.java +++ b/core/src/main/java/info/openrocket/core/util/LinearInterpolator.java @@ -7,7 +7,7 @@ import java.util.TreeMap; public class LinearInterpolator implements Cloneable { - private TreeMap sortMap = new TreeMap(); + private TreeMap sortMap = new TreeMap<>(); /** * Construct a LinearInterpolator with no points. Some points must diff --git a/core/src/main/java/info/openrocket/core/util/ListenerList.java b/core/src/main/java/info/openrocket/core/util/ListenerList.java index 237f0b644..84618a942 100644 --- a/core/src/main/java/info/openrocket/core/util/ListenerList.java +++ b/core/src/main/java/info/openrocket/core/util/ListenerList.java @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory; public class ListenerList implements Invalidatable, Iterable { private static final Logger log = LoggerFactory.getLogger(ListenerList.class); - private final ArrayList> listeners = new ArrayList>(); + private final ArrayList> listeners = new ArrayList<>(); private final Throwable instantiationLocation; private Throwable invalidated = null; @@ -45,7 +45,7 @@ public class ListenerList implements Invalidatable, Iterable { public boolean addListener(T listener) { checkState(true); - ListenerData data = new ListenerData(listener); + ListenerData data = new ListenerData<>(listener); if (listeners.contains(data)) { log.warn("Attempting to add duplicate listener " + listener); return false; diff --git a/core/src/main/java/info/openrocket/core/util/MathUtil.java b/core/src/main/java/info/openrocket/core/util/MathUtil.java index a3f1feb36..e12a29c81 100644 --- a/core/src/main/java/info/openrocket/core/util/MathUtil.java +++ b/core/src/main/java/info/openrocket/core/util/MathUtil.java @@ -302,8 +302,8 @@ public class MathUtil { return Double.NaN; } - List sorted = new ArrayList(values); - Collections.sort(sorted, new Comparator() { + List sorted = new ArrayList<>(values); + Collections.sort(sorted, new Comparator<>() { @Override public int compare(Number o1, Number o2) { return Double.compare(o1.doubleValue(), o2.doubleValue()); diff --git a/core/src/main/java/info/openrocket/core/util/MemoryManagement.java b/core/src/main/java/info/openrocket/core/util/MemoryManagement.java index ab7184a23..53774d81d 100644 --- a/core/src/main/java/info/openrocket/core/util/MemoryManagement.java +++ b/core/src/main/java/info/openrocket/core/util/MemoryManagement.java @@ -37,10 +37,10 @@ public final class MemoryManagement { * weak references) * to */ - private static final List objects = new LinkedList(); + private static final List objects = new LinkedList<>(); private static int collectableCallCount = 0; - private static final List>> listenerLists = new LinkedList>>(); + private static final List>> listenerLists = new LinkedList<>(); private static int listenerCallCount = 0; private MemoryManagement() { @@ -88,7 +88,7 @@ public final class MemoryManagement { } } purgeCollectables(); - return new ArrayList(objects); + return new ArrayList<>(objects); } /** @@ -101,7 +101,7 @@ public final class MemoryManagement { * @param list the listener list to register */ public static synchronized void registerListenerList(ListenerList list) { - listenerLists.add(new WeakReference>(list)); + listenerLists.add(new WeakReference<>(list)); listenerCallCount++; if (listenerCallCount % PURGE_CALL_COUNT == 0) { purgeListeners(); @@ -130,7 +130,7 @@ public final class MemoryManagement { } } purgeListeners(); - List> list = new ArrayList>(); + List> list = new ArrayList<>(); for (WeakReference> ref : listenerLists) { ListenerList l = ref.get(); if (l != null) { @@ -178,7 +178,7 @@ public final class MemoryManagement { private final long registrationTime; private MemoryData(Object object) { - this.reference = new WeakReference(object); + this.reference = new WeakReference<>(object); this.registrationTime = System.currentTimeMillis(); } diff --git a/core/src/main/java/info/openrocket/core/util/MonitorableSet.java b/core/src/main/java/info/openrocket/core/util/MonitorableSet.java index 8ec934bcd..5bc8b8da9 100644 --- a/core/src/main/java/info/openrocket/core/util/MonitorableSet.java +++ b/core/src/main/java/info/openrocket/core/util/MonitorableSet.java @@ -33,7 +33,7 @@ public class MonitorableSet extends HashSet implements Monitorable { @Override public Iterator iterator() { - return new MonitorableIterator(super.iterator()); + return new MonitorableIterator<>(super.iterator()); } @Override diff --git a/core/src/main/java/info/openrocket/core/util/PrintProperties.java b/core/src/main/java/info/openrocket/core/util/PrintProperties.java index 3cc6ac5c0..07afb6381 100644 --- a/core/src/main/java/info/openrocket/core/util/PrintProperties.java +++ b/core/src/main/java/info/openrocket/core/util/PrintProperties.java @@ -8,7 +8,7 @@ public class PrintProperties { public static void main(String[] args) { // Sort the keys - SortedSet keys = new TreeSet(); + SortedSet keys = new TreeSet<>(); for (Object key : System.getProperties().keySet()) { keys.add((String) key); } diff --git a/core/src/main/java/info/openrocket/core/util/SafetyMutex.java b/core/src/main/java/info/openrocket/core/util/SafetyMutex.java index f0ac93a80..91c144d93 100644 --- a/core/src/main/java/info/openrocket/core/util/SafetyMutex.java +++ b/core/src/main/java/info/openrocket/core/util/SafetyMutex.java @@ -113,7 +113,7 @@ public abstract class SafetyMutex { // true Throwable lockingLocation = null; // Stack of places that have locked this mutex - final LinkedList locations = new LinkedList(); + final LinkedList locations = new LinkedList<>(); @Override public synchronized void verify() { diff --git a/core/src/main/java/info/openrocket/core/util/Transformation.java b/core/src/main/java/info/openrocket/core/util/Transformation.java index db986e94d..acf7bce87 100644 --- a/core/src/main/java/info/openrocket/core/util/Transformation.java +++ b/core/src/main/java/info/openrocket/core/util/Transformation.java @@ -144,7 +144,7 @@ public class Transformation implements java.io.Serializable { * @param set Collection of coordinates to transform. */ public void transform(Collection set) { - ArrayList temp = new ArrayList(set.size()); + ArrayList temp = new ArrayList<>(set.size()); Iterator iter = set.iterator(); while (iter.hasNext()) temp.add(this.transform(iter.next())); diff --git a/core/src/main/java/info/openrocket/core/util/enums/EnumName.java b/core/src/main/java/info/openrocket/core/util/enums/EnumName.java index f0a3fee79..a2ade2735 100644 --- a/core/src/main/java/info/openrocket/core/util/enums/EnumName.java +++ b/core/src/main/java/info/openrocket/core/util/enums/EnumName.java @@ -25,8 +25,8 @@ public class EnumName> { public EnumName(Class type, EnumConversion conversion) { this.type = type; - map = new EnumMap(type); - reverse = new HashMap(); + map = new EnumMap<>(type); + reverse = new HashMap<>(); E[] keys = type.getEnumConstants(); if (keys == null) { diff --git a/core/src/main/java/info/openrocket/core/utils/L10nPropertyReport.java b/core/src/main/java/info/openrocket/core/utils/L10nPropertyReport.java index 89e7cacad..bd20c1f59 100644 --- a/core/src/main/java/info/openrocket/core/utils/L10nPropertyReport.java +++ b/core/src/main/java/info/openrocket/core/utils/L10nPropertyReport.java @@ -17,7 +17,7 @@ public class L10nPropertyReport { Properties english; - Map langs = new HashMap(); + Map langs = new HashMap<>(); System.out.println("Loading All Resource files"); @@ -51,7 +51,7 @@ public class L10nPropertyReport { for (String key : sortedKeys) { - List missing = new ArrayList(10); + List missing = new ArrayList<>(10); for (Map.Entry en : langs.entrySet()) { if (en.getValue().getProperty(key) != null) { @@ -80,7 +80,7 @@ public class L10nPropertyReport { } private static List getSortedKeys(Properties p) { - List sortedKeys = new ArrayList(p.keySet().size()); + List sortedKeys = new ArrayList<>(p.keySet().size()); for (Object obj : p.keySet()) { sortedKeys.add((String) obj); } diff --git a/core/src/main/java/info/openrocket/core/utils/TestFunctionOptimizerLoop.java b/core/src/main/java/info/openrocket/core/utils/TestFunctionOptimizerLoop.java index 1f6d13017..d7747c1c1 100644 --- a/core/src/main/java/info/openrocket/core/utils/TestFunctionOptimizerLoop.java +++ b/core/src/main/java/info/openrocket/core/utils/TestFunctionOptimizerLoop.java @@ -60,12 +60,12 @@ public class TestFunctionOptimizerLoop { System.err.println("PRECISION = " + PRECISION); ThreadPoolExecutor executor = new ThreadPoolExecutor(2, 2, 1, TimeUnit.SECONDS, - new ArrayBlockingQueue(100)); + new ArrayBlockingQueue<>(100)); for (int dim = 1; dim <= 10; dim++) { - List stepCount = new ArrayList(); - List functionCount = new ArrayList(); + List stepCount = new ArrayList<>(); + List functionCount = new ArrayList<>(); MultidirectionalSearchOptimizer optimizer = new MultidirectionalSearchOptimizer(); for (int count = 0; count < 200; count++) { diff --git a/core/src/test/java/info/openrocket/core/ServicesForTesting.java b/core/src/test/java/info/openrocket/core/ServicesForTesting.java index 7da7e3fa1..27b3232ab 100644 --- a/core/src/test/java/info/openrocket/core/ServicesForTesting.java +++ b/core/src/test/java/info/openrocket/core/ServicesForTesting.java @@ -30,7 +30,7 @@ public class ServicesForTesting extends AbstractModule { public static class TranslatorProviderForTesting implements Provider { - private final AtomicReference translator = new AtomicReference(); + private final AtomicReference translator = new AtomicReference<>(); @Override public Translator get() { 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 c6fd23f27..4288dd606 100644 --- a/core/src/test/java/info/openrocket/core/communication/HttpURLConnectionMock.java +++ b/core/src/test/java/info/openrocket/core/communication/HttpURLConnectionMock.java @@ -36,7 +36,7 @@ public class HttpURLConnectionMock extends HttpURLConnection { private volatile int responseCode; private volatile String requestMethod = ""; - private final Map requestProperties = new HashMap(); + private final Map requestProperties = new HashMap<>(); private volatile int connectTimeout = -1; private volatile String contentEncoding = ""; diff --git a/core/src/test/java/info/openrocket/core/file/openrocket/OpenRocketSaverTest.java b/core/src/test/java/info/openrocket/core/file/openrocket/OpenRocketSaverTest.java index ce4c27957..1a225a4ad 100644 --- a/core/src/test/java/info/openrocket/core/file/openrocket/OpenRocketSaverTest.java +++ b/core/src/test/java/info/openrocket/core/file/openrocket/OpenRocketSaverTest.java @@ -118,7 +118,7 @@ public class OpenRocketSaverTest { public void testCreateLoadSave() { // Create rockets - ArrayList rocketDocs = new ArrayList(); + ArrayList rocketDocs = new ArrayList<>(); rocketDocs.add(TestRockets.makeTestRocket_v100()); rocketDocs.add(TestRockets.makeTestRocket_v101_withFinTabs()); rocketDocs.add(TestRockets.makeTestRocket_v101_withTubeCouplerChild()); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java index 9bfc86c05..701c656f4 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java @@ -68,7 +68,7 @@ public class BodyTubeHandlerTest extends RockSimTestBase { AxialStage stage = new AxialStage(); BodyTubeHandler handler = new BodyTubeHandler(null, stage, new WarningSet()); BodyTube component = (BodyTube) getField(handler, "bodyTube"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "-1", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java index cbcf4826a..8d344531b 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java @@ -78,7 +78,7 @@ public class FinSetHandlerTest { FinSetHandler dto = new FinSetHandler(null, new BodyTube()); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); dto.closeElement("Name", attributes, "The name", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java index bab415a4b..e7ac0f85d 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java @@ -67,7 +67,7 @@ public class InnerBodyTubeHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); InnerBodyTubeHandler handler = new InnerBodyTubeHandler(null, tube, new WarningSet()); InnerTube component = (InnerTube) getField(handler, "bodyTube"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "-1", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java index f1ca8a85b..2afe4f9c0 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java @@ -66,7 +66,7 @@ public class LaunchLugHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); LaunchLugHandler handler = new LaunchLugHandler(null, tube, new WarningSet()); LaunchLug component = (LaunchLug) getField(handler, "lug"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "-1", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java index 2e36ebff0..d36cbcd2c 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java @@ -64,7 +64,7 @@ public class MassObjectHandlerTest extends RockSimTestBase { @org.junit.jupiter.api.Test public void testCloseElement() throws Exception { BodyTube tube = new BodyTube(); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); MassObjectHandler handler = new MassObjectHandler(null, tube, new WarningSet()); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java index 117c59608..467687ad6 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java @@ -69,7 +69,7 @@ public class NoseConeHandlerTest extends RockSimTestBase { public void testCloseElement() throws Exception { AxialStage stage = new AxialStage(); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); NoseConeHandler handler = new NoseConeHandler(null, stage, warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java index 939f26d41..7d17fabe7 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java @@ -44,7 +44,7 @@ public class ParachuteHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); ParachuteHandler handler = new ParachuteHandler(null, tube, new WarningSet()); Parachute component = (Parachute) getField(handler, "chute"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("Name", attributes, "Test Name", warnings); @@ -152,7 +152,7 @@ public class ParachuteHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); ParachuteHandler handler = new ParachuteHandler(null, tube, new WarningSet()); Parachute component = (Parachute) getField(handler, "chute"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("Xb", attributes, "-10", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java index 7b9be82cc..138ab832a 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java @@ -49,7 +49,7 @@ public class RingHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); RingHandler handler = new RingHandler(null, tube, new WarningSet()); CenteringRing component = (CenteringRing) getField(handler, "ring"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "0", warnings); @@ -97,7 +97,7 @@ public class RingHandlerTest extends RockSimTestBase { @SuppressWarnings("unused") CenteringRing component = (CenteringRing) getField(handler, "ring"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "75", warnings); @@ -132,7 +132,7 @@ public class RingHandlerTest extends RockSimTestBase { public void testTubeCoupler() throws Exception { BodyTube tube = new BodyTube(); RingHandler handler = new RingHandler(null, tube, new WarningSet()); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "75", warnings); @@ -166,7 +166,7 @@ public class RingHandlerTest extends RockSimTestBase { public void testEngineBlock() throws Exception { BodyTube tube = new BodyTube(); RingHandler handler = new RingHandler(null, tube, new WarningSet()); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "75", warnings); @@ -203,7 +203,7 @@ public class RingHandlerTest extends RockSimTestBase { public void testRing() throws Exception { BodyTube tube = new BodyTube(); RingHandler handler = new RingHandler(null, tube, new WarningSet()); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "75", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java index 1fbb45ef8..ae2345079 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java @@ -46,7 +46,7 @@ public class StreamerHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); StreamerHandler handler = new StreamerHandler(null, tube, new WarningSet()); Streamer component = (Streamer) getField(handler, "streamer"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("Width", attributes, "0", warnings); @@ -150,7 +150,7 @@ public class StreamerHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); StreamerHandler handler = new StreamerHandler(null, tube, new WarningSet()); Streamer component = (Streamer) getField(handler, "streamer"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("Xb", attributes, "-10", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java index ef6001cae..c9954b44d 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java @@ -63,7 +63,7 @@ public class TransitionHandlerTest extends RockSimTestBase { public void testCloseElement() throws Exception { AxialStage stage = new AxialStage(); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); TransitionHandler handler = new TransitionHandler(null, stage, new WarningSet()); 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 003ebf043..16eca4261 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 @@ -56,7 +56,7 @@ public class TestRocketOptimizationFunction extends BaseTestCase { final Point point = new Point(p1, p2); // Setup stubbing for methods that return values - when(domain.getDistanceToDomain(simulation)).thenReturn(new Pair(ddist, dref)); + when(domain.getDistanceToDomain(simulation)).thenReturn(new Pair<>(ddist, dref)); when(parameter.computeValue(simulation)).thenReturn(pvalue); when(parameter.getUnitGroup()).thenReturn(UnitGroup.UNITS_NONE); when(goal.getMinimizationParameter(pvalue)).thenReturn(gvalue); @@ -88,7 +88,7 @@ public class TestRocketOptimizationFunction extends BaseTestCase { verify(modifier1, times(1)).getUnitGroup(); verify(modifier2, times(1)).getCurrentSIValue(simulation); verify(modifier2, times(1)).getUnitGroup(); - verify(listener, times(1)).evaluated(eq(point), argThat(new ArgumentMatcher() { + verify(listener, times(1)).evaluated(eq(point), argThat(new ArgumentMatcher<>() { @Override public boolean matches(Value[] argument) { // Customize this as necessary to match the expected Value[] array @@ -175,7 +175,7 @@ public class TestRocketOptimizationFunction extends BaseTestCase { verify(modifier2).getUnitGroup(); // For verifying the call to listener.evaluated with complex arguments - verify(listener).evaluated(eq(point), argThat(new ArgumentMatcher() { + verify(listener).evaluated(eq(point), argThat(new ArgumentMatcher<>() { @Override public boolean matches(Value[] argument) { // Adjust the logic here based on how specific you need to be about the values diff --git a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java index fc07b6a04..3c8a951d2 100644 --- a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java +++ b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java @@ -26,7 +26,7 @@ public class TestGenericModifier extends BaseTestCase { Object related = new Object(); - gm = new GenericModifier("Test modifier", "Description", related, + gm = new GenericModifier<>("Test modifier", "Description", related, UnitGroup.UNITS_NONE, 2.0, TestValue.class, "value") { @Override protected TestValue getModifiedObject(Simulation simulation) { diff --git a/core/src/test/java/info/openrocket/core/plugin/PluginTester.java b/core/src/test/java/info/openrocket/core/plugin/PluginTester.java index 2703964fd..ec3eb6d37 100644 --- a/core/src/test/java/info/openrocket/core/plugin/PluginTester.java +++ b/core/src/test/java/info/openrocket/core/plugin/PluginTester.java @@ -30,7 +30,7 @@ public class PluginTester { private void assertContains(Set set, Class... classes) { assertEquals(classes.length, set.size()); - List> list = new ArrayList>(Arrays.asList(classes)); + List> list = new ArrayList<>(Arrays.asList(classes)); for (Object o : set) { Class c = o.getClass(); assertTrue(list.contains(c)); diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java index 3c53a167a..0b34f4e0f 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java @@ -61,7 +61,7 @@ public class ParameterSetTest extends BaseTestCase { public void localSetUp() { gid = 0; TestParameter defaultParam = new TestParameter(); - testSet = new FlightConfigurableParameterSet(defaultParam); + testSet = new FlightConfigurableParameterSet<>(defaultParam); } // ================ Actual Tests ================ @@ -162,7 +162,7 @@ public class ParameterSetTest extends BaseTestCase { assertEquals(testSet.size(), 4, "set should contain two overrides: "); - ArrayList refList = new ArrayList(); + ArrayList refList = new ArrayList<>(); refList.add(fcid1); refList.add(fcid2); refList.add(fcid3); @@ -250,7 +250,7 @@ public class ParameterSetTest extends BaseTestCase { FlightConfigurationId fcid4 = new FlightConfigurationId(); testSet.set(fcid4, tp4); - List refList = new ArrayList(); + List refList = new ArrayList<>(); refList.add(fcid1); refList.add(fcid2); refList.add(fcid3); diff --git a/core/src/test/java/info/openrocket/core/util/MathUtilTest.java b/core/src/test/java/info/openrocket/core/util/MathUtilTest.java index 772b4415f..f96fc0ada 100644 --- a/core/src/test/java/info/openrocket/core/util/MathUtilTest.java +++ b/core/src/test/java/info/openrocket/core/util/MathUtilTest.java @@ -183,8 +183,8 @@ public class MathUtilTest { @Test public void testAverageStddev() { - List ints = new ArrayList(); - List doubles = new ArrayList(); + List ints = new ArrayList<>(); + List doubles = new ArrayList<>(); ints.add(3); ints.add(4); @@ -206,8 +206,8 @@ public class MathUtilTest { @Test public void testMedian() { - List ints = new ArrayList(); - List doubles = new ArrayList(); + List ints = new ArrayList<>(); + List doubles = new ArrayList<>(); ints.add(3); ints.add(4); @@ -237,8 +237,8 @@ public class MathUtilTest { List x; List y; - x = new ArrayList(); - y = new ArrayList(); + x = new ArrayList<>(); + y = new ArrayList<>(); y.add(1.0); v = MathUtil.interpolate(null, y, 0.0); @@ -247,9 +247,9 @@ public class MathUtilTest { v = MathUtil.interpolate(x, y, 0.0); assertEquals(Double.NaN, v, EPS, "Failed to test for empty domain"); - x = new ArrayList(); + x = new ArrayList<>(); x.add(1.0); - y = new ArrayList(); + y = new ArrayList<>(); v = MathUtil.interpolate(x, null, 0.0); assertEquals(Double.NaN, v, EPS, "Failed to test for range null"); @@ -257,10 +257,10 @@ public class MathUtilTest { v = MathUtil.interpolate(x, y, 0.0); assertEquals(Double.NaN, v, EPS, "Failed to test for empty range"); - x = new ArrayList(); + x = new ArrayList<>(); x.add(1.0); x.add(2.0); - y = new ArrayList(); + y = new ArrayList<>(); y.add(15.0); y.add(17.0); @@ -277,12 +277,12 @@ public class MathUtilTest { v = MathUtil.interpolate(x, y, 1.5); assertEquals(16.0, v, EPS, "Failed to calculate center"); - x = new ArrayList(); + x = new ArrayList<>(); x.add(0.25); x.add(0.5); x.add(1.0); x.add(2.0); - y = new ArrayList(); + y = new ArrayList<>(); y.add(0.0); y.add(0.0); y.add(15.0); diff --git a/core/src/test/java/info/openrocket/core/util/TestConfig.java b/core/src/test/java/info/openrocket/core/util/TestConfig.java index b85c6a61d..aa7c149b4 100644 --- a/core/src/test/java/info/openrocket/core/util/TestConfig.java +++ b/core/src/test/java/info/openrocket/core/util/TestConfig.java @@ -58,7 +58,7 @@ public class TestConfig { @Test public void testStoringList() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("Foo"); list.add(123); list.add(Math.PI); @@ -69,7 +69,7 @@ public class TestConfig { @Test public void testModifyingStoredList() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("Foo"); list.add(123); list.add(Math.PI); @@ -96,7 +96,7 @@ public class TestConfig { AtomicInteger ai = new AtomicInteger(100); config.put("atomicinteger", ai); - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("Foo"); config.put("list", list); @@ -139,7 +139,7 @@ public class TestConfig { @Test public void testStoringListWithInvalidTypes() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("Foo"); list.add(new Date()); try { @@ -151,7 +151,7 @@ public class TestConfig { @Test public void testStoringListWithNull() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("Foo"); list.add(new Date()); try { diff --git a/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java b/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java index 481b2eff2..c567fd2db 100644 --- a/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java +++ b/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java @@ -92,7 +92,7 @@ public final class MotorLoaderHelper { * @return a list of all motors loaded. */ public static List load(FileIterator iterator) { - List list = new ArrayList(); + List list = new ArrayList<>(); while (iterator.hasNext()) { final Pair input = iterator.next(); 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 7d347c373..41b1ef27d 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 @@ -59,8 +59,8 @@ public class BooleanModel extends AbstractAction implements StateChangeListener, private boolean value; - private final List components = new ArrayList(); - private final List componentEnableState = new ArrayList(); + private final List components = new ArrayList<>(); + private final List componentEnableState = new ArrayList<>(); private String toString = null; 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 eb373188c..54495a291 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 @@ -542,7 +542,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat // Implement a wrapper to the ChangeListeners ArrayList propertyChangeListeners = - new ArrayList(); + new ArrayList<>(); @Override public void addPropertyChangeListener(PropertyChangeListener listener) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java b/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java index 444866ff3..4a8f9fcee 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java @@ -24,7 +24,7 @@ public class EnumModel> extends AbstractListModel private final T[] values; private T currentValue = null; - ArrayList displayedValues = new ArrayList(); + ArrayList displayedValues = new ArrayList<>(); private final Reflection.Method getMethod; private final Reflection.Method setMethod; diff --git a/swing/src/main/java/info/openrocket/swing/gui/adaptors/ParameterSetModel.java b/swing/src/main/java/info/openrocket/swing/gui/adaptors/ParameterSetModel.java index b34c9ef5e..f25a0790c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/adaptors/ParameterSetModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/adaptors/ParameterSetModel.java @@ -29,7 +29,7 @@ public class ParameterSetModel> impleme private Object selected; private final FlightConfigurableParameterSet sourceSet; - List idList= new Vector(); + List idList= new Vector<>(); public ParameterSetModel(FlightConfigurableParameterSet set ) { this.sourceSet = set; diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java index 4efad83b0..ab05d3120 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java @@ -65,7 +65,7 @@ public class CsvOptionPanel extends JPanel { label.setToolTipText(tip); panel.add(label, "gapright unrel"); - fieldSeparator = new JComboBox(new String[] { ",", ";", SPACE, TAB }); + fieldSeparator = new JComboBox<>(new String[]{",", ";", SPACE, TAB}); fieldSeparator.setEditable(true); fieldSeparator.setSelectedItem(Application.getPreferences().getString(Preferences.EXPORT_FIELD_SEPARATOR, ",")); fieldSeparator.setToolTipText(tip); @@ -115,7 +115,7 @@ public class CsvOptionPanel extends JPanel { label.setToolTipText(tip); panel.add(label, "split 2, gapright unrel"); - commentCharacter = new JComboBox(new String[] { "#", "%", ";" }); + commentCharacter = new JComboBox<>(new String[]{"#", "%", ";"}); commentCharacter.setEditable(true); commentCharacter.setSelectedItem(Application.getPreferences().getString(Preferences.EXPORT_COMMENT_CHARACTER, "#")); commentCharacter.setToolTipText(tip); diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/StageSelector.java b/swing/src/main/java/info/openrocket/swing/gui/components/StageSelector.java index 148f06a1a..89fce75d4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/StageSelector.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/StageSelector.java @@ -29,7 +29,7 @@ public class StageSelector extends JPanel implements StateChangeListener { private static final Translator trans = Application.getTranslator(); private final Rocket rocket; - private List buttons = new ArrayList(); + private List buttons = new ArrayList<>(); public StageSelector(Rocket _rkt) { super(new MigLayout("gap rel!, insets 0")); diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/URLLabel.java b/swing/src/main/java/info/openrocket/swing/gui/components/URLLabel.java index ade6b0cc4..b3aab0a33 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/URLLabel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/URLLabel.java @@ -53,7 +53,7 @@ public class URLLabel extends SelectableLabel { if (Desktop.isDesktopSupported()) { // Blue, underlined font - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON); this.setFont(this.getFont().deriveFont(map)); this.setForeground(URLColor); diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/UnitCellEditor.java b/swing/src/main/java/info/openrocket/swing/gui/components/UnitCellEditor.java index be9cd9051..64ec3c1c3 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/UnitCellEditor.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/UnitCellEditor.java @@ -27,7 +27,7 @@ public abstract class UnitCellEditor extends AbstractCellEditor private final JComboBox editor; public UnitCellEditor() { - editor = new JComboBox(); + editor = new JComboBox<>(); editor.setEditable(false); editor.addActionListener(this); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/UnitSelector.java b/swing/src/main/java/info/openrocket/swing/gui/components/UnitSelector.java index 76b60d8d9..b375c6af9 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/UnitSelector.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/UnitSelector.java @@ -49,7 +49,7 @@ public class UnitSelector extends StyledLabel implements StateChangeListener, Mo private static Border withinBorder; - private final List itemListeners = new ArrayList(); + private final List itemListeners = new ArrayList<>(); static { diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java index 849f22a57..9f6b12736 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java @@ -357,7 +357,7 @@ public class AppearancePanel extends JPanel implements Invalidatable, Invalidati System.arraycopy(LineStyle.values(), 0, list, 1, LineStyle.values().length); - final JComboBox combo = new JComboBox(new EnumModel(c, + final JComboBox combo = new JComboBox<>(new EnumModel<>(c, "LineStyle", // // Default style list, trans.get("LineStyle.Defaultstyle"))); @@ -514,7 +514,7 @@ public class AppearancePanel extends JPanel implements Invalidatable, Invalidati register(mDefault); DecalModel decalModel = new DecalModel(panel, document, builder); - JComboBox textureDropDown = new JComboBox(decalModel); + JComboBox textureDropDown = new JComboBox<>(decalModel); textureDropDown.setMaximumRowCount(20); // We need to add this action listener that triggers a decalModel update when the same item is selected, because diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java index 67a3e15f9..412f9fb16 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java @@ -394,7 +394,7 @@ public abstract class FinSetConfig extends RocketComponentConfig { */ private static double computeFinTabLength(List rings, Double finPositionFromTop, Double finLength, DoubleModel mts, final RocketComponent relativeTo) { - List positionsFromTop = new ArrayList(); + List positionsFromTop = new ArrayList<>(); //Fin tabs will be computed between the last two rings that meet the criteria, represented by top and bottom here. SortableRing top = null; @@ -402,12 +402,12 @@ public abstract class FinSetConfig extends RocketComponentConfig { if (rings != null) { //Sort rings from top of parent to bottom - Collections.sort(rings, new Comparator() { + Collections.sort(rings, new Comparator<>() { @Override public int compare(CenteringRing centeringRing, CenteringRing centeringRing1) { return (int) (1000d * (centeringRing.getAxialOffset(AxialMethod.TOP) - centeringRing1.getAxialOffset(AxialMethod.TOP))); - } + } }); for (int i = 0; i < rings.size(); i++) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/MotorConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/MotorConfig.java index b5fbff663..4ad5471c5 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/MotorConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/MotorConfig.java @@ -79,9 +79,9 @@ public class MotorConfig extends JPanel implements Invalidatable, InvalidatingWi MotorConfiguration motorInstance = mount.getDefaultMotorConfig(); - final EnumModel igEvModel = new EnumModel(motorInstance, "IgnitionEvent", IgnitionEvent.values()); + final EnumModel igEvModel = new EnumModel<>(motorInstance, "IgnitionEvent", IgnitionEvent.values()); register(igEvModel); - final JComboBox eventBox = new JComboBox( igEvModel); + final JComboBox eventBox = new JComboBox<>(igEvModel); panel.add(eventBox , "wrap"); order.add(eventBox); diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/RecoveryDeviceConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/RecoveryDeviceConfig.java index bc0ac8343..dd1888c61 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/RecoveryDeviceConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/RecoveryDeviceConfig.java @@ -16,7 +16,7 @@ public abstract class RecoveryDeviceConfig extends RocketComponentConfig { private static final long serialVersionUID = 7263235700953855062L; - protected final List altitudeComponents = new ArrayList(); + protected final List altitudeComponents = new ArrayList<>(); public RecoveryDeviceConfig(OpenRocketDocument d, RocketComponent component, JDialog parent) { super(d, component, parent); diff --git a/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableTableModel.java b/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableTableModel.java index 671e4b002..eeafc808a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableTableModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableTableModel.java @@ -28,7 +28,7 @@ public class VariableTableModel extends AbstractTableModel { */ public VariableTableModel(OpenRocketDocument doc){ - types = new ArrayList( doc.getFlightDataTypes() ); + types = new ArrayList<>(doc.getFlightDataTypes()); //Collections.addAll(types, FlightDataType.ALL_TYPES); //for (CustomExpression expression : doc.getCustomExpressions()){ diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/BugReportDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/BugReportDialog.java index b2491d92a..3353889a9 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/BugReportDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/BugReportDialog.java @@ -234,7 +234,7 @@ public class BugReportDialog extends JDialog { sbTemp.append("System properties:\n"); // Sort the keys - SortedSet keys = new TreeSet(); + SortedSet keys = new TreeSet<>(); for (Object key : System.getProperties().keySet()) { keys.add((String) key); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java index 33938617e..7a8bf8195 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java @@ -100,8 +100,8 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe private final List stabData = new ArrayList<>(); - private final List dragData = new ArrayList(); - private final List rollData = new ArrayList(); + private final List dragData = new ArrayList<>(); + private final List rollData = new ArrayList<>(); public ComponentAnalysisDialog(final RocketPanel rocketPanel) { @@ -617,7 +617,7 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe warningList.setListData(new String[] {trans.get("componentanalysisdlg.noWarnings") }); } else { - warningList.setListData(new Vector(set)); + warningList.setListData(new Vector<>(set)); } longitudeStabilityTableModel.fireTableDataChanged(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/DebugLogDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/DebugLogDialog.java index b3916c0e2..426b2d3d5 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/DebugLogDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/DebugLogDialog.java @@ -70,7 +70,7 @@ public class DebugLogDialog extends JDialog { private static final String STACK_TRACE_MARK = "\uFF01"; private static final Translator trans = Application.getTranslator(); - private static final EnumMap backgroundColors = new EnumMap(LogLevel.class); + private static final EnumMap backgroundColors = new EnumMap<>(LogLevel.class); static { for (LogLevel l : LogLevel.values()) { // Just to ensure every level has a bg color @@ -87,15 +87,15 @@ public class DebugLogDialog extends JDialog { } /** Buffer containing the log lines displayed */ - private final List buffer = new ArrayList(); + private final List buffer = new ArrayList<>(); /** Queue of log lines to be added to the displayed buffer */ - private final Queue queue = new ConcurrentLinkedQueue(); + private final Queue queue = new ConcurrentLinkedQueue<>(); private final DelegatorLogger delegator; private final LogListener logListener; - private final EnumMap filterButtons = new EnumMap(LogLevel.class); + private final EnumMap filterButtons = new EnumMap<>(LogLevel.class); private final JCheckBox followBox; private final Timer timer; @@ -300,7 +300,7 @@ public class DebugLogDialog extends JDialog { } }); - sorter = new TableRowSorter(model); + sorter = new TableRowSorter<>(model); sorter.setComparator(0, NumericComparator.INSTANCE); sorter.setComparator(1, NumericComparator.INSTANCE); sorter.setComparator(4, new LocationComparator()); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java index 467b4ab9c..67b45cf5c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java @@ -78,13 +78,13 @@ public class PrintSettingsDialog extends JDialog { - final JComboBox sizeCombo = new JComboBox(new EnumModel(settings, "PaperSize")); + final JComboBox sizeCombo = new JComboBox<>(new EnumModel<>(settings, "PaperSize")); ////Paper size: panel.add(new JLabel(trans.get("lbl.Papersize"))); panel.add( sizeCombo, "growx, wrap para"); - final JComboBox orientCombo = new JComboBox(new EnumModel(settings, "PaperOrientation")); + final JComboBox orientCombo = new JComboBox<>(new EnumModel<>(settings, "PaperOrientation")); //// Paper orientation: panel.add(new JLabel(trans.get("lbl.Paperorientation"))); panel.add( orientCombo, "growx, wrap para*2"); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java index 16351fb82..f16b302a2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java @@ -207,7 +207,7 @@ public class ScaleDialog extends JDialog { Map, List> scaler) { List list = scaler.get(componentClass); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); scaler.put(componentClass, list); } list.add(new GeneralScaler(componentClass, methodName, autoMethodName)); @@ -274,7 +274,7 @@ public class ScaleDialog extends JDialog { private void init() { // Generate options for scaling - List options = new ArrayList(); + List options = new ArrayList<>(); if (!onlySelection) options.add(SCALE_ROCKET); @@ -377,7 +377,7 @@ public class ScaleDialog extends JDialog { label.setToolTipText(tip); panel.add(label, "span, split, gapright unrel"); - selectionOption = new JComboBox(options.toArray(new String[0])); + selectionOption = new JComboBox<>(options.toArray(new String[0])); selectionOption.setEditable(false); selectionOption.setToolTipText(tip); panel.add(selectionOption, "growx, wrap para*2"); 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 007966fbe..272629cbc 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 @@ -17,7 +17,7 @@ public abstract class WarningDialog { public static void showWarnings(Component parent, Object message, String title, WarningSet warnings) { Warning[] w = warnings.toArray(new Warning[0]); - final JList list = new JList(w); + final JList list = new JList<>(w); list.setCellRenderer(new BetterListCellRenderer()); JScrollPane pane = new JScrollPane(list); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java index 7dde5a3a6..00119ba69 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java @@ -83,8 +83,8 @@ public class IgnitionSelectionDialog extends JDialog { // Select ignition event panel.add(new JLabel(trans.get("MotorCfg.lbl.Ignitionat")), ""); - final EnumModel igEvModel = new EnumModel(curMotorInstance, "IgnitionEvent", IgnitionEvent.values()); - final JComboBox eventBox = new JComboBox( igEvModel); + final EnumModel igEvModel = new EnumModel<>(curMotorInstance, "IgnitionEvent", IgnitionEvent.values()); + final JComboBox eventBox = new JComboBox<>(igEvModel); panel.add(eventBox, "growx, wrap"); // ... and delay 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 2e35848d8..a70b2c726 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 @@ -17,7 +17,7 @@ import info.openrocket.core.util.ArrayList; class MotorMountTableModel extends AbstractTableModel implements ComponentChangeListener { private static final long serialVersionUID = 1956400848559941228L; - private final List potentialMounts = new ArrayList(); + private final List potentialMounts = new ArrayList<>(); private final Rocket rocket; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java index 6d357fad9..b4a371d89 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java @@ -78,7 +78,7 @@ public class SeparationSelectionDialog extends JDialog { overrideButton.setSelected(true); } - final JComboBox event = new JComboBox(new EnumModel(newConfiguration, "SeparationEvent")); + final JComboBox event = new JComboBox<>(new EnumModel<>(newConfiguration, "SeparationEvent")); event.setSelectedItem(newConfiguration.getSeparationEvent()); panel.add(event, "wrap rel"); 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 e1140d3c2..3dcab5f10 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 @@ -46,7 +46,7 @@ public abstract class MotorFilterPanel extends JPanel { private static final Translator trans = Application.getTranslator(); - private static final Hashtable diameterLabels = new Hashtable(); + private static final Hashtable diameterLabels = new Hashtable<>(); private static final double[] motorDiameters = new double[] { 0.0, 0.013, @@ -80,7 +80,7 @@ public abstract class MotorFilterPanel extends JPanel { diameterLabels.get( motorDiameters.length-1).setText("+"); } - final private static Hashtable impulseLabels = new Hashtable(); + final private static Hashtable impulseLabels = new Hashtable<>(); static { int i =0; for( ImpulseClass impulseClass : ImpulseClass.values() ) { @@ -152,13 +152,13 @@ public abstract class MotorFilterPanel extends JPanel { List manufacturers = new ArrayList<>(allManufacturers); - manufacturers.sort(new Comparator() { - @Override - public int compare(Manufacturer o1, Manufacturer o2) { - return o1.getSimpleName().compareTo(o2.getSimpleName()); - } + manufacturers.sort(new Comparator<>() { + @Override + public int compare(Manufacturer o1, Manufacturer o2) { + return o1.getSimpleName().compareTo(o2.getSimpleName()); + } - }); + }); manufacturerCheckList = new CheckList.Builder().build(); manufacturerCheckList.setData(manufacturers); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilter.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilter.java index e1673b503..d73554198 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilter.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilter.java @@ -28,7 +28,7 @@ public class MotorRowFilter extends RowFilter implements Ch // configuration data used in the filter process private final ThrustCurveMotorDatabaseModel model; - private List usedMotors = new ArrayList(); + private List usedMotors = new ArrayList<>(); private final AbstractChangeSource changeSourceDelegate = new AbstractChangeSource(); private final Object change = new Object(); @@ -50,7 +50,7 @@ public class MotorRowFilter extends RowFilter implements Ch private boolean hideUsedMotors = false; // List of manufacturers to exclude. - private List excludedManufacturers = new ArrayList(); + private List excludedManufacturers = new ArrayList<>(); // Impulse class filtering private ImpulseClass minimumImpulse; @@ -78,7 +78,7 @@ public class MotorRowFilter extends RowFilter implements Ch } public void setSearchTerms(final List searchTerms) { - this.searchTerms = new ArrayList(); + this.searchTerms = new ArrayList<>(); for (String s : searchTerms) { s = s.trim().toLowerCase(Locale.getDefault()); if (s.length() > 0) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index b9cb668de..438bec7ca 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -137,7 +137,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec //// MotorFilter { // Find all the manufacturers: - Set allManufacturers = new HashSet(); + Set allManufacturers = new HashSet<>(); for (ThrustCurveMotorSet s : database) { allManufacturers.add(s.getManufacturer()); } @@ -162,8 +162,8 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec curveSelectionLabel = new JLabel(trans.get("TCMotorSelPan.lbl.Selectthrustcurve")); panel.add(curveSelectionLabel); - curveSelectionModel = new DefaultComboBoxModel(); - curveSelectionBox = new JComboBox(curveSelectionModel); + curveSelectionModel = new DefaultComboBoxModel<>(); + curveSelectionBox = new JComboBox<>(curveSelectionModel); @SuppressWarnings("unchecked") ListCellRenderer lcr = (ListCellRenderer) curveSelectionBox.getRenderer(); curveSelectionBox.setRenderer(new CurveSelectionRenderer(lcr)); @@ -184,7 +184,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec ejectionChargeDelayLabel = new JLabel(trans.get("TCMotorSelPan.lbl.Ejectionchargedelay")); panel.add(ejectionChargeDelayLabel); - delayBox = new JComboBox(); + delayBox = new JComboBox<>(); delayBox.setEditable(true); delayBox.addActionListener(new ActionListener() { @Override @@ -295,7 +295,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec // Set comparators and widths table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - sorter = new TableRowSorter(model); + sorter = new TableRowSorter<>(model); for (int i = 0; i < ThrustCurveMotorColumns.values().length; i++) { ThrustCurveMotorColumns column = ThrustCurveMotorColumns.values()[i]; sorter.setComparator(i, column.getComparator()); @@ -439,7 +439,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec ThrustCurveMotorSet motorSetToSelect = null; motorSetToSelect = findMotorSet(motorToSelect); if (motorSetToSelect == null) { - database = new ArrayList(database); + database = new ArrayList<>(database); ThrustCurveMotorSet extra = new ThrustCurveMotorSet(); extra.addMotor(motorToSelect); database.add(extra); @@ -565,7 +565,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec List getFilteredCurves() { List motors = selectedMotorSet.getMotors(); if (hideSimilarBox.isSelected() && selectedMotor != null) { - List filtered = new ArrayList(motors.size()); + List filtered = new ArrayList<>(motors.size()); for (int i = 0; i < motors.size(); i++) { ThrustCurveMotor m = motors.get(i); if (m.equals(selectedMotor)) { @@ -711,7 +711,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec if (!containsPlugged) { delayStrings[delayStrings.length - 1] = trans.get("TCMotorSelPan.delayBox.Plugged"); } - delayBox.setModel(new DefaultComboBoxModel(delayStrings)); + delayBox.setModel(new DefaultComboBoxModel<>(delayStrings)); if (reset) { // Find and set the closest value diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java index 7dc9d7115..42f68f0aa 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java @@ -143,7 +143,7 @@ public class OptimizationPlotDialog extends JDialog { // Create the optimization path (with autosort) XYSeries series = new XYSeries(trans.get("plot1d.series"), true, true); - List tooltips = new ArrayList(); + List tooltips = new ArrayList<>(); for (Map.Entry entry : evaluations.entrySet()) { FunctionEvaluationData data = entry.getValue(); if (data != null) { @@ -242,7 +242,7 @@ public class OptimizationPlotDialog extends JDialog { // Create the optimization path dataset XYSeries pathSeries = new XYSeries(trans.get("plot2d.path"), false, true); - List pathTooltips = new ArrayList(); + List pathTooltips = new ArrayList<>(); for (Point p : path) { FunctionEvaluationData data = evaluations.get(p); if (data != null) { @@ -259,7 +259,7 @@ public class OptimizationPlotDialog extends JDialog { double min = Double.POSITIVE_INFINITY; double max = Double.NEGATIVE_INFINITY; double[][] evals = new double[3][evaluations.size()]; - List evalTooltips = new ArrayList(); + List evalTooltips = new ArrayList<>(); Iterator iterator = evaluations.values().iterator(); for (int i = 0; i < evaluations.size(); i++) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java index 4f4d0eea8..a638d4f9b 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java @@ -26,21 +26,21 @@ public class DesignPreferencesPanel extends PreferencesPanel { this.add(new JLabel(trans.get("pref.dlg.lbl.Positiontoinsert")), "gapright para"); this.add( - new JComboBox(new PrefChoiceSelector( + new JComboBox<>(new PrefChoiceSelector( Preferences.BODY_COMPONENT_INSERT_POSITION_KEY, // // Always ask // // Insert in middle // // Add to end trans.get("pref.dlg.PrefChoiseSelector1"), trans - .get("pref.dlg.PrefChoiseSelector2"), trans - .get("pref.dlg.PrefChoiseSelector3"))), + .get("pref.dlg.PrefChoiseSelector2"), trans + .get("pref.dlg.PrefChoiseSelector3"))), "wrap para, growx, sg combos"); // // Position to insert new stages: this.add(new JLabel(trans.get("pref.dlg.lbl.PositiontoinsertStages")), "gapright para"); this.add( - new JComboBox(new PrefChoiceSelector( + new JComboBox<>(new PrefChoiceSelector( Preferences.STAGE_INSERT_POSITION_KEY, // // Always ask // // Insert in middle @@ -55,14 +55,14 @@ public class DesignPreferencesPanel extends PreferencesPanel { "gapright para"); this.add( - new JComboBox(new PrefChoiceSelector( + new JComboBox<>(new PrefChoiceSelector( Preferences.ROCKET_INFO_FONT_SIZE, // // Small // // Medium // // Large trans.get("pref.dlg.PrefFontSmall"), trans - .get("pref.dlg.PrefFontMedium"), trans - .get("pref.dlg.PrefFontLarge"))), + .get("pref.dlg.PrefFontMedium"), trans + .get("pref.dlg.PrefFontLarge"))), "wrap para, growx, sg combos"); // // Default Mach number diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java index ca70f0ba3..4efff050c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java @@ -22,14 +22,14 @@ public class DisplayPreferencesPanel extends PreferencesPanel { "gapright para"); this.add( - new JComboBox(new PrefChoiceSelector( + new JComboBox<>(new PrefChoiceSelector( Preferences.ROCKET_INFO_FONT_SIZE, // // Small // // Medium // // Large trans.get("pref.dlg.PrefFontSmall"), trans - .get("pref.dlg.PrefFontMedium"), trans - .get("pref.dlg.PrefFontLarge"))), + .get("pref.dlg.PrefFontMedium"), trans + .get("pref.dlg.PrefFontLarge"))), "wrap para, growx, sg combos"); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java index 59123d8e9..a0d575085 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java @@ -73,14 +73,14 @@ public class GeneralPreferencesPanel extends PreferencesPanel { String locale = preferences.getString("locale", null); userLocale = L10N.toLocale(locale); } - List> locales = new ArrayList>(); + List> locales = new ArrayList<>(); for (Locale l : SwingPreferences.getSupportedLocales()) { - locales.add(new Named(l, l.getDisplayLanguage(l) + "/" + l.getDisplayLanguage())); + locales.add(new Named<>(l, l.getDisplayLanguage(l) + "/" + l.getDisplayLanguage())); } Collections.sort(locales); - locales.add(0, new Named(null, trans.get("generalprefs.languages.default"))); + locales.add(0, new Named<>(null, trans.get("generalprefs.languages.default"))); - final JComboBox languageCombo = new JComboBox(locales.toArray()); + final JComboBox languageCombo = new JComboBox<>(locales.toArray()); for (int i = 0; i < locales.size(); i++) { if (Utils.equals(userLocale, locales.get(i).get())) { languageCombo.setSelectedIndex(i); @@ -180,7 +180,7 @@ public class GeneralPreferencesPanel extends PreferencesPanel { private void changed() { String text = field.getText(); - List list = new ArrayList(); + List list = new ArrayList<>(); for (String s : text.split(";")) { s = s.trim(); if (s.length() > 0) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java index 7f27f171d..63205891d 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java @@ -23,7 +23,7 @@ import info.openrocket.core.unit.UnitGroup; public abstract class PreferencesPanel extends JPanel { protected static final Logger log = LoggerFactory.getLogger(PreferencesDialog.class); - protected final List unitSelectors = new ArrayList(); + protected final List unitSelectors = new ArrayList<>(); protected File defaultDirectory = null; protected static final Translator trans = Application.getTranslator(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/SimulationPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/SimulationPreferencesPanel.java index 01b350df4..817c6a157 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/SimulationPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/SimulationPreferencesPanel.java @@ -124,9 +124,9 @@ public class SimulationPreferencesPanel extends PreferencesPanel { label.setToolTipText(trans.get("simedtdlg.lbl.ttip.GeodeticMethodTip")); subsub.add(label, "gapright para"); - EnumModel gcsModel = new EnumModel( + EnumModel gcsModel = new EnumModel<>( preferences, "GeodeticComputation"); - final JComboBox gcsCombo = new JComboBox(gcsModel); + final JComboBox gcsCombo = new JComboBox<>(gcsModel); ActionListener gcsTTipListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/UnitsPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/UnitsPreferencesPanel.java index aa2e81a23..19524d3da 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/UnitsPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/UnitsPreferencesPanel.java @@ -35,47 +35,47 @@ public class UnitsPreferencesPanel extends PreferencesPanel { //// Rocket dimensions: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Rocketdimensions"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_LENGTH)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_LENGTH)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Motor dimensions: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Motordimensions"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_MOTOR_DIMENSIONS)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_MOTOR_DIMENSIONS)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Distance: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Distance"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_DISTANCE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_DISTANCE)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Velocity: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Velocity"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_VELOCITY)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_VELOCITY)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Acceleration: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Acceleration"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_ACCELERATION)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_ACCELERATION)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Mass: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Mass"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_MASS)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_MASS)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Force: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Force"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_FORCE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_FORCE)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Total impulse: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Totalimpulse"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_IMPULSE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_IMPULSE)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Moment of inertia: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Momentofinertia"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_INERTIA)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_INERTIA)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Stability: @@ -112,52 +112,52 @@ public class UnitsPreferencesPanel extends PreferencesPanel { //// Line density: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Linedensity"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_LINE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_LINE)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Surface density: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Surfacedensity"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_SURFACE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_SURFACE)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Bulk density:: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Bulkdensity"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_BULK)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_BULK)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Surface roughness: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Surfaceroughness"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_ROUGHNESS)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_ROUGHNESS)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Area: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Area"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_AREA)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_AREA)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Angle: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Angle"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_ANGLE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_ANGLE)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Roll rate: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Rollrate"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_ROLL)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_ROLL)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Temperature: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Temperature"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_TEMPERATURE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_TEMPERATURE)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Pressure: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Pressure"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_PRESSURE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_PRESSURE)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Windspeed: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Windspeed"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_WINDSPEED)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_WINDSPEED)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Latitude diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetChooserDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetChooserDialog.java index 21b53e442..71c87773b 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetChooserDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetChooserDialog.java @@ -376,7 +376,7 @@ public class ComponentPresetChooserDialog extends JDialog { } private void updateFilters() { - List> filters = new ArrayList>(2); + List> filters = new ArrayList<>(2); String filterTextRegex = filterText.getText(); if (filterTextRegex != null) { try { diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java index 98da92f63..6a6a639f1 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java @@ -105,7 +105,7 @@ public class ComponentPresetTable extends JTable { }; - this.sorter = new TableRowSorter(tableModel); + this.sorter = new TableRowSorter<>(tableModel); this.tableColumnModel = new XTableColumnModel(); /* diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/XTableColumnModel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/XTableColumnModel.java index 66f7a7b6f..ded91391e 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/XTableColumnModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/XTableColumnModel.java @@ -11,7 +11,7 @@ public class XTableColumnModel extends DefaultTableColumnModel { /** Array of TableColumn objects in this model. * Holds all column objects, regardless of their visibility */ - protected Vector allTableColumns = new Vector(); + protected Vector allTableColumns = new Vector<>(); /** * Creates an extended table column model. diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java index 495c1b6a5..4c0c3d8ad 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java @@ -70,7 +70,7 @@ public class FigureRenderer extends RocketRenderer { return false; } - private static final HashMap, ORColor> defaultColorCache = new HashMap, ORColor>(); + private static final HashMap, ORColor> defaultColorCache = new HashMap<>(); @Override public void renderComponent(GL2 gl, Geometry geom, float alpha) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java index 841863cd1..3339919c4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java @@ -89,8 +89,8 @@ public class RocketFigure3d extends JPanel implements GLEventListener { private volatile boolean redrawExtras = true; private boolean drawCarets = true; - private final ArrayList relativeExtra = new ArrayList(); - private final ArrayList absoluteExtra = new ArrayList(); + private final ArrayList relativeExtra = new ArrayList<>(); + private final ArrayList absoluteExtra = new ArrayList<>(); private double roll = 0; private double yaw = 0; @@ -596,7 +596,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { internalRepaint(); } - private Set selection = new HashSet(); + private Set selection = new HashSet<>(); public void setSelection(final RocketComponent[] selection) { this.selection.clear(); 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 da117607e..77b0a71cd 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 @@ -174,7 +174,7 @@ public abstract class RocketRenderer { final InstanceMap imap = config.getActiveInstances(); // output buffer - final Collection treeGeometry = new ArrayList(); + final Collection treeGeometry = new ArrayList<>(); for(Map.Entry> entry: imap.entrySet() ) { final RocketComponent comp = entry.getKey(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/TextureCache.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/TextureCache.java index 20473e41e..6af89f1ff 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/TextureCache.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/TextureCache.java @@ -27,8 +27,8 @@ public class TextureCache { public void init(GLAutoDrawable drawable) { if (texCache != null) throw new IllegalStateException(this + " already initialized."); - oldTexCache = new HashMap(); - texCache = new HashMap(); + oldTexCache = new HashMap<>(); + texCache = new HashMap<>(); } public void dispose(GLAutoDrawable drawable) { @@ -55,7 +55,7 @@ public class TextureCache { e.getValue().destroy(drawable.getGL().getGL2()); } oldTexCache = texCache; - texCache = new HashMap(); + texCache = new HashMap<>(); } public Texture getTexture(URL uri) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/DisplayListComponentRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/DisplayListComponentRenderer.java index 028dcc442..31bee3d55 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/DisplayListComponentRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/DisplayListComponentRenderer.java @@ -10,7 +10,7 @@ import info.openrocket.swing.gui.figure3d.geometry.Geometry.Surface; import info.openrocket.core.rocketcomponent.RocketComponent; public class DisplayListComponentRenderer extends ComponentRenderer { - private Map lists = new HashMap(); + private Map lists = new HashMap<>(); @Override public void updateFigure(GLAutoDrawable drawable) { 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 55853e2b6..44e440cac 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 @@ -77,7 +77,7 @@ public class PhotoPanel extends JPanel implements GLEventListener { private double ratio; private boolean needUpdate = false; - private List imageCallbacks = new java.util.Vector(); + private List imageCallbacks = new java.util.Vector<>(); private RocketRenderer rr; private PhotoSettings p; @@ -295,7 +295,7 @@ public class PhotoPanel extends JPanel implements GLEventListener { .readPixelsToBufferedImage(drawable.getGL(), 0, 0, drawable.getSurfaceWidth(), drawable.getSurfaceHeight(), true); } - final Vector cbs = new Vector( + final Vector cbs = new Vector<>( imageCallbacks); imageCallbacks.clear(); for (ImageCallback ia : cbs) { @@ -531,7 +531,7 @@ public class PhotoPanel extends JPanel implements GLEventListener { new float[] { 0, 0, 0, 1 }, 0); } - rr.render(drawable, configuration, new HashSet()); + rr.render(drawable, configuration, new HashSet<>()); //Figure out the lowest stage shown diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettingsConfig.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettingsConfig.java index f49a2a34c..4e55d29b9 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettingsConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettingsConfig.java @@ -293,8 +293,8 @@ public class PhotoSettingsConfig extends JTabbedPane { return trans.get("DecalModel.lbl.select"); } }; - add(new JComboBox(new DefaultComboBoxModel(new Sky[] { noSky, Mountains.instance, Meadow.instance, - Storm.instance, Lake.instance, Orbit.instance, Miramar.instance }) { + add(new JComboBox<>(new DefaultComboBoxModel<>(new Sky[]{noSky, Mountains.instance, Meadow.instance, + Storm.instance, Lake.instance, Orbit.instance, Miramar.instance}) { }) { { addActionListener(new ActionListener() { @@ -320,8 +320,7 @@ public class PhotoSettingsConfig extends JTabbedPane { if (p.getSky() != null) { setSelectedItem(p.getSky()); - } - else { + } else { setSelectedItem(noSky); } } 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 09d419b01..85642ccdd 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 @@ -61,7 +61,7 @@ public class GuidedTourSelectionDialog extends JDialog { panel.add(new StyledLabel(trans.get("lbl.selectTour"), Style.BOLD), "spanx, wrap rel"); - tourList = new JList>(new TourListModel()); + tourList = new JList<>(new TourListModel()); tourList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tourList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { @Override @@ -175,7 +175,7 @@ public class GuidedTourSelectionDialog extends JDialog { public Named getElementAt(int index) { String name = tourNames.get(index); SlideSet set = slideSetManager.getSlideSet(name); - return new Named(set, set.getTitle()); + return new Named<>(set, set.getTitle()); } @Override diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/Slide.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/Slide.java index 17e50dba2..fbd4b1181 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/Slide.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/Slide.java @@ -48,7 +48,7 @@ public class Slide { // Otherwise load and cache BufferedImage image = loadImage(); - imageReference = new SoftReference(image); + imageReference = new SoftReference<>(image); return image; } diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSet.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSet.java index 7433d4541..1c9966a99 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSet.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSet.java @@ -17,7 +17,7 @@ public class SlideSet { private String title = ""; private String description = ""; - private final List slides = new ArrayList(); + private final List slides = new ArrayList<>(); private StyleSheet styleSheet = new StyleSheet(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java index 8373f5f7c..a04acfa7f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java @@ -98,7 +98,7 @@ public class SlideSetLoader { } - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(base + "_" + locale.getLanguage() + "_" + locale.getCountry() + "_" + locale.getVariant() + ext); list.add(base + "_" + locale.getLanguage() + "_" + locale.getCountry() + ext); list.add(base + "_" + locale.getLanguage() + ext); diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java index 4d4897d86..8ba481250 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java @@ -33,7 +33,7 @@ public class SlideSetManager { private final String baseDir; - private final Map slideSets = new LinkedHashMap(); + private final Map slideSets = new LinkedHashMap<>(); private static Color textColor; @@ -99,7 +99,7 @@ public class SlideSetManager { * Return a set containing all the slide set names. */ public List getSlideSetNames() { - return new ArrayList(slideSets.keySet()); + return new ArrayList<>(slideSets.keySet()); } /** @@ -126,7 +126,7 @@ public class SlideSetManager { try { - List tours = new ArrayList(); + List tours = new ArrayList<>(); TextLineReader reader = new TextLineReader(in); while (reader.hasNext()) { tours.add(reader.next()); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java b/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java index fa6306cae..0f293ddd2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java @@ -142,7 +142,7 @@ public class BasicFrame extends JFrame { * List of currently open frames. When the list goes empty * it is time to exit the application. */ - private static final List frames = new ArrayList(); + private static final List frames = new ArrayList<>(); private static BasicFrame startupFrame = null; // the frame that was created at startup @@ -1043,7 +1043,7 @@ public class BasicFrame extends JFrame { @Override public void actionPerformed(ActionEvent e) { log.info(Markers.USER_MARKER, "Exhaust memory selected"); - LinkedList data = new LinkedList(); + LinkedList data = new LinkedList<>(); int count = 0; final int bytesPerArray = 10240; try { 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 cffa27488..5d159dfe7 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 @@ -389,7 +389,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable { * @return The position to add the new component to, or null if should not add. */ public Pair getAdditionPosition(RocketComponent c) { - return new Pair(c, null); + return new Pair<>(c, null); } /** @@ -537,7 +537,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable { if (c == null || c instanceof Rocket) { // Add as last body component of the last stage Rocket rocket = document.getRocket(); - return new Pair(rocket.getChild(rocket.getStageCount() - 1), + return new Pair<>(rocket.getChild(rocket.getStageCount() - 1), null); } @@ -565,10 +565,10 @@ public class ComponentAddButtons extends JPanel implements Scrollable { return null; case 1: // Insert after current position - return new Pair(parent, parent.getChildPosition(c) + 1); + return new Pair<>(parent, parent.getChildPosition(c) + 1); case 2: // Insert at the end of the parent - return new Pair(parent, null); + return new Pair<>(parent, null); default: Application.getExceptionHandler().handleErrorCondition("ERROR: Bad position type: " + pos); return null; @@ -660,7 +660,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable { public Pair getAdditionPosition(RocketComponent c) { if (c == null || c instanceof Rocket) { // Add to the end - return new Pair(document.getRocket(), null); + return new Pair<>(document.getRocket(), null); } RocketComponent parentStage = null; @@ -689,10 +689,10 @@ public class ComponentAddButtons extends JPanel implements Scrollable { return null; case 1: // Insert after current stage - return new Pair(document.getRocket(), document.getRocket().getChildPosition(parentStage) + 1); + return new Pair<>(document.getRocket(), document.getRocket().getChildPosition(parentStage) + 1); case 2: // Insert at the end - return new Pair(document.getRocket(), null); + return new Pair<>(document.getRocket(), null); default: Application.getExceptionHandler().handleErrorCondition("ERROR: Bad position type: " + pos); return null; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/ComponentIcons.java b/swing/src/main/java/info/openrocket/swing/gui/main/ComponentIcons.java index 140c46b64..2fb52cfdd 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/ComponentIcons.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/ComponentIcons.java @@ -75,10 +75,10 @@ public class ComponentIcons { private static String mass_recovery_hardware; private static String mass_tracker; - private static final HashMap, ImageIcon> SMALL_ICONS = new HashMap, ImageIcon>(); - private static final HashMap, ImageIcon> LARGE_ICONS = new HashMap, ImageIcon>(); - private static final HashMap, ImageIcon> DISABLED_ICONS = new HashMap, ImageIcon>(); - private static final HashMap MASS_COMPONENT_SMALL_ICONS = new HashMap(); + private static final HashMap, ImageIcon> SMALL_ICONS = new HashMap<>(); + private static final HashMap, ImageIcon> LARGE_ICONS = new HashMap<>(); + private static final HashMap, ImageIcon> DISABLED_ICONS = new HashMap<>(); + private static final HashMap MASS_COMPONENT_SMALL_ICONS = new HashMap<>(); static { initColors(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/DocumentSelectionModel.java b/swing/src/main/java/info/openrocket/swing/gui/main/DocumentSelectionModel.java index 519315f8d..d3a67f414 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/DocumentSelectionModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/DocumentSelectionModel.java @@ -38,7 +38,7 @@ public class DocumentSelectionModel { private ListSelectionModel simulationListSelectionModel = null; private final List listeners = - new ArrayList(); + new ArrayList<>(); @@ -219,7 +219,7 @@ public class DocumentSelectionModel { return; } - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (int i = min; i <= max; i++) { if (simulationListSelectionModel.isSelectedIndex(i) && (i < document.getSimulationCount())) { 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 ca43c410c..55f63af5c 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 @@ -133,7 +133,7 @@ public class ExampleDesignFile implements Comparable { private static ExampleDesignFile[] getJarFileNames() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); int dirLength = DIRECTORY.length(); // Find and open the jar file this class is contained in diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/ExportDecalDialog.java b/swing/src/main/java/info/openrocket/swing/gui/main/ExportDecalDialog.java index c0f7c597b..5ff1d4bb0 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/ExportDecalDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/ExportDecalDialog.java @@ -51,7 +51,7 @@ public class ExportDecalDialog extends JDialog { Collection exportableDecals = document.getDecalList(); - decalComboBox = new JComboBox(exportableDecals.toArray(new DecalImage[0])); + decalComboBox = new JComboBox<>(exportableDecals.toArray(new DecalImage[0])); decalComboBox.setEditable(false); panel.add(decalComboBox, "growx, wrap"); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java b/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java index 7fb7af1b2..f3ce3226f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java @@ -42,7 +42,7 @@ public class MRUDesignFile { * Constructor. */ protected MRUDesignFile() { - mruFileList = new ArrayList(MAX_SIZE); + mruFileList = new ArrayList<>(MAX_SIZE); listenerList = new EventListenerList(); retrieve(); } 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 266e357cb..f4ab7d0da 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 @@ -12,7 +12,7 @@ public final class OpenRocketClipboard { private static final List clipboardComponents = new LinkedList<>(); private static Simulation[] clipboardSimulations = null; - private static final List listeners = new ArrayList(); + private static final List listeners = new ArrayList<>(); private OpenRocketClipboard() { // Disallow instantiation diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java b/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java index 1dc31d893..14a9a815b 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java @@ -26,7 +26,7 @@ import info.openrocket.core.util.BugException; */ public class ComponentTreeModel implements TreeModel, ComponentChangeListener { - ArrayList listeners = new ArrayList(); + ArrayList listeners = new ArrayList<>(); private final RocketComponent root; private final JTree tree; @@ -103,7 +103,7 @@ public class ComponentTreeModel implements TreeModel, ComponentChangeListener { // Get currently expanded path IDs Enumeration enumer = tree.getExpandedDescendants(new TreePath(path)); - ArrayList expanded = new ArrayList(); + ArrayList expanded = new ArrayList<>(); if (enumer != null) { while (enumer.hasMoreElements()) { TreePath p = enumer.nextElement(); @@ -210,7 +210,7 @@ public class ComponentTreeModel implements TreeModel, ComponentChangeListener { RocketComponent c = component; - List list = new LinkedList(); + List list = new LinkedList<>(); while (c != null) { list.add(0, c); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/FlightConfigurableTableModel.java b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/FlightConfigurableTableModel.java index 8e9f153ee..e73ba6b1d 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/FlightConfigurableTableModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/FlightConfigurableTableModel.java @@ -23,7 +23,7 @@ public class FlightConfigurableTableModel protected final Rocket rocket; protected final Class clazz; - private final List components = new ArrayList(); + private final List components = new ArrayList<>(); public FlightConfigurableTableModel(Class clazz, Rocket rocket) { super(); @@ -83,7 +83,7 @@ public class FlightConfigurableTableModel default: { int index = column - 1; T d = components.get(index); - return new Pair(fcid, d); + return new Pair<>(fcid, d); } } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/MotorConfigurationPanel.java b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/MotorConfigurationPanel.java index 8b156b7dd..b124b3d92 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/MotorConfigurationPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/MotorConfigurationPanel.java @@ -162,7 +162,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel @Override protected JTable initializeTable() { //// Motor selection table. - configurationTableModel = new FlightConfigurableTableModel(MotorMount.class,rocket) { + configurationTableModel = new FlightConfigurableTableModel<>(MotorMount.class, rocket) { @Override protected boolean includeComponent(MotorMount component) { return component.isMotorMount(); 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 5a185a8d8..9e758df31 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 @@ -95,7 +95,7 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel(RecoveryDevice.class, rocket); + recoveryTableModel = new FlightConfigurableTableModel<>(RecoveryDevice.class, rocket); JTable recoveryTable = new JTable(recoveryTableModel); recoveryTable.getTableHeader().setReorderingAllowed(false); recoveryTable.setCellSelectionEnabled(true); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/SeparationConfigurationPanel.java b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/SeparationConfigurationPanel.java index 5aa12de78..d77459b1c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/SeparationConfigurationPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/SeparationConfigurationPanel.java @@ -94,7 +94,7 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel(AxialStage.class, rocket) { + separationTableModel = new FlightConfigurableTableModel<>(AxialStage.class, rocket) { private static final long serialVersionUID = 7979648984099308970L; @Override diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/EventGraphics.java b/swing/src/main/java/info/openrocket/swing/gui/plot/EventGraphics.java index 992a7affa..06911c9f1 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/EventGraphics.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/EventGraphics.java @@ -26,7 +26,7 @@ public class EventGraphics { } private static final Color DEFAULT_EVENT_COLOR = new Color(0, 0, 0); - private static final Map EVENT_COLORS = new HashMap(); + private static final Map EVENT_COLORS = new HashMap<>(); static { EVENT_COLORS.put(FlightEvent.Type.LAUNCH, new Color(255, 0, 0)); EVENT_COLORS.put(FlightEvent.Type.LIFTOFF, new Color(0, 80, 196)); @@ -44,7 +44,7 @@ public class EventGraphics { EVENT_COLORS.put(FlightEvent.Type.SIM_ABORT, new Color(255, 0, 0)); } - private static final Map EVENT_IMAGES = new HashMap(); + private static final Map EVENT_IMAGES = new HashMap<>(); static { loadImage(FlightEvent.Type.LAUNCH, "pix/eventicons/event-launch.png"); loadImage(FlightEvent.Type.LIFTOFF, "pix/eventicons/event-liftoff.png"); diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/PlotConfiguration.java b/swing/src/main/java/info/openrocket/swing/gui/plot/PlotConfiguration.java index bad934107..1c3a08fa4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/PlotConfiguration.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/PlotConfiguration.java @@ -23,7 +23,7 @@ public class PlotConfiguration implements Cloneable { public static final PlotConfiguration[] DEFAULT_CONFIGURATIONS; static { - ArrayList configs = new ArrayList(); + ArrayList configs = new ArrayList<>(); PlotConfiguration config; //// Vertical motion vs. time @@ -187,12 +187,12 @@ public class PlotConfiguration implements Cloneable { /** The data types to be plotted. */ - private ArrayList plotDataTypes = new ArrayList(); + private ArrayList plotDataTypes = new ArrayList<>(); - private ArrayList plotDataUnits = new ArrayList(); + private ArrayList plotDataUnits = new ArrayList<>(); /** The corresponding Axis on which they will be plotted, or null to auto-select. */ - private ArrayList plotDataAxes = new ArrayList(); + private ArrayList plotDataAxes = new ArrayList<>(); private EnumSet events = EnumSet.noneOf(FlightEvent.Type.class); @@ -203,7 +203,7 @@ public class PlotConfiguration implements Cloneable { /** All available axes. */ private final int axesCount; - private ArrayList allAxes = new ArrayList(); + private ArrayList allAxes = new ArrayList<>(); private String name = null; @@ -355,7 +355,7 @@ public class PlotConfiguration implements Cloneable { public List getAllAxes() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.addAll(allAxes); return list; } @@ -416,7 +416,7 @@ public class PlotConfiguration implements Cloneable { if (autoindex >= plotDataAxes.size()) { // All axes have been assigned, just return since we are already the best - return new Pair(copy, copy.getGoodnessValue(data)); + return new Pair<>(copy, copy.getGoodnessValue(data)); } @@ -432,7 +432,7 @@ public class PlotConfiguration implements Cloneable { } } - return new Pair(best, bestValue); + return new Pair<>(best, bestValue); } @@ -717,7 +717,7 @@ public class PlotConfiguration implements Cloneable { copy.events = this.events.clone(); // Deep-clone all Axis since they are mutable - copy.allAxes = new ArrayList(); + copy.allAxes = new ArrayList<>(); for (Axis a : this.allAxes) { copy.allAxes.add(a.clone()); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java index 2f9edcbd3..47cffcf87 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java @@ -94,7 +94,7 @@ public class SimulationPlot { private final PlotConfiguration filled; private final List eventList; - private final List renderers = new ArrayList(); + private final List renderers = new ArrayList<>(); private final LegendItems legendItems; @@ -579,7 +579,7 @@ public class SimulationPlot { } private List buildEventInfo() { - ArrayList eventList = new ArrayList(); + ArrayList eventList = new ArrayList<>(); for (int branch = 0; branch < branchCount; branch++) { List events = simulation.getSimulatedData().getBranch(branch).getEvents(); @@ -595,7 +595,7 @@ public class SimulationPlot { } } - Collections.sort(eventList, new Comparator() { + Collections.sort(eventList, new Comparator<>() { @Override public int compare(EventDisplayInfo o1, EventDisplayInfo o2) { @@ -614,10 +614,10 @@ public class SimulationPlot { private static class LegendItems implements LegendItemSource { - private final List lineLabels = new ArrayList(); - private final List linePaints = new ArrayList(); - private final List lineStrokes = new ArrayList(); - private final List pointShapes = new ArrayList(); + private final List lineLabels = new ArrayList<>(); + private final List linePaints = new ArrayList<>(); + private final List lineStrokes = new ArrayList<>(); + private final List pointShapes = new ArrayList<>(); @Override public LegendItemCollection getLegendItems() { diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java index 4ab5821d1..bff15019f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java @@ -114,7 +114,7 @@ public class SimulationPlotDialog extends JDialog { checkErrors.setVisible(simulation.hasErrors()); //// Add series selection box - ArrayList stages = new ArrayList(); + ArrayList stages = new ArrayList<>(); stages.add(trans.get("PlotDialog.StageDropDown.allStages")); stages.addAll(Util.generateSeriesLabels(simulation)); diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/Util.java b/swing/src/main/java/info/openrocket/swing/gui/plot/Util.java index 76bb1bb31..374297417 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/Util.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/Util.java @@ -23,7 +23,7 @@ public abstract class Util { public static List generateSeriesLabels( Simulation simulation ) { int size = simulation.getSimulatedData().getBranchCount(); - ArrayList stages = new ArrayList(size); + ArrayList stages = new ArrayList<>(size); // we need to generate unique strings for each of the branches. Since the branch names are based // on the stage name there is no guarantee they are unique. In order to address this, we first assume // all the names are unique, then go through them looking for duplicates. diff --git a/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java index 5ebfb2271..414102e54 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java +++ b/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java @@ -20,7 +20,7 @@ public class DeselectableComboBox extends JComboBox { super.setRenderer(new DeselectedItemsRenderer()); } - private Set disabled_items = new HashSet(); + private Set disabled_items = new HashSet<>(); public void addItem(T anObject, boolean disabled) { super.addItem(anObject); @@ -32,7 +32,7 @@ public class DeselectableComboBox extends JComboBox { @Override public void removeAllItems() { super.removeAllItems(); - disabled_items = new HashSet(); + disabled_items = new HashSet<>(); } @Override diff --git a/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java b/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java index ec6dfefec..d59087904 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java @@ -214,7 +214,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { private final PresetResultListener resultListener; - private static final Map componentMap = new HashMap(); + private static final Map componentMap = new HashMap<>(); private static final String NOSE_CONE_KEY = "NoseCone.NoseCone"; private static final String BODY_TUBE_KEY = "BodyTube.BodyTube"; @@ -282,9 +282,9 @@ public class PresetEditorDialog extends JDialog implements ItemListener { contentPanel.add(componentOverlayPanel, "cell 1 3 5 2,grow"); componentOverlayPanel.setLayout(new CardLayout(0, 0)); - typeCombo = new DeselectableComboBox(); + typeCombo = new DeselectableComboBox<>(); typeCombo.addItemListener(this); - typeCombo.setModel(new DefaultComboBoxModel()); + typeCombo.setModel(new DefaultComboBoxModel<>()); setItems(typeCombo, toEdit); contentPanel.add(typeCombo, "cell 3 1,growx"); @@ -331,9 +331,9 @@ public class PresetEditorDialog extends JDialog implements ItemListener { JLabel ncShapeLabel = new JLabel(trans.get("NoseConeCfg.lbl.Noseconeshape")); ncPanel.add(ncShapeLabel, "cell 0 2,alignx left"); - ncShapeCB = new JComboBox(); - ncShapeCB.setModel(new DefaultComboBoxModel(new String[] { Transition.Shape.OGIVE.getName(), Transition.Shape.CONICAL.getName(), Transition.Shape.PARABOLIC.getName(), - Transition.Shape.ELLIPSOID.getName(), Transition.Shape.HAACK.getName() })); + ncShapeCB = new JComboBox<>(); + ncShapeCB.setModel(new DefaultComboBoxModel<>(new String[]{Transition.Shape.OGIVE.getName(), Transition.Shape.CONICAL.getName(), Transition.Shape.PARABOLIC.getName(), + Transition.Shape.ELLIPSOID.getName(), Transition.Shape.HAACK.getName()})); ncPanel.add(ncShapeCB, "cell 1 2,growx"); JLabel ncLengthLabel = new JLabel(trans.get("NoseConeCfg.lbl.Noseconelength")); @@ -431,9 +431,9 @@ public class PresetEditorDialog extends JDialog implements ItemListener { JLabel trShapeLabel = new JLabel("Shape:"); trPanel.add(trShapeLabel, "cell 0 2,alignx left"); - trShapeCB = new JComboBox(); - trShapeCB.setModel(new DefaultComboBoxModel(new String[] { Transition.Shape.OGIVE.getName(), Transition.Shape.CONICAL.getName(), Transition.Shape.PARABOLIC.getName(), - Transition.Shape.ELLIPSOID.getName(), Transition.Shape.HAACK.getName() })); + trShapeCB = new JComboBox<>(); + trShapeCB.setModel(new DefaultComboBoxModel<>(new String[]{Transition.Shape.OGIVE.getName(), Transition.Shape.CONICAL.getName(), Transition.Shape.PARABOLIC.getName(), + Transition.Shape.ELLIPSOID.getName(), Transition.Shape.HAACK.getName()})); trPanel.add(trShapeCB, "cell 1 2,growx"); JLabel trLengthLabel = new JLabel("Length:"); 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 4b0c02237..45744ab32 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 @@ -606,8 +606,8 @@ public class DesignReport { return simulations; } - ArrayList simulationsToRun = new ArrayList(); - ArrayList upToDateSimulations = new ArrayList(); + ArrayList simulationsToRun = new ArrayList<>(); + ArrayList upToDateSimulations = new ArrayList<>(); for (Simulation simulation : simulations) { boolean simulate = false; boolean copy = !this.updateExistingSimulations; @@ -679,7 +679,7 @@ public class DesignReport { log.debug("Updating simulations using thread pool"); int cores = Runtime.getRuntime().availableProcessors(); ThreadPoolExecutor executor = new ThreadPoolExecutor(cores, cores, 0L, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue(), + new LinkedBlockingQueue<>(), new SimulationRunnerThreadFactory()); for (Simulation simulation : simulations) { executor.execute(new RunSimulationTask(simulation)); diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java b/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java index 3d093dc48..9adccf7aa 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java @@ -115,7 +115,7 @@ public class FinMarkingGuide extends JPanel { */ private Map> init(Rocket component) { Iterator iter = component.iterator(false); - Map> results = new LinkedHashMap>(); + Map> results = new LinkedHashMap<>(); BodyTube current = null; int totalHeight = 0; int iterationHeight = 0; @@ -131,7 +131,7 @@ public class FinMarkingGuide extends JPanel { else if (next instanceof FinSet || next instanceof TubeFinSet || next instanceof LaunchLug || next instanceof RailButton) { java.util.List list = results.get(current); if (list == null && current != null) { - list = new ArrayList(); + list = new ArrayList<>(); results.put(current, list); double radius = current.getOuterRadius(); @@ -495,7 +495,7 @@ public class FinMarkingGuide extends JPanel { */ private double findRadialOrigin(List components) { - ArrayList positions = new ArrayList(3 * components.size()); + ArrayList positions = new ArrayList<>(3 * components.size()); for (ExternalComponent component : components) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/OpenRocketPrintable.java b/swing/src/main/java/info/openrocket/swing/gui/print/OpenRocketPrintable.java index 7edb0a35d..51d275b9c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/OpenRocketPrintable.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/OpenRocketPrintable.java @@ -111,7 +111,7 @@ public enum OpenRocketPrintable { * @return a list of OpenRocketPrintable */ public static List getUnstaged() { - List unstaged = new ArrayList(); + List unstaged = new ArrayList<>(); OpenRocketPrintable[] values = values(); for (OpenRocketPrintable value : values) { if (!value.isStageSpecific()) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableCenteringRing.java b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableCenteringRing.java index 2a7015d18..c8a067bf7 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableCenteringRing.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableCenteringRing.java @@ -35,7 +35,7 @@ public class PrintableCenteringRing extends AbstractPrintable { /** * A set of the inner 'holes'. At least one, but will have many if clustered. */ - private Set innerCenterPoints = new HashSet(); + private Set innerCenterPoints = new HashSet<>(); /** * Construct a simple, non-clustered, printable centering ring, or if the motor mount represents a clustered @@ -55,7 +55,7 @@ public class PrintableCenteringRing extends AbstractPrintable { } else { List coords = theMotorMount.getClusterPoints(); - List points = new ArrayList(); + List points = new ArrayList<>(); for (Coordinate coordinate : coords) { points.add(coordinate.setX(theMotorMount.getOuterRadius())); } @@ -72,7 +72,7 @@ public class PrintableCenteringRing extends AbstractPrintable { */ private PrintableCenteringRing(CenteringRing theRing, List theMotorMounts) { super(theRing); - List points = new ArrayList(); + List points = new ArrayList<>(); //Transform the radial positions of the tubes. for (InnerTube it : theMotorMounts) { if (it.getInstanceCount() > 1) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java index beac95e82..899c12e92 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java @@ -28,7 +28,7 @@ public class PrintableContext implements Comparable, Iterable< /** * Sort of a reverse map that tracks each type of printable item and the stages for which that item is to be printed. */ - private final Map> previous = new TreeMap>(); + private final Map> previous = new TreeMap<>(); /** * Constructor. @@ -62,7 +62,7 @@ public class PrintableContext implements Comparable, Iterable< public void add(final Integer theStageNumber, final OpenRocketPrintable thePrintable) { Set stages = previous.get(thePrintable); if (stages == null) { - stages = new TreeSet(); + stages = new TreeSet<>(); previous.put(thePrintable, stages); } if (theStageNumber != null) { @@ -73,21 +73,21 @@ public class PrintableContext implements Comparable, Iterable< /** PrintableContext iterator. */ @Override public Iterator iterator() { - return new Iterator() { - + return new Iterator<>() { + Iterator keyIter = previous.keySet().iterator(); - + @Override public boolean hasNext() { return keyIter.hasNext(); } - + @Override public PrintableContext next() { final OpenRocketPrintable key = keyIter.next(); return new PrintableContext(previous.get(key), key); } - + @Override public void remove() { } diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java b/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java index cc055772f..fd3b4b794 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java @@ -128,7 +128,7 @@ public class CheckTreeSelectionModel extends DefaultTreeSelectionModel { if (selectionPaths == null) { break; } - ArrayList toBeRemoved = new ArrayList(); + ArrayList toBeRemoved = new ArrayList<>(); for (TreePath selectionPath : selectionPaths) { if (isDescendant(selectionPath, path)) { toBeRemoved.add(selectionPath); @@ -217,7 +217,7 @@ public class CheckTreeSelectionModel extends DefaultTreeSelectionModel { * @param path the tree path node */ private void toggleRemoveSelection (TreePath path) { - Stack stack = new Stack(); + Stack stack = new Stack<>(); TreePath parent = path.getParentPath(); while (parent != null && !isPathSelected(parent)) { stack.push(parent); diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java b/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java index 83c829bdd..c95623614 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java @@ -177,7 +177,7 @@ public class RocketPrintTree extends JTree { * @return an array of CheckBoxNode */ private static CheckBoxNode[] createPrintTreeNode(boolean onlyStageSpecific) { - List nodes = new ArrayList(); + List nodes = new ArrayList<>(); OpenRocketPrintable[] printables = OpenRocketPrintable.values(); for (OpenRocketPrintable openRocketPrintable : printables) { if (!onlyStageSpecific || openRocketPrintable.isStageSpecific()) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/CenteringRingStrategy.java b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/CenteringRingStrategy.java index 0faa28c17..87fda6dac 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/CenteringRingStrategy.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/CenteringRingStrategy.java @@ -63,7 +63,7 @@ public class CenteringRingStrategy extends AbstractPrintStrategy { RocketComponent parent = rc.getParent(); List siblings = parent.getChildren(); - List mounts = new ArrayList(); + List mounts = new ArrayList<>(); for (RocketComponent rocketComponents : siblings) { if (rocketComponents != rc) { if (rocketComponents instanceof InnerTube) { 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 17000b9b8..4463cb26e 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 @@ -60,7 +60,7 @@ public class PageFitPrintStrategy { public PageFitPrintStrategy(Document doc, PdfWriter theWriter) { document = doc; writer = theWriter; - componentToPrint = new ArrayList(); + componentToPrint = new ArrayList<>(); } /** diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java index fbc584f95..1f392472a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java @@ -31,7 +31,7 @@ public class PartsListVisitorStrategy { /** * Accumulator for parts data. */ - private Map crap = new HashMap(); + private Map crap = new HashMap<>(); /** * The iText document. diff --git a/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/SymmetricComponentShapes.java b/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/SymmetricComponentShapes.java index 0e9e7b652..3fcc436d7 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/SymmetricComponentShapes.java +++ b/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/SymmetricComponentShapes.java @@ -38,7 +38,7 @@ public class SymmetricComponentShapes extends RocketComponentShapes { final double delta = 0.0000001; double x; - ArrayList points = new ArrayList(); + ArrayList points = new ArrayList<>(); x = delta; points.add(new Coordinate(x, c.getRadius(x), 0)); for (i = 1; i < MINPOINTS - 1; i++) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/AbstractScaleFigure.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/AbstractScaleFigure.java index 55d3c6ac6..7ca8546c2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/AbstractScaleFigure.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/AbstractScaleFigure.java @@ -54,7 +54,7 @@ public abstract class AbstractScaleFigure extends JPanel { // which frames does this transform between ? protected AffineTransform projection = null; - protected final List listeners = new LinkedList(); + protected final List listeners = new LinkedList<>(); private static Color backgroundColor; diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java index 02bd3a525..ed89dec83 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java @@ -99,8 +99,8 @@ public class RocketFigure extends AbstractScaleFigure { Comparator.comparingInt(o -> -o.component.getDisplayOrder_back())); - private final ArrayList relativeExtra = new ArrayList(); - private final ArrayList absoluteExtra = new ArrayList(); + private final ArrayList relativeExtra = new ArrayList<>(); + private final ArrayList absoluteExtra = new ArrayList<>(); private static Color motorFillColor; private static Color motorBorderColor; @@ -395,7 +395,7 @@ public class RocketFigure extends AbstractScaleFigure { return new RocketComponent[0]; } - LinkedHashSet l = new LinkedHashSet(); + LinkedHashSet l = new LinkedHashSet<>(); PriorityQueue figureShapes; if (currentViewType == RocketPanel.VIEW_TYPE.SideView || currentViewType == RocketPanel.VIEW_TYPE.TopView) diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java index dcaeb2ae2..7f8b42811 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java @@ -178,7 +178,7 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change private SimulationWorker backgroundSimulationWorker = null; - private List listeners = new ArrayList(); + private List listeners = new ArrayList<>(); // Store the basic frame to know which tab is selected (Rocket design, Motors & Configuration, Flight simulations) private final BasicFrame basicFrame; diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java index ad8c156c0..9ea7d2ead 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java @@ -181,10 +181,10 @@ public class SimulationExportPanel extends JPanel { this.add(csvOptions, "spany, split, growx 1"); //// Add series selection box - ArrayList stages = new ArrayList(); + ArrayList stages = new ArrayList<>(); stages.addAll(Util.generateSeriesLabels(simulation)); - final JComboBox stageSelection = new JComboBox(stages.toArray(new String[0])); + final JComboBox stageSelection = new JComboBox<>(stages.toArray(new String[0])); stageSelection.addItemListener(new ItemListener() { @Override diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java index afb372731..34388a0a7 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java @@ -126,9 +126,9 @@ class SimulationOptionsPanel extends JPanel { label.setToolTipText(trans.get("simedtdlg.lbl.ttip.GeodeticMethodTip")); subsub.add(label, "gapright para"); - EnumModel gcsModel = new EnumModel( + EnumModel gcsModel = new EnumModel<>( conditions, "GeodeticComputation"); - final JComboBox gcsCombo = new JComboBox(gcsModel); + final JComboBox gcsCombo = new JComboBox<>(gcsModel); ActionListener gcsTTipListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -235,7 +235,7 @@ class SimulationOptionsPanel extends JPanel { } private JPopupMenu getExtensionMenu() { - Set extensions = Application.getInjector().getInstance(new Key>() { + Set extensions = Application.getInjector().getInstance(new Key<>() { }); JPopupMenu basemenu = new JPopupMenu(); @@ -445,7 +445,7 @@ class SimulationOptionsPanel extends JPanel { } private SwingSimulationExtensionConfigurator findConfigurator(SimulationExtension extension) { - Set configurators = Application.getInjector().getInstance(new Key>() { + Set configurators = Application.getInjector().getInstance(new Key<>() { }); for (SwingSimulationExtensionConfigurator c : configurators) { if (c.support(extension)) { 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 f6cd57463..480bd2090 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 @@ -134,7 +134,7 @@ public class SimulationPlotPanel extends JPanel { //// Configuration selector // Setup the combo box - configurationSelector = new JComboBox(PRESET_ARRAY); + configurationSelector = new JComboBox<>(PRESET_ARRAY); for (PlotConfiguration config : PRESET_ARRAY) { if (config.getName().equals(configuration.getName())) { configurationSelector.setSelectedItem(config); @@ -531,7 +531,7 @@ public class SimulationPlotPanel extends JPanel { //// Axis: this.add(new JLabel(trans.get("simplotpanel.lbl.Axis"))); - axisSelector = new JComboBox(POSITIONS); + axisSelector = new JComboBox<>(POSITIONS); if (position == LEFT) axisSelector.setSelectedIndex(1); else if (position == RIGHT) 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 22b7a211d..704933e98 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 @@ -76,7 +76,7 @@ public class SimulationRunDialog extends JDialog { static { int n = SwingPreferences.getMaxThreadCount(); - executor = new ThreadPoolExecutor(n, n, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), + executor = new ThreadPoolExecutor(n, n, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), new ThreadFactory() { private ThreadFactory factory = Executors.defaultThreadFactory(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/CheckList.java b/swing/src/main/java/info/openrocket/swing/gui/util/CheckList.java index 030c3edb5..62a00fd26 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/CheckList.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/CheckList.java @@ -75,7 +75,7 @@ public class CheckList { @SuppressWarnings("unchecked") public CheckList build() { - return new CheckList((JList)list); + return new CheckList<>((JList) list); } } @@ -132,7 +132,7 @@ public class CheckList { * @param data */ public void setData(Collection data) { - setModel(new DefaultCheckListModel(data)); + setModel(new DefaultCheckListModel<>(data)); } /** @@ -156,7 +156,7 @@ public class CheckList { } public Collection getUncheckedItems() { - List unchecked = new ArrayList(); + List unchecked = new ArrayList<>(); for (int i = getModel().getSize() - 1; i >= 0; i--) { unchecked.add((T) getModel().getElementAt(i)); } 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 84d175eb5..007f6c181 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 @@ -24,7 +24,7 @@ public class CustomFinImporter { public ArrayList getPoints(File file) throws IOException { - ArrayList points = new ArrayList(); + ArrayList points = new ArrayList<>(); BufferedImage pic = ImageIO.read(file); diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/DefaultCheckListModel.java b/swing/src/main/java/info/openrocket/swing/gui/util/DefaultCheckListModel.java index 7fc01a35e..375467315 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/DefaultCheckListModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/DefaultCheckListModel.java @@ -52,8 +52,8 @@ public class DefaultCheckListModel extends AbstractListModel { private static final long serialVersionUID = 1L; - private final List data = new ArrayList(); - private final Set checks = new HashSet(); + private final List data = new ArrayList<>(); + private final Set checks = new HashSet<>(); public DefaultCheckListModel(Collection data) { @@ -98,7 +98,7 @@ public class DefaultCheckListModel extends AbstractListModel { } public Collection getCheckedItems() { - List items = new ArrayList(checks); + List items = new ArrayList<>(checks); items.retainAll(data); return Collections.unmodifiableList(items); } @@ -117,7 +117,7 @@ public class DefaultCheckListModel extends AbstractListModel { // if ( CollectionUtils.isEmpty(items)) return; - List correctedItems = new ArrayList(items); + List correctedItems = new ArrayList<>(items); correctedItems.retainAll(data); checks.clear(); @@ -129,7 +129,7 @@ public class DefaultCheckListModel extends AbstractListModel { public void setUncheckedItems( Collection items ) { - List correctedItems = new ArrayList(data); + List correctedItems = new ArrayList<>(data); correctedItems.removeAll(items); checks.clear(); 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 019e739ce..9533113d6 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 @@ -248,9 +248,9 @@ public class GUIUtil { * @param c the component to modify */ public static void setTabToFocusing(Component c) { - Set strokes = new HashSet(Arrays.asList(KeyStroke.getKeyStroke("pressed TAB"))); + Set strokes = new HashSet<>(Arrays.asList(KeyStroke.getKeyStroke("pressed TAB"))); c.setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, strokes); - strokes = new HashSet(Arrays.asList(KeyStroke.getKeyStroke("shift pressed TAB"))); + strokes = new HashSet<>(Arrays.asList(KeyStroke.getKeyStroke("shift pressed TAB"))); c.setFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS, strokes); } @@ -555,7 +555,7 @@ public class GUIUtil { combo.removeActionListener(l); } ComboBoxModel model = combo.getModel(); - combo.setModel(new DefaultComboBoxModel()); + combo.setModel(new DefaultComboBoxModel<>()); if (model instanceof Invalidatable) { ((Invalidatable) model).invalidateMe(); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java b/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java index 6640ac979..9f17b6d9c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java @@ -68,7 +68,7 @@ public class SwingPreferences extends info.openrocket.core.startup.Preferences i private static final List SUPPORTED_LOCALES; static { - List list = new ArrayList(); + List list = new ArrayList<>(); for (String lang : new String[] { "en", "ar", "de", "es", "fr", "it", "nl", "ru", "cs", "pl", "ja", "pt", "tr" }) { list.add(new Locale(lang)); } @@ -767,7 +767,7 @@ public class SwingPreferences extends info.openrocket.core.startup.Preferences i public Set getUserMaterials() { Preferences prefs = PREFNODE.node("userMaterials"); - HashSet materials = new HashSet(); + HashSet materials = new HashSet<>(); try { for (String key : prefs.keys()) { @@ -805,7 +805,7 @@ public class SwingPreferences extends info.openrocket.core.startup.Preferences i @Override public Set getComponentFavorites(ComponentPreset.Type type) { Preferences prefs = PREFNODE.node("favoritePresets").node(type.name()); - Set collection = new HashSet(); + Set collection = new HashSet<>(); try { collection.addAll(Arrays.asList(prefs.keys())); } catch (BackingStoreException bex) { @@ -848,7 +848,7 @@ public class SwingPreferences extends info.openrocket.core.startup.Preferences i public List getExcludedMotorManufacturers() { Preferences prefs = PREFNODE.node("excludedMotorManufacturers"); - List collection = new ArrayList(); + List collection = new ArrayList<>(); try { String[] manuShortNames = prefs.keys(); for (String s : manuShortNames) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java index bbd383314..6d2aa4ce4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java +++ b/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java @@ -418,7 +418,7 @@ public class SearchableAndCategorizableComboBox extends JComboBox { private final SortedSet model; public SortedListModel() { - Comparator alphabeticalComparator = new Comparator() { + Comparator alphabeticalComparator = new Comparator<>() { @Override public int compare(T o1, T o2) { return o1.toString().compareToIgnoreCase(o2.toString()); diff --git a/swing/src/main/java/info/openrocket/swing/logging/BufferLogger.java b/swing/src/main/java/info/openrocket/swing/logging/BufferLogger.java index 462b762de..f5aed2986 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/BufferLogger.java +++ b/swing/src/main/java/info/openrocket/swing/logging/BufferLogger.java @@ -14,8 +14,8 @@ import java.util.List; public class BufferLogger extends LogHelper { private final CyclicBuffer buffer; - private final EnumMap storeLevels = - new EnumMap(LogLevel.class); + private final EnumMap storeLevels = + new EnumMap<>(LogLevel.class); /** @@ -28,7 +28,7 @@ public class BufferLogger extends LogHelper { for (LogLevel l: LogLevel.values()) { storeLevels.put(l, true); } - buffer = new CyclicBuffer(length); + buffer = new CyclicBuffer<>(length); } diff --git a/swing/src/main/java/info/openrocket/swing/logging/CyclicBuffer.java b/swing/src/main/java/info/openrocket/swing/logging/CyclicBuffer.java index 2529f150f..82bad6f82 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/CyclicBuffer.java +++ b/swing/src/main/java/info/openrocket/swing/logging/CyclicBuffer.java @@ -40,7 +40,7 @@ public class CyclicBuffer extends AbstractQueue { * @param size the size of the cyclic buffer. */ public CyclicBuffer(int size) { - this.buffer = new ArrayList(size); + this.buffer = new ArrayList<>(size); for (int i=0; i extends AbstractQueue { * @return a list of the buffered objects. */ public synchronized List asList() { - ArrayList list = new ArrayList(size); + ArrayList list = new ArrayList<>(size); if (startPosition + size > maxSize) { list.addAll(buffer.subList(startPosition, maxSize)); list.addAll(buffer.subList(0, startPosition + size - maxSize)); diff --git a/swing/src/main/java/info/openrocket/swing/logging/DelegatorLogger.java b/swing/src/main/java/info/openrocket/swing/logging/DelegatorLogger.java index ebc51510c..906ec13f1 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/DelegatorLogger.java +++ b/swing/src/main/java/info/openrocket/swing/logging/DelegatorLogger.java @@ -17,7 +17,7 @@ public class DelegatorLogger extends LogHelper { * List of loggers. This list must not be modified, instead it should be * replaced every time the list is changed. */ - private volatile ArrayList loggers = new ArrayList(); + private volatile ArrayList loggers = new ArrayList<>(); @Override public void log(LogLine line) { diff --git a/swing/src/main/java/info/openrocket/swing/logging/LogLevelBufferLogger.java b/swing/src/main/java/info/openrocket/swing/logging/LogLevelBufferLogger.java index c15bfff78..2fa424d18 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/LogLevelBufferLogger.java +++ b/swing/src/main/java/info/openrocket/swing/logging/LogLevelBufferLogger.java @@ -18,7 +18,7 @@ import java.util.List; public class LogLevelBufferLogger extends LogHelper { private final EnumMap loggers = - new EnumMap(LogLevel.class); + new EnumMap<>(LogLevel.class); /** @@ -45,7 +45,7 @@ public class LogLevelBufferLogger extends LogHelper { * @return a list of log lines in order. */ public List getLogs() { - List result = new ArrayList(); + List result = new ArrayList<>(); for (LogLevel level : LogLevel.values()) { BufferLogger logger = loggers.get(level); diff --git a/swing/src/main/java/info/openrocket/swing/logging/LoggingSystemSetup.java b/swing/src/main/java/info/openrocket/swing/logging/LoggingSystemSetup.java index 28b8eec09..e60cb4316 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/LoggingSystemSetup.java +++ b/swing/src/main/java/info/openrocket/swing/logging/LoggingSystemSetup.java @@ -24,7 +24,7 @@ public class LoggingSystemSetup { public static void addConsoleAppender() { Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - ConsoleAppender appender = new ConsoleAppender(); + ConsoleAppender appender = new ConsoleAppender<>(); appender.setName("console"); appender.setContext(context); PatternLayoutEncoder layout = new PatternLayoutEncoder(); diff --git a/swing/src/main/java/info/openrocket/swing/logging/PrintStreamLogger.java b/swing/src/main/java/info/openrocket/swing/logging/PrintStreamLogger.java index 59a68aac9..d0b336b9f 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/PrintStreamLogger.java +++ b/swing/src/main/java/info/openrocket/swing/logging/PrintStreamLogger.java @@ -11,7 +11,7 @@ import java.util.EnumMap; */ public class PrintStreamLogger extends LogHelper { - private final EnumMap output = new EnumMap(LogLevel.class); + private final EnumMap output = new EnumMap<>(LogLevel.class); @Override diff --git a/swing/src/main/java/info/openrocket/swing/startup/jij/ConfigurableStreamHandlerFactory.java b/swing/src/main/java/info/openrocket/swing/startup/jij/ConfigurableStreamHandlerFactory.java index 476762217..63fc802ab 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/jij/ConfigurableStreamHandlerFactory.java +++ b/swing/src/main/java/info/openrocket/swing/startup/jij/ConfigurableStreamHandlerFactory.java @@ -15,7 +15,7 @@ public class ConfigurableStreamHandlerFactory implements URLStreamHandlerFactory private final Map protocolHandlers; public ConfigurableStreamHandlerFactory() { - protocolHandlers = new HashMap(); + protocolHandlers = new HashMap<>(); } public void addHandler(String protocol, URLStreamHandler urlHandler) { diff --git a/swing/src/main/java/info/openrocket/swing/startup/jij/CurrentClasspathProvider.java b/swing/src/main/java/info/openrocket/swing/startup/jij/CurrentClasspathProvider.java index 91a97f918..7b09c6570 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/jij/CurrentClasspathProvider.java +++ b/swing/src/main/java/info/openrocket/swing/startup/jij/CurrentClasspathProvider.java @@ -10,7 +10,7 @@ public class CurrentClasspathProvider implements ClasspathProvider { @Override public List getUrls() { - List urls = new ArrayList(); + List urls = new ArrayList<>(); String classpath = System.getProperty("java.class.path"); String[] cps = classpath.split(File.pathSeparator); diff --git a/swing/src/main/java/info/openrocket/swing/startup/jij/JarInJarStarter.java b/swing/src/main/java/info/openrocket/swing/startup/jij/JarInJarStarter.java index 42c7657e0..29c835101 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/jij/JarInJarStarter.java +++ b/swing/src/main/java/info/openrocket/swing/startup/jij/JarInJarStarter.java @@ -16,7 +16,7 @@ public class JarInJarStarter { * @param providers the classpath sources. */ public static void runMain(String mainClass, String[] args, ClasspathProvider... providers) { - List urls = new ArrayList(); + List urls = new ArrayList<>(); for (ClasspathProvider p : providers) { urls.addAll(p.getUrls()); diff --git a/swing/src/main/java/info/openrocket/swing/startup/jij/ManifestClasspathProvider.java b/swing/src/main/java/info/openrocket/swing/startup/jij/ManifestClasspathProvider.java index 1c979301f..c4b6568d7 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/jij/ManifestClasspathProvider.java +++ b/swing/src/main/java/info/openrocket/swing/startup/jij/ManifestClasspathProvider.java @@ -21,7 +21,7 @@ public class ManifestClasspathProvider implements ClasspathProvider { try { List manifest = readManifestLine(MANIFEST_ATTRIBUTE); - List urls = new ArrayList(); + List urls = new ArrayList<>(); for (String s : manifest) { parseManifestLine(urls, s); } @@ -34,7 +34,7 @@ public class ManifestClasspathProvider implements ClasspathProvider { private List readManifestLine(String name) throws IOException { - List lines = new ArrayList(); + List lines = new ArrayList<>(); Enumeration resources = getClass().getClassLoader().getResources("META-INF/MANIFEST.MF"); diff --git a/swing/src/main/java/info/openrocket/swing/startup/jij/PluginClasspathProvider.java b/swing/src/main/java/info/openrocket/swing/startup/jij/PluginClasspathProvider.java index f0d6ea7a0..714cfc0cc 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/jij/PluginClasspathProvider.java +++ b/swing/src/main/java/info/openrocket/swing/startup/jij/PluginClasspathProvider.java @@ -15,7 +15,7 @@ public class PluginClasspathProvider implements ClasspathProvider { @Override public List getUrls() { - List urls = new ArrayList(); + List urls = new ArrayList<>(); findPluginDirectoryUrls(urls); findCustomPlugins(urls); diff --git a/swing/src/main/java/info/openrocket/swing/startup/providers/TranslatorProvider.java b/swing/src/main/java/info/openrocket/swing/startup/providers/TranslatorProvider.java index 70ff0f746..7c84f39c0 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/providers/TranslatorProvider.java +++ b/swing/src/main/java/info/openrocket/swing/startup/providers/TranslatorProvider.java @@ -18,7 +18,7 @@ public class TranslatorProvider implements Provider { private final static Logger log = LoggerFactory.getLogger(TranslatorProvider.class); - private AtomicReference translator = new AtomicReference(); + private AtomicReference translator = new AtomicReference<>(); @Override public Translator get() { diff --git a/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java b/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java index f43919f28..07a0e943a 100644 --- a/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java +++ b/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java @@ -272,7 +272,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene */ class DataTableModel extends DefaultTableModel { - private List associated = new ArrayList(); + private List associated = new ArrayList<>(); /** * Constructs a DefaultTableModel with as many columns as there are elements in @@ -365,7 +365,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene if (file.getName().toLowerCase().endsWith(".csv")) { file = file.getParentFile(); } - presets = new ArrayList(); + presets = new ArrayList<>(); MaterialHolder materialHolder = RockSimComponentFileTranslator.loadAll(presets, file); editContext.setMaterialsLoaded(materialHolder); } @@ -433,7 +433,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene file = FileHelper.forceExtension(file, "orc"); MaterialHolder materials = new MaterialHolder(); - List presets = new ArrayList(); + List presets = new ArrayList<>(); for (int x = 0; x < model.getRowCount(); x++) { ComponentPreset preset = (ComponentPreset) model.getAssociatedObject(x); @@ -454,7 +454,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene presets.add(preset); } - return FileHelper.confirmWrite(file, this) && new OpenRocketComponentSaver().save(file, new ArrayList(materials.values()), presets); + return FileHelper.confirmWrite(file, this) && new OpenRocketComponentSaver().save(file, new ArrayList<>(materials.values()), presets); } class OpenedFileContext { diff --git a/swing/src/main/java/info/openrocket/swing/utils/RockSimComponentFileTranslator.java b/swing/src/main/java/info/openrocket/swing/utils/RockSimComponentFileTranslator.java index 8dabc0c73..c537344be 100644 --- a/swing/src/main/java/info/openrocket/swing/utils/RockSimComponentFileTranslator.java +++ b/swing/src/main/java/info/openrocket/swing/utils/RockSimComponentFileTranslator.java @@ -45,13 +45,13 @@ public class RockSimComponentFileTranslator { throw new IllegalArgumentException("Invalid Command Line Params"); } - List allPresets = new ArrayList(); + List allPresets = new ArrayList<>(); LOGGER.println("Loading csv files from directory " + args[0]); MaterialHolder materialMap = loadAll(allPresets, new File(args[0])); LOGGER.println("\tMarshalling to XML"); - String xml = new OpenRocketComponentSaver().marshalToOpenRocketComponent(new ArrayList(materialMap.values()), allPresets, true); + String xml = new OpenRocketComponentSaver().marshalToOpenRocketComponent(new ArrayList<>(materialMap.values()), allPresets, true); // Try parsing the file LOGGER.println("\tValidating XML"); diff --git a/swing/src/main/java/info/openrocket/swing/utils/Scripting.java b/swing/src/main/java/info/openrocket/swing/utils/Scripting.java index 14ff0661a..df354b9d9 100644 --- a/swing/src/main/java/info/openrocket/swing/utils/Scripting.java +++ b/swing/src/main/java/info/openrocket/swing/utils/Scripting.java @@ -29,7 +29,7 @@ public class Scripting { System.out.println("RSyntaxTextArea supported syntax languages:"); TokenMakerFactory f = TokenMakerFactory.getDefaultInstance(); - List list = new ArrayList(f.keySet()); + List list = new ArrayList<>(f.keySet()); Collections.sort(list); for (String type : list) { System.out.println(" " + type); diff --git a/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java b/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java index 63f541b6b..8ac194c21 100644 --- a/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java +++ b/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java @@ -29,7 +29,7 @@ public class ServicesForTesting extends AbstractModule { public static class TranslatorProviderForTesting implements Provider { - private final AtomicReference translator = new AtomicReference(); + private final AtomicReference translator = new AtomicReference<>(); @Override public Translator get() { diff --git a/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java b/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java index 840770650..d98cf7cc9 100644 --- a/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java +++ b/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java @@ -42,7 +42,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testComputeFinTabLength() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); RocketComponent parent = new BodyTube(); @@ -58,7 +58,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testCompute2LeadingRings() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); RocketComponent parent = new BodyTube(); @@ -85,7 +85,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testCompute1Ring() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setLength(0.004); @@ -106,7 +106,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testComputeOneLeadingOneRingWithinRoot() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setAxialMethod(AxialMethod.TOP); @@ -133,7 +133,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testComputeOneLeadingOneTrailingRing() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setAxialMethod(AxialMethod.TOP); @@ -158,7 +158,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testComputeOneWithinRootOneTrailingRing() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setAxialMethod(AxialMethod.TOP); @@ -183,7 +183,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testBothRingsWithinRootChord() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); RocketComponent parent = new BodyTube(1.0000d, 0.1d); CenteringRing ring1 = new CenteringRing(); @@ -210,7 +210,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testBothRingsBeyondRootChord() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setAxialMethod(AxialMethod.TOP); @@ -236,7 +236,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void test3RingsWithinRootChord() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setAxialMethod(AxialMethod.ABSOLUTE); diff --git a/swing/src/test/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilterTest.java b/swing/src/test/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilterTest.java index 1c6c50988..850bb40d6 100644 --- a/swing/src/test/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilterTest.java +++ b/swing/src/test/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilterTest.java @@ -56,7 +56,7 @@ public class MotorRowFilterTest { ThrustCurveMotorSet motorSet = new ThrustCurveMotorSet(); motorSet.addMotor(motor); - List motorList = new ArrayList(); + List motorList = new ArrayList<>(); motorList.add(motorSet); ThrustCurveMotorDatabaseModel model = new ThrustCurveMotorDatabaseModel(motorList); @@ -65,7 +65,7 @@ public class MotorRowFilterTest { /////////////////////////////////// // search terms filter - ArrayList badSearchTerms = new ArrayList(); + ArrayList badSearchTerms = new ArrayList<>(); // Two search terms, one present and one not badSearchTerms.add("xx"); @@ -120,7 +120,7 @@ public class MotorRowFilterTest { ////////////////////////////////// // manufacturer set/get/filter presence/absence - List excludedManufacturers = new ArrayList(); + List excludedManufacturers = new ArrayList<>(); if (motor.getManufacturer() != Manufacturer.getManufacturer("UNKNOWN")) { excludedManufacturers.add(Manufacturer.getManufacturer("Estes")); excludedManufacturers.add(motor.getManufacturer()); diff --git a/swing/src/test/java/info/openrocket/swing/logging/CyclicBufferTest.java b/swing/src/test/java/info/openrocket/swing/logging/CyclicBufferTest.java index 6ca672501..e1b56faff 100644 --- a/swing/src/test/java/info/openrocket/swing/logging/CyclicBufferTest.java +++ b/swing/src/test/java/info/openrocket/swing/logging/CyclicBufferTest.java @@ -15,8 +15,8 @@ public class CyclicBufferTest { @Test public void testBasic() { - CyclicBuffer buffer = new CyclicBuffer(5); - LinkedList correct = new LinkedList(); + CyclicBuffer buffer = new CyclicBuffer<>(5); + LinkedList correct = new LinkedList<>(); Random rnd = new Random(); for (int i=0; i<50; i++) { @@ -31,7 +31,7 @@ public class CyclicBufferTest { @Test public void testComplex() { - CyclicBuffer buffer = new CyclicBuffer(5); + CyclicBuffer buffer = new CyclicBuffer<>(5); testContents(buffer); assertEquals(0, buffer.getOverwriteCount()); @@ -109,8 +109,8 @@ public class CyclicBufferTest { @Test public void testRandom() { - CyclicBuffer buffer = new CyclicBuffer(4); - LinkedList correct = new LinkedList(); + CyclicBuffer buffer = new CyclicBuffer<>(4); + LinkedList correct = new LinkedList<>(); Random rnd = new Random(); for (int i=0; i<500; i++) { From 3f8b35343ca05d954e7d12dc3c0a934b389a2723 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:16:41 +0200 Subject: [PATCH 07/25] Replace try finally with try with resources --- .../defaults/ResourceDecalImage.java | 6 +--- .../core/document/DecalRegistry.java | 5 +-- .../attachments/ZipFileAttachment.java | 6 +--- .../core/file/GeneralRocketSaver.java | 6 ++-- .../loader/RockSimComponentFileLoader.java | 11 +------ .../swing/gui/help/tours/SlideSetLoader.java | 7 ++-- .../swing/gui/help/tours/SlideSetManager.java | 32 ++++++++----------- .../swing/gui/main/ExampleDesignFile.java | 15 ++------- 8 files changed, 25 insertions(+), 63 deletions(-) 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 90b539f51..052ca90f8 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 @@ -50,17 +50,13 @@ public class ResourceDecalImage implements DecalImage { @Override public void exportImage(File file) throws IOException { InputStream is = getBytes(); - OutputStream os = new BufferedOutputStream(new FileOutputStream(file)); if (is == null) { return; } - try { + try (is; OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) { FileUtils.copy(is, os); - } finally { - is.close(); - os.close(); } } diff --git a/core/src/main/java/info/openrocket/core/document/DecalRegistry.java b/core/src/main/java/info/openrocket/core/document/DecalRegistry.java index f5eed91bc..75875e96b 100644 --- a/core/src/main/java/info/openrocket/core/document/DecalRegistry.java +++ b/core/src/main/java/info/openrocket/core/document/DecalRegistry.java @@ -166,12 +166,9 @@ public class DecalRegistry { if (!exportedFile.exists()) { throw new DecalNotFoundException(exportedFile.getAbsolutePath(), this); } - InputStream rawIs = new FileInputStream(exportedFile); - try { + try (InputStream rawIs = new FileInputStream(exportedFile)) { byte[] bytes = FileUtils.readBytes(rawIs); return new ByteArrayInputStream(bytes); - } finally { - rawIs.close(); } } diff --git a/core/src/main/java/info/openrocket/core/document/attachments/ZipFileAttachment.java b/core/src/main/java/info/openrocket/core/document/attachments/ZipFileAttachment.java index e613bcd24..fdd226e73 100644 --- a/core/src/main/java/info/openrocket/core/document/attachments/ZipFileAttachment.java +++ b/core/src/main/java/info/openrocket/core/document/attachments/ZipFileAttachment.java @@ -24,9 +24,7 @@ public class ZipFileAttachment extends Attachment { public InputStream getBytes() throws DecalNotFoundException, IOException { String name = getName(); - ZipInputStream zis = new ZipInputStream(zipFileLocation.openStream()); - - try { + try (ZipInputStream zis = new ZipInputStream(zipFileLocation.openStream())) { ZipEntry entry = zis.getNextEntry(); while (entry != null) { if (entry.getName().equals(name)) { @@ -36,8 +34,6 @@ public class ZipFileAttachment extends Attachment { entry = zis.getNextEntry(); } throw new DecalNotFoundException(name, null); - } finally { - zis.close(); } } diff --git a/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java b/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java index 88e8a0eed..28cd06387 100644 --- a/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java +++ b/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java @@ -211,9 +211,9 @@ public class GeneralRocketSaver { // Open a zip stream to write to. ZipOutputStream zos = new ZipOutputStream(output); - zos.setLevel(9); // big try block to close the zos. - try { + try (zos) { + zos.setLevel(9); ZipEntry mainFile = new ZipEntry("rocket.ork"); zos.putNextEntry(mainFile); @@ -241,8 +241,6 @@ public class GeneralRocketSaver { } zos.flush(); - } finally { - zos.close(); } } diff --git a/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java b/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java index d4a3c571e..240ed13b6 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java @@ -128,9 +128,7 @@ public abstract class RockSimComponentFileLoader { if (is == null) { return; } - InputStreamReader r = null; - try { - r = new InputStreamReader(is); + try (InputStreamReader r = new InputStreamReader(is)) { // Create the CSV reader. Use comma separator. CSVParser parser = new CSVParserBuilder() @@ -160,13 +158,6 @@ public abstract class RockSimComponentFileLoader { return; } catch (IOException | CsvValidationException e) { throw new BugException("Could not read component file", e); - } finally { - if (r != null) { - try { - r.close(); - } catch (IOException ignored) { - } - } } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java index a04acfa7f..fa9e64452 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java @@ -65,13 +65,10 @@ public class SlideSetLoader { */ public SlideSet load(String filename) throws IOException { String file = baseDir + filename; - InputStream in = getLocalizedFile(file); - - try { + + try (InputStream in = getLocalizedFile(file)) { InputStreamReader reader = new InputStreamReader(in, "UTF-8"); return load(reader); - } finally { - in.close(); } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java index 8ba481250..ffa3345f8 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java @@ -120,42 +120,38 @@ public class SlideSetManager { private List loadTourList() throws IOException { InputStream in = ClassLoader.getSystemResourceAsStream(baseDir + TOURS_FILE); - if (in == null) { - throw new FileNotFoundException("File '" + baseDir + TOURS_FILE + "' not found."); - } - - try { - + + try (in) { + if (in == null) { + throw new FileNotFoundException("File '" + baseDir + TOURS_FILE + "' not found."); + } + List tours = new ArrayList<>(); TextLineReader reader = new TextLineReader(in); while (reader.hasNext()) { tours.add(reader.next()); } return tours; - - } finally { - in.close(); + } } private StyleSheet loadStyleSheet() throws IOException { InputStream in = ClassLoader.getSystemResourceAsStream(baseDir + STYLESHEET_FILE); - if (in == null) { - throw new FileNotFoundException("File '" + baseDir + STYLESHEET_FILE + "' not found."); - } - - try { - + + try (in) { + if (in == null) { + throw new FileNotFoundException("File '" + baseDir + STYLESHEET_FILE + "' not found."); + } + StyleSheet ss = new StyleSheet(); ss.addRule(String.format("p { color: rgb(%d, %d, %d, %d)", textColor.getRed(), textColor.getGreen(), textColor.getBlue(), textColor.getAlpha())); InputStreamReader reader = new InputStreamReader(in, "UTF-8"); ss.loadRules(reader, null); return ss; - - } finally { - in.close(); + } } 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 55f63af5c..221f026b6 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 @@ -153,10 +153,8 @@ public class ExampleDesignFile implements Comparable { } // Iterate over JAR entries searching for designs - JarFile jarFile = null; - try { - jarFile = new JarFile(file); - + try (JarFile jarFile = new JarFile(file)) { + // Loop through JAR entries searching for files to load Enumeration entries = jarFile.entries(); while (entries.hasMoreElements()) { @@ -169,18 +167,11 @@ public class ExampleDesignFile implements Comparable { name.substring(dirLength, name.length() - 4))); } } - + } catch (IOException e) { logger.error("IOException when processing jarFile", e); // Could be normal condition if not package in JAR return null; - } finally { - if (jarFile != null) { - try { - jarFile.close(); - } catch (IOException e) { - } - } } return list.toArray(new ExampleDesignFile[0]); From 8df1fa881af65e83a037ddbdcfe626db42e9d219 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:17:16 +0200 Subject: [PATCH 08/25] Collapse catch blocks --- .../congrace/exp4j/CommandlineInterpreter.java | 4 +--- .../openrocket/importt/ComponentHandler.java | 4 +--- .../core/file/rocksim/importt/BaseHandler.java | 3 +-- .../modifiers/FlightConfigurationModifier.java | 4 +--- .../modifiers/GenericModifier.java | 4 +--- .../preset/loader/DoubleUnitColumnParser.java | 1 - .../info/openrocket/core/util/Reflection.java | 14 +++----------- .../swing/gui/adaptors/DoubleModel.java | 16 ++++------------ .../swing/gui/adaptors/IntegerModel.java | 8 ++------ .../swing/gui/main/ComponentAddButtons.java | 4 +--- .../swing/gui/print/PrintController.java | 4 +--- 11 files changed, 16 insertions(+), 50 deletions(-) diff --git a/core/src/main/java/de/congrace/exp4j/CommandlineInterpreter.java b/core/src/main/java/de/congrace/exp4j/CommandlineInterpreter.java index 78670a427..b06496366 100644 --- a/core/src/main/java/de/congrace/exp4j/CommandlineInterpreter.java +++ b/core/src/main/java/de/congrace/exp4j/CommandlineInterpreter.java @@ -35,9 +35,7 @@ public class CommandlineInterpreter { try { final PostfixExpression pe = PostfixExpression.fromInfix(string); System.out.println(pe.calculate()); - } catch (UnparsableExpressionException e) { - e.printStackTrace(); - } catch (UnknownFunctionException e) { + } catch (UnparsableExpressionException | UnknownFunctionException e) { e.printStackTrace(); } } diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/ComponentHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/ComponentHandler.java index c217cc78e..7fa4102e0 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/ComponentHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/ComponentHandler.java @@ -42,9 +42,7 @@ class ComponentHandler extends AbstractElementHandler { RocketComponent c; try { c = constructor.newInstance(); - } catch (InstantiationException e) { - throw new BugException("Error constructing component.", e); - } catch (IllegalAccessException e) { + } catch (InstantiationException | IllegalAccessException e) { throw new BugException("Error constructing component.", e); } catch (InvocationTargetException e) { throw Reflection.handleWrappedException(e); diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/importt/BaseHandler.java b/core/src/main/java/info/openrocket/core/file/rocksim/importt/BaseHandler.java index e8f5b05a9..6b3f0eaa3 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/importt/BaseHandler.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/importt/BaseHandler.java @@ -305,8 +305,7 @@ public abstract class BaseHandler extends AbstractEle if (method != null) { method.invoke(component, material); } - } catch (IllegalAccessException ignored) { - } catch (InvocationTargetException ignored) { + } catch (IllegalAccessException | InvocationTargetException ignored) { } } diff --git a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/FlightConfigurationModifier.java b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/FlightConfigurationModifier.java index 637369315..9f99b4b34 100644 --- a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/FlightConfigurationModifier.java +++ b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/FlightConfigurationModifier.java @@ -60,9 +60,7 @@ public class FlightConfigurationModifier extends AbstractSimulationModifier { methodName = methodName.substring(0, 1).toUpperCase(Locale.ENGLISH) + methodName.substring(1); getter = new Method(modifiedClass.getMethod("get" + methodName)); setter = new Method(modifiedClass.getMethod("set" + methodName, double.class)); - } catch (SecurityException e) { - throw new BugException("Trying to find method get/set" + methodName + " in class " + modifiedClass, e); - } catch (NoSuchMethodException e) { + } catch (SecurityException | NoSuchMethodException e) { throw new BugException("Trying to find method get/set" + methodName + " in class " + modifiedClass, e); } } diff --git a/core/src/main/java/info/openrocket/core/preset/loader/DoubleUnitColumnParser.java b/core/src/main/java/info/openrocket/core/preset/loader/DoubleUnitColumnParser.java index 18d100783..2ad67453e 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/DoubleUnitColumnParser.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/DoubleUnitColumnParser.java @@ -47,7 +47,6 @@ public class DoubleUnitColumnParser extends BaseUnitColumnParser { } props.put(propKey, value); - } catch (NumberFormatException nex) { } catch (IllegalArgumentException iae) { } } diff --git a/core/src/main/java/info/openrocket/core/util/Reflection.java b/core/src/main/java/info/openrocket/core/util/Reflection.java index a85c3a938..e209882a6 100644 --- a/core/src/main/java/info/openrocket/core/util/Reflection.java +++ b/core/src/main/java/info/openrocket/core/util/Reflection.java @@ -32,10 +32,7 @@ public class Reflection { public Object invoke(Object obj, Object... args) { try { return method.invoke(obj, args); - } catch (IllegalArgumentException e) { - throw new BugException("Error while invoking method '" + method + "'. " + - "Please report this as a bug.", e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new BugException("Error while invoking method '" + method + "'. " + "Please report this as a bug.", e); } catch (InvocationTargetException e) { @@ -132,8 +129,7 @@ public class Reflection { Class c = Class.forName(name); java.lang.reflect.Method m = c.getMethod(method, params); return new Reflection.Method(m); - } catch (ClassNotFoundException ignore) { - } catch (NoSuchMethodException ignore) { + } catch (ClassNotFoundException | NoSuchMethodException ignore) { } currentclass = currentclass.getSuperclass(); @@ -174,11 +170,7 @@ public class Reflection { return constructor.newInstance(params); } } catch (ClassNotFoundException ignore) { - } catch (IllegalArgumentException e) { - throw new BugException("Construction of " + name + " failed", e); - } catch (InstantiationException e) { - throw new BugException("Construction of " + name + " failed", e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException | InstantiationException e) { throw new BugException("Construction of " + name + " failed", e); } catch (InvocationTargetException e) { throw Reflection.handleWrappedException(e); 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 54495a291..358d60e25 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 @@ -792,9 +792,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat try { return (Double) getMethod.invoke(source) * multiplier; - } catch (IllegalArgumentException e) { - throw new BugException("Unable to invoke getMethod of " + this, e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new BugException("Unable to invoke getMethod of " + this, e); } catch (InvocationTargetException e) { throw Reflection.handleWrappedException(e); @@ -829,9 +827,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat setMethod.invoke(source, v / multiplier); // Make sure to notify all the listeners that have registered fireStateChanged(); - } catch (IllegalArgumentException e) { - throw new BugException("Unable to invoke setMethod of " + this, e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new BugException("Unable to invoke setMethod of " + this, e); } catch (InvocationTargetException e) { throw Reflection.handleWrappedException(e); @@ -855,9 +851,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat try { return (Boolean) getAutoMethod.invoke(source); - } catch (IllegalArgumentException e) { - throw new BugException("Method call failed", e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new BugException("Method call failed", e); } catch (InvocationTargetException e) { throw Reflection.handleWrappedException(e); @@ -881,9 +875,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat lastAutomatic = auto; try { setAutoMethod.invoke(source, auto); - } catch (IllegalArgumentException e) { - throw new BugException(e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new BugException(e); } catch (InvocationTargetException e) { throw Reflection.handleWrappedException(e); diff --git a/swing/src/main/java/info/openrocket/swing/gui/adaptors/IntegerModel.java b/swing/src/main/java/info/openrocket/swing/gui/adaptors/IntegerModel.java index d99d04294..731b6d203 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/adaptors/IntegerModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/adaptors/IntegerModel.java @@ -201,9 +201,7 @@ public class IntegerModel implements StateChangeListener, Invalidatable { public int getValue() { try { return (Integer) getMethod.invoke(source); - } catch (IllegalArgumentException e) { - throw new BugException(e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new BugException(e); } catch (InvocationTargetException e) { throw Reflection.handleWrappedException(e); @@ -224,9 +222,7 @@ public class IntegerModel implements StateChangeListener, Invalidatable { try { setMethod.invoke(source, v); fireStateChanged(); - } catch (IllegalArgumentException e) { - throw new BugException(e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new BugException(e); } catch (InvocationTargetException e) { throw Reflection.handleWrappedException(e); 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 5d159dfe7..2cb7ae562 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 @@ -461,9 +461,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable { RocketComponent component; try { component = (RocketComponent) constructor.newInstance(); - } catch (InstantiationException e) { - throw new BugException("Could not construct new instance of class " + constructor, e); - } catch (IllegalAccessException e) { + } catch (InstantiationException | IllegalAccessException e) { throw new BugException("Could not construct new instance of class " + constructor, e); } catch (InvocationTargetException e) { throw Reflection.handleWrappedException(e); diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/PrintController.java b/swing/src/main/java/info/openrocket/swing/gui/print/PrintController.java index b4b3ad9ee..e9091ed00 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/PrintController.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/PrintController.java @@ -158,9 +158,7 @@ public class PrintController { writer.close(); idoc.close(); } - catch (DocumentException e) { - } - catch (ExceptionConverter ec) { + catch (DocumentException | ExceptionConverter e) { } finally { if (outputFile != null) { From 7fd90efd3d4e8374a664a4c759c272e97c853555 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:17:34 +0200 Subject: [PATCH 09/25] Use Object.equals --- .../main/java/info/openrocket/core/preset/ComponentPreset.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java b/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java index 0b0ba1524..daea23cae 100644 --- a/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java +++ b/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java @@ -16,6 +16,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; import info.openrocket.core.material.Material; import info.openrocket.core.motor.Manufacturer; @@ -393,7 +394,7 @@ public class ComponentPreset implements Comparable, Serializabl ComponentPreset that = (ComponentPreset) o; - return digest != null ? digest.equals(that.digest) : that.digest == null; + return Objects.equals(digest, that.digest); } @Override From eaf59aeb754237eb796e1d0a74adac68ea03affe Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:18:08 +0200 Subject: [PATCH 10/25] Replace Collections.sort with List.sort --- .../openrocket/core/database/motor/ThrustCurveMotorSet.java | 2 +- .../general/multidim/MultidirectionalSearchOptimizer.java | 6 +++--- .../java/info/openrocket/core/preset/ComponentPreset.java | 2 +- .../core/preset/xml/OpenRocketComponentSaver.java | 4 ++-- core/src/main/java/info/openrocket/core/util/MathUtil.java | 2 +- .../openrocket/swing/gui/configdialog/FinSetConfig.java | 2 +- .../motor/thrustcurve/ThrustCurveMotorSelectionPanel.java | 4 ++-- .../java/info/openrocket/swing/gui/plot/SimulationPlot.java | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) 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 7d7997776..f15d19663 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 @@ -58,7 +58,7 @@ public class ThrustCurveMotorSet implements Comparable { if (!checkMotorOverwrite(motor)) { motors.add(motor); digestMap.put(motor, motor.getDigest()); - Collections.sort(motors, comparator); + motors.sort(comparator); } } diff --git a/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java b/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java index 1de7d5844..ac6e803ed 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java @@ -88,7 +88,7 @@ public class MultidirectionalSearchOptimizer implements FunctionOptimizer, Stati // TODO: Could something be computed in parallel? functionExecutor.compute(simplex); functionExecutor.waitFor(simplex); - Collections.sort(simplex, comparator); + simplex.sort(comparator); simplexComputed = true; } @@ -126,7 +126,7 @@ public class MultidirectionalSearchOptimizer implements FunctionOptimizer, Stati simplex.clear(); simplex.add(current); simplex.addAll(reflection); - Collections.sort(simplex, comparator); + simplex.sort(comparator); if (useExpansion) { @@ -147,7 +147,7 @@ public class MultidirectionalSearchOptimizer implements FunctionOptimizer, Stati simplex.add(current); simplex.addAll(expansion); step *= 2; - Collections.sort(simplex, comparator); + simplex.sort(comparator); expansionAcceptance++; } else { log.debug("Expansion failed"); diff --git a/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java b/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java index daea23cae..df3e00a8c 100644 --- a/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java +++ b/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java @@ -413,7 +413,7 @@ public class ComponentPreset implements Comparable, Serializabl List> keys = new ArrayList<>(properties.keySet()); - Collections.sort(keys, new Comparator<>() { + keys.sort(new Comparator<>() { @Override public int compare(TypedKey a, TypedKey b) { return a.getName().compareTo(b.getName()); diff --git a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java index d45d6a49e..03e812599 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java @@ -77,7 +77,7 @@ public class OpenRocketComponentSaver { // We're going to sort the initial data since that makes the output much easier // on the eyes. - Collections.sort(theMaterialList, new Comparator<>() { + theMaterialList.sort(new Comparator<>() { @Override public int compare(Material o1, Material o2) { @@ -86,7 +86,7 @@ public class OpenRocketComponentSaver { }); - Collections.sort(thePresetList, new Comparator<>() { + thePresetList.sort(new Comparator<>() { @Override public int compare(ComponentPreset o1, ComponentPreset o2) { diff --git a/core/src/main/java/info/openrocket/core/util/MathUtil.java b/core/src/main/java/info/openrocket/core/util/MathUtil.java index e12a29c81..64bc4a14a 100644 --- a/core/src/main/java/info/openrocket/core/util/MathUtil.java +++ b/core/src/main/java/info/openrocket/core/util/MathUtil.java @@ -303,7 +303,7 @@ public class MathUtil { } List sorted = new ArrayList<>(values); - Collections.sort(sorted, new Comparator<>() { + sorted.sort(new Comparator<>() { @Override public int compare(Number o1, Number o2) { return Double.compare(o1.doubleValue(), o2.doubleValue()); diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java index 412f9fb16..59c2f431a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java @@ -402,7 +402,7 @@ public abstract class FinSetConfig extends RocketComponentConfig { if (rings != null) { //Sort rings from top of parent to bottom - Collections.sort(rings, new Comparator<>() { + rings.sort(new Comparator<>() { @Override public int compare(CenteringRing centeringRing, CenteringRing centeringRing1) { return (int) (1000d * (centeringRing.getAxialOffset(AxialMethod.TOP) - diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index 438bec7ca..4055c445f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -581,7 +581,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec motors = filtered; } - Collections.sort(motors, MOTOR_COMPARATOR); + motors.sort(MOTOR_COMPARATOR); return motors; } @@ -665,7 +665,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec } // No motor has been used - Collections.sort(list, MOTOR_COMPARATOR); + list.sort(MOTOR_COMPARATOR); return list.get(0); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java index 47cffcf87..5078a5626 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java @@ -595,7 +595,7 @@ public class SimulationPlot { } } - Collections.sort(eventList, new Comparator<>() { + eventList.sort(new Comparator<>() { @Override public int compare(EventDisplayInfo o1, EventDisplayInfo o2) { From 0533ba23a089c7d1383ebc524b3beed470a1e6e2 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:18:30 +0200 Subject: [PATCH 11/25] Use Comparator.comparing --- .../gui/dialogs/optimization/GeneralOptimizationDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java index 342acb217..2622c0c7a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java @@ -1026,7 +1026,7 @@ public class GeneralOptimizationDialog extends JDialog { } for (List list : simulationModifiers.values()) { - list.sort((o1, o2) -> o1.getName().compareTo(o2.getName())); + list.sort(Comparator.comparing(SimulationModifier::getName)); } } From f28cf9acb820a72cc521e9ff42ad98abd575d453 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:18:45 +0200 Subject: [PATCH 12/25] Use RemoveIf --- .../openrocket/core/util/MemoryManagement.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/info/openrocket/core/util/MemoryManagement.java b/core/src/main/java/info/openrocket/core/util/MemoryManagement.java index 53774d81d..b840b4167 100644 --- a/core/src/main/java/info/openrocket/core/util/MemoryManagement.java +++ b/core/src/main/java/info/openrocket/core/util/MemoryManagement.java @@ -145,13 +145,7 @@ public final class MemoryManagement { */ private static void purgeCollectables() { int origCount = objects.size(); - Iterator iterator = objects.iterator(); - while (iterator.hasNext()) { - MemoryData data = iterator.next(); - if (data.getReference().get() == null) { - iterator.remove(); - } - } + objects.removeIf(data -> data.getReference().get() == null); log.debug(objects.size() + " of " + origCount + " objects remaining in discarded objects list after purge."); } @@ -160,13 +154,7 @@ public final class MemoryManagement { */ private static void purgeListeners() { int origCount = listenerLists.size(); - Iterator>> iterator = listenerLists.iterator(); - while (iterator.hasNext()) { - WeakReference> ref = iterator.next(); - if (ref.get() == null) { - iterator.remove(); - } - } + listenerLists.removeIf(ref -> ref.get() == null); log.debug(listenerLists.size() + " of " + origCount + " listener lists remaining after purge."); } From 71d1c02070d6944382314c44ac7ef25365130b43 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:19:07 +0200 Subject: [PATCH 13/25] Simplify map operations --- .../services/DefaultSimulationModifierService.java | 10 +++------- .../openrocket/core/thrustcurve/DownloadResponse.java | 6 +----- .../info/openrocket/swing/gui/dialogs/ScaleDialog.java | 6 +----- .../optimization/GeneralOptimizationDialog.java | 6 +----- .../openrocket/swing/gui/print/PrintableContext.java | 6 +----- 5 files changed, 7 insertions(+), 27 deletions(-) diff --git a/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java b/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java index 8775059e7..e2dfd8424 100644 --- a/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java +++ b/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java @@ -107,13 +107,9 @@ public class DefaultSimulationModifierService implements SimulationModifierServi Class componentClass, String methodName, String autoMethod) { String modifierDescriptionKey = modifierNameKey + ".desc"; - - List list = definitions.get(componentClass); - if (list == null) { - list = new ArrayList<>(); - definitions.put(componentClass, list); - } - + + List list = definitions.computeIfAbsent(componentClass, k -> new ArrayList<>()); + ModifierDefinition definition = new ModifierDefinition(modifierNameKey, modifierDescriptionKey, unitGroup, multiplier, componentClass, methodName, autoMethod); list.add(definition); diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java b/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java index 1b1c017cb..8f4762d55 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java @@ -12,11 +12,7 @@ public class DownloadResponse { private String error = null; public void add(MotorBurnFile mbd) { - List currentData = data.get(mbd.getMotorId()); - if (currentData == null) { - currentData = new ArrayList<>(); - data.put(mbd.getMotorId(), currentData); - } + List currentData = data.computeIfAbsent(mbd.getMotorId(), k -> new ArrayList<>()); currentData.add(mbd); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java index f16b302a2..c19a14985 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java @@ -205,11 +205,7 @@ public class ScaleDialog extends JDialog { private static void addScaler(Class componentClass, String methodName, String autoMethodName, Map, List> scaler) { - List list = scaler.get(componentClass); - if (list == null) { - list = new ArrayList<>(); - scaler.put(componentClass, list); - } + List list = scaler.computeIfAbsent(componentClass, k -> new ArrayList<>()); list.add(new GeneralScaler(componentClass, methodName, autoMethodName)); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java index 2622c0c7a..e0890c501 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java @@ -1017,11 +1017,7 @@ public class GeneralOptimizationDialog extends JDialog { for (SimulationModifier m : OptimizationServiceHelper.getSimulationModifiers(documentCopy)) { Object key = m.getRelatedObject(); - List list = simulationModifiers.get(key); - if (list == null) { - list = new ArrayList<>(); - simulationModifiers.put(key, list); - } + List list = simulationModifiers.computeIfAbsent(key, k -> new ArrayList<>()); list.add(m); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java index 899c12e92..ceb7e2e70 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java @@ -60,11 +60,7 @@ public class PrintableContext implements Comparable, Iterable< * @param thePrintable the printable to associate with the stage */ public void add(final Integer theStageNumber, final OpenRocketPrintable thePrintable) { - Set stages = previous.get(thePrintable); - if (stages == null) { - stages = new TreeSet<>(); - previous.put(thePrintable, stages); - } + Set stages = previous.computeIfAbsent(thePrintable, k -> new TreeSet<>()); if (theStageNumber != null) { stages.add(theStageNumber); } From 7678a1226fb911ce43deb42d5f5bca4c70224914 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:20:00 +0200 Subject: [PATCH 14/25] Use standard hashcode methods --- .../java/info/openrocket/core/logging/Warning.java | 10 +++------- .../src/main/java/info/openrocket/core/unit/Value.java | 4 +--- .../java/info/openrocket/core/util/Transformation.java | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) 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 572d7fd94..30bd9364b 100644 --- a/core/src/main/java/info/openrocket/core/logging/Warning.java +++ b/core/src/main/java/info/openrocket/core/logging/Warning.java @@ -276,17 +276,13 @@ public abstract class Warning extends Message { public int hashCode() { final int prime = 31; int result = super.hashCode(); - long temp; - temp = Double.doubleToLongBits(delay); - result = prime * result + (int) (temp ^ (temp >>> 32)); + result = prime * result + Double.hashCode(delay); result = prime * result + ((designation == null) ? 0 : designation.hashCode()); - temp = Double.doubleToLongBits(diameter); - result = prime * result + (int) (temp ^ (temp >>> 32)); + result = prime * result + Double.hashCode(diameter); result = prime * result + ((digest == null) ? 0 : digest.hashCode()); - temp = Double.doubleToLongBits(length); - result = prime * result + (int) (temp ^ (temp >>> 32)); + result = prime * result + Double.hashCode(length); result = prime * result + ((manufacturer == null) ? 0 : manufacturer.hashCode()); result = prime * result + ((type == null) ? 0 : type.hashCode()); diff --git a/core/src/main/java/info/openrocket/core/unit/Value.java b/core/src/main/java/info/openrocket/core/unit/Value.java index 2da905c2b..c38f16b77 100644 --- a/core/src/main/java/info/openrocket/core/unit/Value.java +++ b/core/src/main/java/info/openrocket/core/unit/Value.java @@ -105,9 +105,7 @@ public class Value implements Comparable { final int prime = 31; int result = 1; result = prime * result + ((unit == null) ? 0 : unit.hashCode()); - long temp; - temp = Double.doubleToLongBits(value); - result = prime * result + (int) (temp ^ (temp >>> 32)); + result = prime * result + Double.hashCode(value); return result; } diff --git a/core/src/main/java/info/openrocket/core/util/Transformation.java b/core/src/main/java/info/openrocket/core/util/Transformation.java index acf7bce87..17250a27d 100644 --- a/core/src/main/java/info/openrocket/core/util/Transformation.java +++ b/core/src/main/java/info/openrocket/core/util/Transformation.java @@ -340,7 +340,7 @@ public class Transformation implements java.io.Serializable { } } bits ^= translate.hashCode(); - return (int) (bits ^ (bits >>> 32)); + return Long.hashCode(bits); } /** From fd3f2e167ce6b0941cd16fbf82cfd8ed3c93c3c4 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:20:27 +0200 Subject: [PATCH 15/25] Use enhanced for-loops --- .../main/java/de/congrace/exp4j/Example.java | 6 +- .../aerodynamics/barrowman/FinSetCalc.java | 6 +- .../barrowman/TubeFinSetCalc.java | 4 +- .../database/ComponentPresetDatabase.java | 5 +- .../core/file/motor/RASPMotorLoader.java | 10 +-- .../core/file/openrocket/OpenRocketSaver.java | 4 +- .../rocksim/export/AbstractTransitionDTO.java | 51 ++++++----- .../core/file/rocksim/export/BodyTubeDTO.java | 89 +++++++++---------- .../file/rocksim/export/InnerBodyTubeDTO.java | 3 +- .../core/file/rocksim/export/StageDTO.java | 19 ++-- .../core/file/wavefrontobj/DefaultObj.java | 22 ++--- .../loader/RockSimComponentFileType.java | 11 ++- .../core/preset/xml/BaseComponentDTO.java | 3 +- .../preset/xml/OpenRocketComponentDTO.java | 6 +- .../openrocket/core/preset/xml/ShapeDTO.java | 11 ++- .../openrocket/core/unit/GeneralUnit.java | 10 +-- .../info/openrocket/core/unit/UnitGroup.java | 6 +- .../info/openrocket/core/util/ArrayUtils.java | 12 +-- .../core/util/PolyInterpolator.java | 4 +- .../core/util/QuaternionMultiply.java | 4 +- .../core/simulation/TestFlightData.java | 4 +- .../core/util/PolyInterpolatorTest.java | 12 +-- .../swing/gui/adaptors/DoubleModel.java | 4 +- .../swing/gui/configdialog/FinSetConfig.java | 12 ++- .../ThrustCurveMotorSelectionPanel.java | 3 +- .../gui/dialogs/preset/XTableColumnModel.java | 11 ++- .../swing/gui/figure3d/RocketRenderer.java | 6 +- .../swing/gui/figure3d/photo/PhotoFrame.java | 4 +- .../swing/gui/figure3d/photo/PhotoPanel.java | 6 +- .../swing/gui/main/ComponentAddButtons.java | 15 ++-- .../componenttree/ComponentTreeModel.java | 3 +- .../swing/gui/preset/PresetEditorDialog.java | 3 +- .../swing/gui/print/DesignReport.java | 3 +- .../gui/print/components/RocketPrintTree.java | 12 +-- .../swing/gui/scalefigure/RocketFigure.java | 4 +- .../gui/simulation/SimulationExportPanel.java | 6 +- .../swing/utils/SerializePresets.java | 18 ++-- 37 files changed, 199 insertions(+), 213 deletions(-) diff --git a/core/src/main/java/de/congrace/exp4j/Example.java b/core/src/main/java/de/congrace/exp4j/Example.java index 44d64fb2a..013a0c372 100644 --- a/core/src/main/java/de/congrace/exp4j/Example.java +++ b/core/src/main/java/de/congrace/exp4j/Example.java @@ -36,9 +36,9 @@ public class Example { } double subtotal = 0; - for (int i = 0; i < vals.length; i++ ){ - subtotal += vals[i]; - } + for (double val : vals) { + subtotal += val; + } subtotal = scale * subtotal / vals.length; return new Variable("double MEAN result, ", subtotal); diff --git a/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/FinSetCalc.java b/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/FinSetCalc.java index 9a44de768..cfc0cc8b9 100644 --- a/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/FinSetCalc.java +++ b/core/src/main/java/info/openrocket/core/aerodynamics/barrowman/FinSetCalc.java @@ -546,9 +546,9 @@ public class FinSetCalc extends RocketComponentCalc { // In between use interpolation polynomial double x = 1.0; double val = 0; - - for (int i = 0; i < poly.length; i++) { - val += poly[i] * x; + + for (double v : poly) { + val += v * x; x *= m; } // logger.debug("val = {}", val); 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 6689e4044..726e37b09 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 @@ -229,8 +229,8 @@ public class TubeFinSetCalc extends TubeCalc { double x = 1.0; double val = 0; - for (int i = 0; i < poly.length; i++) { - val += poly[i] * x; + for (double v : poly) { + val += v * x; x *= m; } // log.debug("val = {}", val); diff --git a/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java b/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java index c28177570..80831241b 100644 --- a/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java +++ b/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java @@ -87,8 +87,9 @@ public class ComponentPresetDatabase extends Database implement for (ComponentPreset preset : list) { ComponentPreset.Type presetType = preset.get(ComponentPreset.TYPE); - typeLoop: for (int i = 0; i < type.length; i++) { - if (presetType.equals(type[i])) { + typeLoop: + for (ComponentPreset.Type value : type) { + if (presetType.equals(value)) { result.add(preset); break typeLoop; // from inner loop. } diff --git a/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java b/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java index aac788b1c..419f69b71 100644 --- a/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java +++ b/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java @@ -114,13 +114,13 @@ public class RASPMotorLoader extends AbstractMotorLoader { } else { buf = split(pieces[3], "[-,]+"); - for (int i = 0; i < buf.length; i++) { - if (buf[i].equalsIgnoreCase("P") || - buf[i].equalsIgnoreCase("plugged")) { + for (String s : buf) { + if (s.equalsIgnoreCase("P") || + s.equalsIgnoreCase("plugged")) { delays.add(Motor.PLUGGED_DELAY); - } else if (buf[i].matches("[0-9]+")) { + } else if (s.matches("[0-9]+")) { // Many RASP files have "100" as an only delay - double d = Double.parseDouble(buf[i]); + double d = Double.parseDouble(s); if (d < 99) delays.add(d); } diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java index 3878fe24d..a8ad7bf6e 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java @@ -480,8 +480,8 @@ public class OpenRocketSaver extends RocketSaver { // Retrieve the data from the branch List> data = new ArrayList<>(types.length); - for (int i = 0; i < types.length; i++) { - data.add(branch.get(types[i])); + for (FlightDataType type : types) { + data.add(branch.get(type)); } // Build the tag diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java index a4011fe10..d521ad9c3 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java @@ -78,32 +78,31 @@ public class AbstractTransitionDTO extends BasePartDTO implements AttachablePart setWallThickness(nc.getThickness() * RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); List children = nc.getChildren(); - for (int i = 0; i < children.size(); i++) { - RocketComponent rocketComponents = children.get(i); - if (rocketComponents instanceof InnerTube) { - addAttachedPart(new InnerBodyTubeDTO((InnerTube) rocketComponents, this)); - } else if (rocketComponents instanceof BodyTube) { - addAttachedPart(new BodyTubeDTO((BodyTube) rocketComponents)); - } else if (rocketComponents instanceof Transition) { - addAttachedPart(new TransitionDTO((Transition) rocketComponents)); - } else if (rocketComponents instanceof EngineBlock) { - addAttachedPart(new EngineBlockDTO((EngineBlock) rocketComponents)); - } else if (rocketComponents instanceof TubeCoupler) { - addAttachedPart(new TubeCouplerDTO((TubeCoupler) rocketComponents, this)); - } else if (rocketComponents instanceof CenteringRing) { - addAttachedPart(new CenteringRingDTO((CenteringRing) rocketComponents)); - } else if (rocketComponents instanceof Bulkhead) { - addAttachedPart(new BulkheadDTO((Bulkhead) rocketComponents)); - } else if (rocketComponents instanceof Parachute) { - addAttachedPart(new ParachuteDTO((Parachute) rocketComponents)); - } else if (rocketComponents instanceof MassObject) { - addAttachedPart(new MassObjectDTO((MassObject) rocketComponents)); - } else if (rocketComponents instanceof FreeformFinSet) { - addAttachedPart(new CustomFinSetDTO((FreeformFinSet) rocketComponents)); - } else if (rocketComponents instanceof FinSet) { - addAttachedPart(new FinSetDTO((FinSet) rocketComponents)); - } - } + for (RocketComponent rocketComponents : children) { + if (rocketComponents instanceof InnerTube) { + addAttachedPart(new InnerBodyTubeDTO((InnerTube) rocketComponents, this)); + } else if (rocketComponents instanceof BodyTube) { + addAttachedPart(new BodyTubeDTO((BodyTube) rocketComponents)); + } else if (rocketComponents instanceof Transition) { + addAttachedPart(new TransitionDTO((Transition) rocketComponents)); + } else if (rocketComponents instanceof EngineBlock) { + addAttachedPart(new EngineBlockDTO((EngineBlock) rocketComponents)); + } else if (rocketComponents instanceof TubeCoupler) { + addAttachedPart(new TubeCouplerDTO((TubeCoupler) rocketComponents, this)); + } else if (rocketComponents instanceof CenteringRing) { + addAttachedPart(new CenteringRingDTO((CenteringRing) rocketComponents)); + } else if (rocketComponents instanceof Bulkhead) { + addAttachedPart(new BulkheadDTO((Bulkhead) rocketComponents)); + } else if (rocketComponents instanceof Parachute) { + addAttachedPart(new ParachuteDTO((Parachute) rocketComponents)); + } else if (rocketComponents instanceof MassObject) { + addAttachedPart(new MassObjectDTO((MassObject) rocketComponents)); + } else if (rocketComponents instanceof FreeformFinSet) { + addAttachedPart(new CustomFinSetDTO((FreeformFinSet) rocketComponents)); + } else if (rocketComponents instanceof FinSet) { + addAttachedPart(new FinSetDTO((FinSet) rocketComponents)); + } + } } public int getShapeCode() { diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java index deb3a6b2f..4e83cf81c 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java @@ -94,51 +94,50 @@ public class BodyTubeDTO extends BasePartDTO implements AttachableParts { setMotorMount(theORBodyTube.isMotorMount()); List children = theORBodyTube.getChildren(); - for (int i = 0; i < children.size(); i++) { - RocketComponent rocketComponent = children.get(i); - if (rocketComponent instanceof InnerTube) { - final InnerTube innerTube = (InnerTube) rocketComponent; - final InnerBodyTubeDTO innerBodyTubeDTO = new InnerBodyTubeDTO(innerTube, this); - //Only add the inner tube if it is NOT a cluster. - if (innerTube.getInstanceCount() == 1) { - addAttachedPart(innerBodyTubeDTO); - } - } else if (rocketComponent instanceof BodyTube) { - addAttachedPart(new BodyTubeDTO((BodyTube) rocketComponent)); - } else if (rocketComponent instanceof Transition) { - addAttachedPart(new TransitionDTO((Transition) rocketComponent)); - } else if (rocketComponent instanceof EngineBlock) { - addAttachedPart(new EngineBlockDTO((EngineBlock) rocketComponent)); - } else if (rocketComponent instanceof TubeCoupler) { - addAttachedPart(new TubeCouplerDTO((TubeCoupler) rocketComponent, this)); - } else if (rocketComponent instanceof CenteringRing) { - addAttachedPart(new CenteringRingDTO((CenteringRing) rocketComponent)); - } else if (rocketComponent instanceof Bulkhead) { - addAttachedPart(new BulkheadDTO((Bulkhead) rocketComponent)); - } else if (rocketComponent instanceof LaunchLug) { - addAttachedPart(new LaunchLugDTO((LaunchLug) rocketComponent)); - } else if (rocketComponent instanceof Streamer) { - addAttachedPart(new StreamerDTO((Streamer) rocketComponent)); - } else if (rocketComponent instanceof Parachute) { - addAttachedPart(new ParachuteDTO((Parachute) rocketComponent)); - } else if (rocketComponent instanceof MassObject) { - addAttachedPart(new MassObjectDTO((MassObject) rocketComponent)); - } else if (rocketComponent instanceof FreeformFinSet) { - addAttachedPart(new CustomFinSetDTO((FreeformFinSet) rocketComponent)); - } else if (rocketComponent instanceof FinSet) { - addAttachedPart(new FinSetDTO((FinSet) rocketComponent)); - } else if (rocketComponent instanceof TubeFinSet) { - addAttachedPart(new TubeFinSetDTO((TubeFinSet) rocketComponent)); - } else if (rocketComponent instanceof PodSet) { - for (PodSetDTO podSetDTO : PodSetDTO.generatePodSetDTOs((PodSet) rocketComponent)) { - addAttachedPart(podSetDTO); - } - } else if (rocketComponent instanceof ParallelStage) { - for (ParallelStageDTO parallelStageDTO : ParallelStageDTO.generateParallelStageDTOs((ParallelStage) rocketComponent)) { - addAttachedPart(parallelStageDTO); - } - } - } + for (RocketComponent rocketComponent : children) { + if (rocketComponent instanceof InnerTube) { + final InnerTube innerTube = (InnerTube) rocketComponent; + final InnerBodyTubeDTO innerBodyTubeDTO = new InnerBodyTubeDTO(innerTube, this); + //Only add the inner tube if it is NOT a cluster. + if (innerTube.getInstanceCount() == 1) { + addAttachedPart(innerBodyTubeDTO); + } + } else if (rocketComponent instanceof BodyTube) { + addAttachedPart(new BodyTubeDTO((BodyTube) rocketComponent)); + } else if (rocketComponent instanceof Transition) { + addAttachedPart(new TransitionDTO((Transition) rocketComponent)); + } else if (rocketComponent instanceof EngineBlock) { + addAttachedPart(new EngineBlockDTO((EngineBlock) rocketComponent)); + } else if (rocketComponent instanceof TubeCoupler) { + addAttachedPart(new TubeCouplerDTO((TubeCoupler) rocketComponent, this)); + } else if (rocketComponent instanceof CenteringRing) { + addAttachedPart(new CenteringRingDTO((CenteringRing) rocketComponent)); + } else if (rocketComponent instanceof Bulkhead) { + addAttachedPart(new BulkheadDTO((Bulkhead) rocketComponent)); + } else if (rocketComponent instanceof LaunchLug) { + addAttachedPart(new LaunchLugDTO((LaunchLug) rocketComponent)); + } else if (rocketComponent instanceof Streamer) { + addAttachedPart(new StreamerDTO((Streamer) rocketComponent)); + } else if (rocketComponent instanceof Parachute) { + addAttachedPart(new ParachuteDTO((Parachute) rocketComponent)); + } else if (rocketComponent instanceof MassObject) { + addAttachedPart(new MassObjectDTO((MassObject) rocketComponent)); + } else if (rocketComponent instanceof FreeformFinSet) { + addAttachedPart(new CustomFinSetDTO((FreeformFinSet) rocketComponent)); + } else if (rocketComponent instanceof FinSet) { + addAttachedPart(new FinSetDTO((FinSet) rocketComponent)); + } else if (rocketComponent instanceof TubeFinSet) { + addAttachedPart(new TubeFinSetDTO((TubeFinSet) rocketComponent)); + } else if (rocketComponent instanceof PodSet) { + for (PodSetDTO podSetDTO : PodSetDTO.generatePodSetDTOs((PodSet) rocketComponent)) { + addAttachedPart(podSetDTO); + } + } else if (rocketComponent instanceof ParallelStage) { + for (ParallelStageDTO parallelStageDTO : ParallelStageDTO.generateParallelStageDTOs((ParallelStage) rocketComponent)) { + addAttachedPart(parallelStageDTO); + } + } + } } public double getOD() { diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/InnerBodyTubeDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/InnerBodyTubeDTO.java index b5a13f346..795a27cef 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/InnerBodyTubeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/InnerBodyTubeDTO.java @@ -58,8 +58,7 @@ public class InnerBodyTubeDTO extends BodyTubeDTO implements AttachableParts { setRadialLoc(bt.getRadialPosition() * RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); List children = bt.getChildren(); - for (int i = 0; i < children.size(); i++) { - RocketComponent rocketComponents = children.get(i); + for (RocketComponent rocketComponents : children) { if (rocketComponents instanceof InnerTube) { final InnerTube innerTube = (InnerTube) rocketComponents; // Only if the inner tube is NOT a cluster, then create the corresponding diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java index b6dbfecf6..db856658e 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java @@ -76,16 +76,15 @@ public class StageDTO { } List children = theORStage.getChildren(); - for (int i = 0; i < children.size(); i++) { - RocketComponent rocketComponents = children.get(i); - if (rocketComponents instanceof NoseCone) { - addExternalPart(toNoseConeDTO((NoseCone) rocketComponents)); - } else if (rocketComponents instanceof BodyTube) { - addExternalPart(toBodyTubeDTO((BodyTube) rocketComponents)); - } else if (rocketComponents instanceof Transition) { - addExternalPart(toTransitionDTO((Transition) rocketComponents)); - } - } + for (RocketComponent rocketComponents : children) { + if (rocketComponents instanceof NoseCone) { + addExternalPart(toNoseConeDTO((NoseCone) rocketComponents)); + } else if (rocketComponents instanceof BodyTube) { + addExternalPart(toBodyTubeDTO((BodyTube) rocketComponents)); + } else if (rocketComponents instanceof Transition) { + addExternalPart(toTransitionDTO((Transition) rocketComponents)); + } + } } public List getExternalPart() { diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObj.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObj.java index 66d76cae0..ae2cc6aff 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObj.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObj.java @@ -603,17 +603,17 @@ public final class DefaultObj implements Obj { if (indices == null) { return; } - for (int i = 0; i < indices.length; i++) { - if (indices[i] < 0) { - throw new IllegalArgumentException( - name + " index is negative: " + indices[i]); - } - if (indices[i] >= max) { - throw new IllegalArgumentException( - name + " index is " + indices[i] + - ", but must be smaller than " + max); - } - } + for (int index : indices) { + if (index < 0) { + throw new IllegalArgumentException( + name + " index is negative: " + index); + } + if (index >= max) { + throw new IllegalArgumentException( + name + " index is " + index + + ", but must be smaller than " + max); + } + } } /** diff --git a/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileType.java b/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileType.java index 82a1667c9..b449ce932 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileType.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileType.java @@ -76,12 +76,11 @@ public enum RockSimComponentFileType { */ public static RockSimComponentFileType determineType(String[] headers) { RockSimComponentFileType[] types = values(); - for (int i = 0; i < types.length; i++) { - RockSimComponentFileType type = types[i]; - if (Arrays.equals(headers, type.columns)) { - return type; - } - } + for (RockSimComponentFileType type : types) { + if (Arrays.equals(headers, type.columns)) { + return type; + } + } return null; } } diff --git a/core/src/main/java/info/openrocket/core/preset/xml/BaseComponentDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/BaseComponentDTO.java index 529873964..4c56c4a92 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/BaseComponentDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/BaseComponentDTO.java @@ -186,8 +186,7 @@ public abstract class BaseComponentDTO { if (dto == null) { return null; } - for (int i = 0; i < materialList.size(); i++) { - MaterialDTO materialDTO = materialList.get(i); + for (MaterialDTO materialDTO : materialList) { if (materialDTO.getType().name().equals(dto.type) && materialDTO.getName().equals(dto.material)) { return materialDTO.asMaterial(); } 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 dec18a69b..162996822 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 @@ -98,9 +98,9 @@ public class OpenRocketComponentDTO { public List asComponentPresets() throws InvalidComponentPresetException { List result = new ArrayList<>(components.size()); - for (int i = 0; i < components.size(); i++) { - result.add(components.get(i).asComponentPreset(getLegacy(), materials)); - } + for (BaseComponentDTO component : components) { + result.add(component.asComponentPreset(getLegacy(), materials)); + } return result; } diff --git a/core/src/main/java/info/openrocket/core/preset/xml/ShapeDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/ShapeDTO.java index b8c4fd7bb..3623b9649 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/ShapeDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/ShapeDTO.java @@ -26,12 +26,11 @@ public enum ShapeDTO { public static ShapeDTO asDTO(Transition.Shape targetShape) { ShapeDTO[] values = values(); - for (int i = 0; i < values.length; i++) { - ShapeDTO value = values[i]; - if (value.corollary.equals(targetShape)) { - return value; - } - } + for (ShapeDTO value : values) { + if (value.corollary.equals(targetShape)) { + return value; + } + } return ELLIPSOID; // default } diff --git a/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java b/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java index eba013def..31531bcdf 100644 --- a/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java +++ b/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java @@ -208,15 +208,15 @@ public class GeneralUnit extends Unit { private static void printTicks(double start, double end, double minor, double major) { Tick[] ticks = Unit.NOUNIT.getTicks(start, end, minor, major); String str = "Ticks for ("+start+","+end+","+minor+","+major+"):"; - for (int i=0; i d.width) { param = param + ",newline"; w = GAP + width; } - if (col == buttons[row].length - 1) + if (col == button.length - 1) param = param + ",wrap"; - layout.setComponentConstraints(buttons[row][col], param); + layout.setComponentConstraints(button[col], param); } } revalidate(); @@ -408,8 +408,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable { public void setEnabled(boolean enabled) { super.setEnabled(enabled); Component[] c = getComponents(); - for (int i = 0; i < c.length; i++) - c[i].setEnabled(enabled); + for (Component component : c) component.setEnabled(enabled); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java b/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java index 14a9a815b..29c1c88c4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java @@ -114,8 +114,7 @@ public class ComponentTreeModel implements TreeModel, ComponentChangeListener { // Send structure change event TreeModelEvent e = new TreeModelEvent(this, path); Object[] l = listeners.toArray(); - for (int i = 0; i < l.length; i++) - ((TreeModelListener) l[i]).treeStructureChanged(e); + for (Object o : l) ((TreeModelListener) o).treeStructureChanged(e); // Re-expand the paths for (UUID id : expanded) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java b/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java index d59087904..988ea6aef 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java @@ -2293,8 +2293,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { StringBuilder stringBuilder = new StringBuilder(); List invalids = e.getErrors(); stringBuilder.append(baseMsg).append("\n"); - for (int i = 0; i < invalids.size(); i++) { - String s = invalids.get(i); + for (String s : invalids) { stringBuilder.append(s).append("\n"); } 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 45744ab32..d01ce94ff 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 @@ -577,8 +577,7 @@ public class DesignReport { private FlightData findSimulation(final FlightConfigurationId motorId, List simulations) { // Perform flight simulation FlightData flight = null; - for (int i = 0; i < simulations.size(); i++) { - Simulation simulation = simulations.get(i); + for (Simulation simulation : simulations) { if (Utils.equals(simulation.getId(), motorId)) { flight = simulation.getSimulatedData(); break; diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java b/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java index c95623614..e65c530c7 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java @@ -78,10 +78,10 @@ public class RocketPrintTree extends JTree { } List unstaged = OpenRocketPrintable.getUnstaged(); - for (int i = 0; i < unstaged.size(); i++) { - toAddTo.add(new CheckBoxNode(unstaged.get(i).getDescription(), - INITIAL_CHECKBOX_SELECTED)); - } + for (OpenRocketPrintable openRocketPrintable : unstaged) { + toAddTo.add(new CheckBoxNode(openRocketPrintable.getDescription(), + INITIAL_CHECKBOX_SELECTED)); + } RocketPrintTree tree = new RocketPrintTree(root); @@ -247,8 +247,8 @@ class NamedVector extends Vector { public NamedVector(String theName, CheckBoxNode elements[]) { name = theName; - for (int i = 0, n = elements.length; i < n; i++) { - add(elements[i]); + for (CheckBoxNode element : elements) { + add(element); } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java index ed89dec83..06e83c6eb 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java @@ -277,8 +277,8 @@ public class RocketFigure extends AbstractScaleFigure { boolean selected = false; // Check if component is in the selection - for (int j = 0; j < selection.length; j++) { - if (c == selection[j]) { + for (RocketComponent rocketComponent : selection) { + if (c == rocketComponent) { selected = true; break; } diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java index 9ea7d2ead..142cb1024 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java @@ -286,9 +286,9 @@ public class SimulationExportPanel extends JPanel { int total = selected.length; int n = 0; String str; - - for (int i = 0; i < selected.length; i++) { - if (selected[i]) + + for (boolean b : selected) { + if (b) n++; } diff --git a/swing/src/main/java/info/openrocket/swing/utils/SerializePresets.java b/swing/src/main/java/info/openrocket/swing/utils/SerializePresets.java index ba9449437..fe93d0ab5 100644 --- a/swing/src/main/java/info/openrocket/swing/utils/SerializePresets.java +++ b/swing/src/main/java/info/openrocket/swing/utils/SerializePresets.java @@ -40,25 +40,25 @@ public class SerializePresets extends BasicApplication { ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase(); - for (int i = 0; i < args.length; i++) { + for (String arg : args) { - System.err.println("Processing .orc files in directory " + args[i]); - - FileIterator iterator = DirectoryIterator.findDirectory(args[i], new SimpleFileFilter("", false, "orc")); + System.err.println("Processing .orc files in directory " + arg); + + FileIterator iterator = DirectoryIterator.findDirectory(arg, new SimpleFileFilter("", false, "orc")); if (iterator == null) { - throw new RuntimeException("Can't find " + args[i] + " directory"); + throw new RuntimeException("Can't find " + arg + " directory"); } - + while (iterator.hasNext()) { Pair f = iterator.next(); String fileName = f.getU().getName(); InputStream is = f.getV(); - + OpenRocketComponentLoader loader = new OpenRocketComponentLoader(); Collection presets = loader.load(is, fileName); - + componentPresetDao.addAll(presets); - + } } From 49523200307e7ae3fd5e94ab6c779ad02ae88334 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:20:51 +0200 Subject: [PATCH 16/25] Use String.contains --- core/src/main/java/info/openrocket/core/arch/SystemInfo.java | 4 ++-- .../info/openrocket/core/communication/BugReportTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/info/openrocket/core/arch/SystemInfo.java b/core/src/main/java/info/openrocket/core/arch/SystemInfo.java index 905b97702..d6aebe872 100644 --- a/core/src/main/java/info/openrocket/core/arch/SystemInfo.java +++ b/core/src/main/java/info/openrocket/core/arch/SystemInfo.java @@ -28,9 +28,9 @@ public class SystemInfo { public static Platform getPlatform() { String os = System.getProperty("os.name").toLowerCase(Locale.ENGLISH); - if (os.indexOf("win") >= 0) { + if (os.contains("win")) { return Platform.WINDOWS; - } else if (os.indexOf("mac") >= 0) { + } else if (os.contains("mac")) { return Platform.MAC_OS; } else { /* diff --git a/core/src/test/java/info/openrocket/core/communication/BugReportTest.java b/core/src/test/java/info/openrocket/core/communication/BugReportTest.java index e077211db..55c9c9b8b 100644 --- a/core/src/test/java/info/openrocket/core/communication/BugReportTest.java +++ b/core/src/test/java/info/openrocket/core/communication/BugReportTest.java @@ -44,8 +44,8 @@ public class BugReportTest { check(connection); String msg = connection.getOutputStreamString(); - assertTrue(msg.indexOf("version=" + BuildProperties.getVersion()) >= 0); - assertTrue(msg.indexOf(Communicator.encode(message)) >= 0); + assertTrue(msg.contains("version=" + BuildProperties.getVersion())); + assertTrue(msg.contains(Communicator.encode(message))); } @Test From aebb8b87d29cad20bce91d5fce83134b6067b2ee Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:22:01 +0200 Subject: [PATCH 17/25] Use enhanced switch --- .../java/de/congrace/exp4j/FunctionToken.java | 67 +++++-------- .../java/de/congrace/exp4j/OperatorToken.java | 80 ++++++---------- .../info/openrocket/core/arch/SystemInfo.java | 10 +- .../openrocket/core/database/Databases.java | 16 ++-- .../openrocket/core/file/TipShapeCode.java | 16 ++-- .../file/openrocket/savers/FinSetSaver.java | 17 ++-- .../file/rocksim/importt/FinSetHandler.java | 16 ++-- .../openrocket/core/material/Material.java | 44 +++------ .../core/preset/loader/MaterialHolder.java | 16 ++-- .../preset/xml/OpenRocketComponentSaver.java | 40 +++----- .../scripting/GraalJSScriptEngineFactory.java | 22 ++--- .../openrocket/core/startup/Preferences.java | 17 ++-- .../SerializeThrustcurveMotors.java | 21 ++-- .../core/file/iterator/TestFileIterator.java | 13 +-- .../core/simulation/FlightEventsTest.java | 95 +++++++++---------- .../swing/gui/configdialog/RocketConfig.java | 30 +++--- .../MotorMountTableModel.java | 30 ++---- .../GeneralOptimizationDialog.java | 57 ++++------- .../preferences/MaterialEditPanel.java | 38 +++----- .../dialogs/preferences/PreferencesPanel.java | 15 +-- .../swing/gui/figure3d/FigureRenderer.java | 22 ++--- .../swing/gui/figure3d/RealisticRenderer.java | 19 ++-- .../swing/gui/figure3d/RocketFigure3d.java | 19 ++-- .../swing/gui/main/ComponentAddButtons.java | 52 +++++----- .../gui/main/FlightConfigurationPanel.java | 34 +++---- .../swing/gui/scalefigure/RocketFigure.java | 18 +--- .../gui/simulation/SimulationExportPanel.java | 78 ++++++--------- .../gui/simulation/SimulationPlotPanel.java | 30 ++---- .../logging/LogbackBufferLoggerAdaptor.java | 22 ++--- 29 files changed, 356 insertions(+), 598 deletions(-) diff --git a/core/src/main/java/de/congrace/exp4j/FunctionToken.java b/core/src/main/java/de/congrace/exp4j/FunctionToken.java index 385ecda7a..32344611d 100644 --- a/core/src/main/java/de/congrace/exp4j/FunctionToken.java +++ b/core/src/main/java/de/congrace/exp4j/FunctionToken.java @@ -93,50 +93,29 @@ class FunctionToken extends CalculationToken { * The actual function application on a double */ private double applyFunction(double x){ - switch (function) { - case ABS: - return Math.abs(x); - case ACOS: - return Math.acos(x); - case ASIN: - return Math.asin(x); - case ATAN: - return Math.atan(x); - case CBRT: - return Math.cbrt(x); - case CEIL: - return Math.ceil(x); - case COS: - return Math.cos(x); - case COSH: - return Math.cosh(x); - case EXP: - return Math.exp(x); - case EXPM1: - return Math.expm1(x); - case FLOOR: - return Math.floor(x); - case ROUND: - return Math.round(x); - case RANDOM: - return Math.random()*x; - case LOG: - return Math.log(x); - case LOG10: - return Math.log10(x); - case SIN: - return Math.sin(x); - case SINH: - return Math.sinh(x); - case SQRT: - return Math.sqrt(x); - case TAN: - return Math.tan(x); - case TANH: - return Math.tanh(x); - default: - return Double.NaN; // should not happen ;) - } + return switch (function) { + case ABS -> Math.abs(x); + case ACOS -> Math.acos(x); + case ASIN -> Math.asin(x); + case ATAN -> Math.atan(x); + case CBRT -> Math.cbrt(x); + case CEIL -> Math.ceil(x); + case COS -> Math.cos(x); + case COSH -> Math.cosh(x); + case EXP -> Math.exp(x); + case EXPM1 -> Math.expm1(x); + case FLOOR -> Math.floor(x); + case ROUND -> Math.round(x); + case RANDOM -> Math.random() * x; + case LOG -> Math.log(x); + case LOG10 -> Math.log10(x); + case SIN -> Math.sin(x); + case SINH -> Math.sinh(x); + case SQRT -> Math.sqrt(x); + case TAN -> Math.tan(x); + case TANH -> Math.tanh(x); + default -> Double.NaN; // should not happen ;) + }; } /** diff --git a/core/src/main/java/de/congrace/exp4j/OperatorToken.java b/core/src/main/java/de/congrace/exp4j/OperatorToken.java index 765f45083..3d7d0b353 100644 --- a/core/src/main/java/de/congrace/exp4j/OperatorToken.java +++ b/core/src/main/java/de/congrace/exp4j/OperatorToken.java @@ -50,24 +50,16 @@ class OperatorToken extends CalculationToken { * @return the corresponding {@link Operation} */ static Operation getOperation(char c) { - switch (c) { - case '+': - return Operation.ADDITION; - case '-': - return Operation.SUBTRACTION; - case '*': - return Operation.MULTIPLICATION; - case '/': - return Operation.DIVISION; - case '^': - return Operation.EXPONENTIATION; - case '#': - return Operation.UNARY_MINUS; - case '%': - return Operation.MODULO; - default: - return null; - } + return switch (c) { + case '+' -> Operation.ADDITION; + case '-' -> Operation.SUBTRACTION; + case '*' -> Operation.MULTIPLICATION; + case '/' -> Operation.DIVISION; + case '^' -> Operation.EXPONENTIATION; + case '#' -> Operation.UNARY_MINUS; + case '%' -> Operation.MODULO; + default -> null; + }; } static boolean isOperator(char c) { @@ -132,27 +124,18 @@ class OperatorToken extends CalculationToken { private double applyOperation(double[] values){ //System.out.println("Applying "+operation.toString()+" to values starting "+values[0]); - - switch (operation) { - case ADDITION: - return values[0] + values[1]; - case SUBTRACTION: - return values[0] - values[1]; - case MULTIPLICATION: - return values[0] * values[1]; - case EXPONENTIATION: - return Math.pow(values[0], values[1]); - case DIVISION: - return values[0] / values[1]; - case UNARY_MINUS: - return -values[0]; - case UNARY_PLUS: - return values[0]; - case MODULO: - return values[0] % values[1]; - default: - return 0; - } + + return switch (operation) { + case ADDITION -> values[0] + values[1]; + case SUBTRACTION -> values[0] - values[1]; + case MULTIPLICATION -> values[0] * values[1]; + case EXPONENTIATION -> Math.pow(values[0], values[1]); + case DIVISION -> values[0] / values[1]; + case UNARY_MINUS -> -values[0]; + case UNARY_PLUS -> values[0]; + case MODULO -> values[0] % values[1]; + default -> 0; + }; } @Override @@ -165,20 +148,11 @@ class OperatorToken extends CalculationToken { } int getOperandCount() { - switch (operation) { - case ADDITION: - case SUBTRACTION: - case MULTIPLICATION: - case DIVISION: - case EXPONENTIATION: - case MODULO: - return 2; - case UNARY_MINUS: - case UNARY_PLUS: - return 1; - default: - return 0; - } + return switch (operation) { + case ADDITION, SUBTRACTION, MULTIPLICATION, DIVISION, EXPONENTIATION, MODULO -> 2; + case UNARY_MINUS, UNARY_PLUS -> 1; + default -> 0; + }; } /** diff --git a/core/src/main/java/info/openrocket/core/arch/SystemInfo.java b/core/src/main/java/info/openrocket/core/arch/SystemInfo.java index d6aebe872..c3889f31b 100644 --- a/core/src/main/java/info/openrocket/core/arch/SystemInfo.java +++ b/core/src/main/java/info/openrocket/core/arch/SystemInfo.java @@ -51,12 +51,10 @@ public class SystemInfo { * otherwise */ public static boolean isConfined() { - switch (getPlatform()) { - case UNIX: - return (System.getenv("SNAP_VERSION") != null); - default: - return false; - } + return switch (getPlatform()) { + case UNIX -> (System.getenv("SNAP_VERSION") != null); + default -> false; + }; } /** diff --git a/core/src/main/java/info/openrocket/core/database/Databases.java b/core/src/main/java/info/openrocket/core/database/Databases.java index f60171f63..8b766cb79 100644 --- a/core/src/main/java/info/openrocket/core/database/Databases.java +++ b/core/src/main/java/info/openrocket/core/database/Databases.java @@ -203,16 +203,12 @@ public class Databases { * @return the database of the type given */ private static Database getDatabase(Material.Type type){ - switch (type) { - case BULK: - return BULK_MATERIAL; - case SURFACE: - return SURFACE_MATERIAL; - case LINE: - return LINE_MATERIAL; - default: - throw new IllegalArgumentException("Illegal material type: " + type); - } + return switch (type) { + case BULK -> BULK_MATERIAL; + case SURFACE -> SURFACE_MATERIAL; + case LINE -> LINE_MATERIAL; + default -> throw new IllegalArgumentException("Illegal material type: " + type); + }; } diff --git a/core/src/main/java/info/openrocket/core/file/TipShapeCode.java b/core/src/main/java/info/openrocket/core/file/TipShapeCode.java index 087bc87ea..98ca0c098 100644 --- a/core/src/main/java/info/openrocket/core/file/TipShapeCode.java +++ b/core/src/main/java/info/openrocket/core/file/TipShapeCode.java @@ -14,16 +14,12 @@ public final class TipShapeCode { * @return a CrossSection instance */ public static FinSet.CrossSection convertTipShapeCode(int tipShape) { - switch (tipShape) { - case 0: - return FinSet.CrossSection.SQUARE; - case 1: - return FinSet.CrossSection.ROUNDED; - case 2: - return FinSet.CrossSection.AIRFOIL; - default: - return FinSet.CrossSection.SQUARE; - } + return switch (tipShape) { + case 0 -> FinSet.CrossSection.SQUARE; + case 1 -> FinSet.CrossSection.ROUNDED; + case 2 -> FinSet.CrossSection.AIRFOIL; + default -> FinSet.CrossSection.SQUARE; + }; } public static int convertTipShapeCode(FinSet.CrossSection cs) { 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 77268ac30..aa5fb1c16 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 @@ -33,17 +33,12 @@ public class FinSetSaver extends ExternalComponentSaver { // anymore String offset = "center"; double offsetVal = fins.getTabOffset(); - switch (fins.getTabOffsetMethod()) { - case TOP: - offset = "front"; - break; - case BOTTOM: - offset = "end"; - break; - case MIDDLE: - offset = "center"; - break; - } + offset = switch (fins.getTabOffsetMethod()) { + case TOP -> "front"; + case BOTTOM -> "end"; + case MIDDLE -> "center"; + default -> offset; + }; elements.add("" + offsetVal + ""); elements.add(" FinSet.CrossSection.SQUARE; + case 1 -> FinSet.CrossSection.ROUNDED; + case 2 -> FinSet.CrossSection.AIRFOIL; + default -> FinSet.CrossSection.SQUARE; + }; } public static int convertTipShapeCode(FinSet.CrossSection cs) { diff --git a/core/src/main/java/info/openrocket/core/material/Material.java b/core/src/main/java/info/openrocket/core/material/Material.java index 3230e1647..1e1627ae9 100644 --- a/core/src/main/java/info/openrocket/core/material/Material.java +++ b/core/src/main/java/info/openrocket/core/material/Material.java @@ -191,22 +191,13 @@ public abstract class Material implements Comparable { * @return the new material */ public static Material newMaterial(Type type, String name, double density, boolean userDefined) { - switch (type) { - case LINE: - return new Material.Line(name, density, userDefined); - - case SURFACE: - return new Material.Surface(name, density, userDefined); - - case BULK: - return new Material.Bulk(name, density, userDefined); - - case CUSTOM: - return new Material.Custom(name, density, userDefined); - - default: - throw new IllegalArgumentException("Unknown material type: " + type); - } + return switch (type) { + case LINE -> new Line(name, density, userDefined); + case SURFACE -> new Surface(name, density, userDefined); + case BULK -> new Bulk(name, density, userDefined); + case CUSTOM -> new Custom(name, density, userDefined); + default -> throw new IllegalArgumentException("Unknown material type: " + type); + }; } public String toStorableString() { @@ -247,20 +238,13 @@ public abstract class Material implements Comparable { } catch (NumberFormatException e) { throw new IllegalArgumentException("Illegal material string: " + str, e); } - - switch (type) { - case BULK: - return new Material.Bulk(name, density, userDefined); - - case SURFACE: - return new Material.Surface(name, density, userDefined); - - case LINE: - return new Material.Line(name, density, userDefined); - - default: - throw new IllegalArgumentException("Illegal material string: " + str); - } + + return switch (type) { + case BULK -> new Bulk(name, density, userDefined); + case SURFACE -> new Surface(name, density, userDefined); + case LINE -> new Line(name, density, userDefined); + default -> throw new IllegalArgumentException("Illegal material string: " + str); + }; } } diff --git a/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java b/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java index 7c112be8a..e0d964366 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java @@ -46,16 +46,12 @@ public class MaterialHolder { } public Material getMaterial(Material material) { - switch (material.getType()) { - case BULK: - return getBulkMaterial((Material.Bulk) material); - case SURFACE: - return getSurfaceMaterial((Material.Surface) material, null); - case LINE: - return getLineMaterial((Material.Line) material); - default: - return null; - } + return switch (material.getType()) { + case BULK -> getBulkMaterial((Material.Bulk) material); + case SURFACE -> getSurfaceMaterial((Material.Surface) material, null); + case LINE -> getLineMaterial((Material.Line) material); + default -> null; + }; } public Material.Bulk getBulkMaterial(Material.Bulk material) { diff --git a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java index 03e812599..ba3532e1e 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java @@ -218,31 +218,19 @@ public class OpenRocketComponentSaver { * for the preset type */ private static BaseComponentDTO toComponentDTO(ComponentPreset thePreset) { - switch (thePreset.getType()) { - case BODY_TUBE: - return new BodyTubeDTO(thePreset); - case TUBE_COUPLER: - return new TubeCouplerDTO(thePreset); - case NOSE_CONE: - return new NoseConeDTO(thePreset); - case TRANSITION: - return new TransitionDTO(thePreset); - case BULK_HEAD: - return new BulkHeadDTO(thePreset); - case CENTERING_RING: - return new CenteringRingDTO(thePreset); - case ENGINE_BLOCK: - return new EngineBlockDTO(thePreset); - case LAUNCH_LUG: - return new LaunchLugDTO(thePreset); - case RAIL_BUTTON: - return new RailButtonDTO(thePreset); - case STREAMER: - return new StreamerDTO(thePreset); - case PARACHUTE: - return new ParachuteDTO(thePreset); - } + return switch (thePreset.getType()) { + case BODY_TUBE -> new BodyTubeDTO(thePreset); + case TUBE_COUPLER -> new TubeCouplerDTO(thePreset); + case NOSE_CONE -> new NoseConeDTO(thePreset); + case TRANSITION -> new TransitionDTO(thePreset); + case BULK_HEAD -> new BulkHeadDTO(thePreset); + case CENTERING_RING -> new CenteringRingDTO(thePreset); + case ENGINE_BLOCK -> new EngineBlockDTO(thePreset); + case LAUNCH_LUG -> new LaunchLugDTO(thePreset); + case RAIL_BUTTON -> new RailButtonDTO(thePreset); + case STREAMER -> new StreamerDTO(thePreset); + case PARACHUTE -> new ParachuteDTO(thePreset); + }; - return null; - } + } } diff --git a/core/src/main/java/info/openrocket/core/scripting/GraalJSScriptEngineFactory.java b/core/src/main/java/info/openrocket/core/scripting/GraalJSScriptEngineFactory.java index db61a866a..abb8958cf 100644 --- a/core/src/main/java/info/openrocket/core/scripting/GraalJSScriptEngineFactory.java +++ b/core/src/main/java/info/openrocket/core/scripting/GraalJSScriptEngineFactory.java @@ -84,20 +84,14 @@ public class GraalJSScriptEngineFactory implements ScriptEngineFactory { } public Object getParameter(String key) { - switch (key) { - case "javax.script.name": - return "javascript"; - case "javax.script.engine": - return this.getEngineName(); - case "javax.script.engine_version": - return this.getEngineVersion(); - case "javax.script.language": - return this.getLanguageName(); - case "javax.script.language_version": - return this.getLanguageVersion(); - default: - return null; - } + return switch (key) { + case "javax.script.name" -> "javascript"; + case "javax.script.engine" -> this.getEngineName(); + case "javax.script.engine_version" -> this.getEngineVersion(); + case "javax.script.language" -> this.getLanguageName(); + case "javax.script.language_version" -> this.getLanguageVersion(); + default -> null; + }; } public String getProgram(final String... statements) { diff --git a/core/src/main/java/info/openrocket/core/startup/Preferences.java b/core/src/main/java/info/openrocket/core/startup/Preferences.java index 22f5e9ad0..08f88f3af 100644 --- a/core/src/main/java/info/openrocket/core/startup/Preferences.java +++ b/core/src/main/java/info/openrocket/core/startup/Preferences.java @@ -880,16 +880,13 @@ public abstract class Preferences implements ChangeSource { } catch (IllegalArgumentException ignore) { } } - - switch (type) { - case LINE: - return StaticFieldHolder.DEFAULT_LINE_MATERIAL; - case SURFACE: - return StaticFieldHolder.DEFAULT_SURFACE_MATERIAL; - case BULK: - return StaticFieldHolder.DEFAULT_BULK_MATERIAL; - } - throw new IllegalArgumentException("Unknown material type: " + type); + + return switch (type) { + case LINE -> StaticFieldHolder.DEFAULT_LINE_MATERIAL; + case SURFACE -> StaticFieldHolder.DEFAULT_SURFACE_MATERIAL; + case BULK -> StaticFieldHolder.DEFAULT_BULK_MATERIAL; + default -> throw new IllegalArgumentException("Unknown material type: " + type); + }; } /** 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 ff498925e..12245595d 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java @@ -96,21 +96,12 @@ public class SerializeThrustcurveMotors { continue; } - final Motor.Type type; - switch (mi.getType()) { - case "SU": - type = Motor.Type.SINGLE; - break; - case "reload": - type = Motor.Type.RELOAD; - break; - case "hybrid": - type = Motor.Type.HYBRID; - break; - default: - type = Motor.Type.UNKNOWN; - break; - } + final Motor.Type type = switch (mi.getType()) { + case "SU" -> Motor.Type.SINGLE; + case "reload" -> Motor.Type.RELOAD; + case "hybrid" -> Motor.Type.HYBRID; + default -> Motor.Type.UNKNOWN; + }; System.out.println(message); diff --git a/core/src/test/java/info/openrocket/core/file/iterator/TestFileIterator.java b/core/src/test/java/info/openrocket/core/file/iterator/TestFileIterator.java index 43f55608c..9b7abcbbc 100644 --- a/core/src/test/java/info/openrocket/core/file/iterator/TestFileIterator.java +++ b/core/src/test/java/info/openrocket/core/file/iterator/TestFileIterator.java @@ -23,14 +23,11 @@ public class TestFileIterator { @Override protected Pair findNext() { count++; - switch (count) { - case 1: - return one; - case 2: - return two; - default: - return null; - } + return switch (count) { + case 1 -> one; + case 2 -> two; + default -> null; + }; } }; 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 eaa5dcbc0..b04f221f7 100644 --- a/core/src/test/java/info/openrocket/core/simulation/FlightEventsTest.java +++ b/core/src/test/java/info/openrocket/core/simulation/FlightEventsTest.java @@ -100,63 +100,54 @@ public class FlightEventsTest extends BaseTestCase { // events whose time is too variable to check are given a time of 1200 for (int b = 0; b < 2; b++) { - FlightEvent[] expectedEvents; - switch (b) { + FlightEvent[] expectedEvents = switch (b) { // Sustainer - case 0: - expectedEvents = new FlightEvent[] { - new FlightEvent(FlightEvent.Type.LAUNCH, 0.0, rocket), - new FlightEvent(FlightEvent.Type.IGNITION, 0.0, sideBoosterBodies), - new FlightEvent(FlightEvent.Type.IGNITION, 0.01, centerBoosterBody), - new FlightEvent(FlightEvent.Type.LIFTOFF, 0.8255, null), - new FlightEvent(FlightEvent.Type.LAUNCHROD, 0.828, null), - new FlightEvent(FlightEvent.Type.BURNOUT, 0.85, sideBoosterBodies), - new FlightEvent(FlightEvent.Type.EJECTION_CHARGE, 0.85, sideBoosters), - new FlightEvent(FlightEvent.Type.STAGE_SEPARATION, 0.85, sideBoosters), - new FlightEvent(FlightEvent.Type.BURNOUT, 2.01, centerBoosterBody), - new FlightEvent(FlightEvent.Type.EJECTION_CHARGE, 2.01, centerBooster), - new FlightEvent(FlightEvent.Type.STAGE_SEPARATION, 2.01, centerBooster), - new FlightEvent(FlightEvent.Type.IGNITION, 2.01, sustainerBody), - new FlightEvent(FlightEvent.Type.BURNOUT, 4.01, sustainerBody), - new FlightEvent(FlightEvent.Type.APOGEE, 8.5, rocket), - new FlightEvent(FlightEvent.Type.EJECTION_CHARGE, 9.01, sustainer), - new FlightEvent(FlightEvent.Type.RECOVERY_DEVICE_DEPLOYMENT, 9.01, sustainerChute), - new FlightEvent(FlightEvent.Type.GROUND_HIT, 83.27, null), - new FlightEvent(FlightEvent.Type.SIMULATION_END, 83.27, null) - }; - break; + case 0 -> new FlightEvent[]{ + new FlightEvent(FlightEvent.Type.LAUNCH, 0.0, rocket), + new FlightEvent(FlightEvent.Type.IGNITION, 0.0, sideBoosterBodies), + new FlightEvent(FlightEvent.Type.IGNITION, 0.01, centerBoosterBody), + new FlightEvent(FlightEvent.Type.LIFTOFF, 0.8255, null), + new FlightEvent(FlightEvent.Type.LAUNCHROD, 0.828, null), + new FlightEvent(FlightEvent.Type.BURNOUT, 0.85, sideBoosterBodies), + new FlightEvent(FlightEvent.Type.EJECTION_CHARGE, 0.85, sideBoosters), + new FlightEvent(FlightEvent.Type.STAGE_SEPARATION, 0.85, sideBoosters), + new FlightEvent(FlightEvent.Type.BURNOUT, 2.01, centerBoosterBody), + new FlightEvent(FlightEvent.Type.EJECTION_CHARGE, 2.01, centerBooster), + new FlightEvent(FlightEvent.Type.STAGE_SEPARATION, 2.01, centerBooster), + new FlightEvent(FlightEvent.Type.IGNITION, 2.01, sustainerBody), + new FlightEvent(FlightEvent.Type.BURNOUT, 4.01, sustainerBody), + new FlightEvent(FlightEvent.Type.APOGEE, 8.5, rocket), + new FlightEvent(FlightEvent.Type.EJECTION_CHARGE, 9.01, sustainer), + new FlightEvent(FlightEvent.Type.RECOVERY_DEVICE_DEPLOYMENT, 9.01, sustainerChute), + new FlightEvent(FlightEvent.Type.GROUND_HIT, 83.27, null), + new FlightEvent(FlightEvent.Type.SIMULATION_END, 83.27, null) + }; // Center Booster - case 1: - expectedEvents = new FlightEvent[] { - new FlightEvent(FlightEvent.Type.IGNITION, 0.01, centerBoosterBody), - new FlightEvent(FlightEvent.Type.BURNOUT, 2.01, centerBoosterBody), - new FlightEvent(FlightEvent.Type.EJECTION_CHARGE, 2.01, centerBooster), - new FlightEvent(FlightEvent.Type.STAGE_SEPARATION, 2.01, centerBooster), - new FlightEvent(FlightEvent.Type.TUMBLE, 2.85, null), - new FlightEvent(FlightEvent.Type.APOGEE, 3.78, rocket), - new FlightEvent(FlightEvent.Type.GROUND_HIT, 9.0, null), - new FlightEvent(FlightEvent.Type.SIMULATION_END, 9.0, null) - }; - break; + case 1 -> new FlightEvent[]{ + new FlightEvent(FlightEvent.Type.IGNITION, 0.01, centerBoosterBody), + new FlightEvent(FlightEvent.Type.BURNOUT, 2.01, centerBoosterBody), + new FlightEvent(FlightEvent.Type.EJECTION_CHARGE, 2.01, centerBooster), + new FlightEvent(FlightEvent.Type.STAGE_SEPARATION, 2.01, centerBooster), + new FlightEvent(FlightEvent.Type.TUMBLE, 2.85, null), + new FlightEvent(FlightEvent.Type.APOGEE, 3.78, rocket), + new FlightEvent(FlightEvent.Type.GROUND_HIT, 9.0, null), + new FlightEvent(FlightEvent.Type.SIMULATION_END, 9.0, null) + }; // Side Boosters - case 2: - expectedEvents = new FlightEvent[] { - new FlightEvent(FlightEvent.Type.IGNITION, 0.0, sideBoosterBodies), - new FlightEvent(FlightEvent.Type.BURNOUT, 0.85, sideBoosterBodies), - new FlightEvent(FlightEvent.Type.EJECTION_CHARGE, 0.85, sideBoosters), - new FlightEvent(FlightEvent.Type.STAGE_SEPARATION, 0.85, sideBoosters), - new FlightEvent(FlightEvent.Type.TUMBLE, 1.0, null), - new FlightEvent(FlightEvent.Type.APOGEE, 1.01, rocket), - new FlightEvent(FlightEvent.Type.GROUND_HIT, 1.21, null), - new FlightEvent(FlightEvent.Type.SIMULATION_END, 1.21, null) - }; - break; - - default: - throw new IllegalStateException("Invalid branch number " + b); - } + case 2 -> new FlightEvent[]{ + new FlightEvent(FlightEvent.Type.IGNITION, 0.0, sideBoosterBodies), + new FlightEvent(FlightEvent.Type.BURNOUT, 0.85, sideBoosterBodies), + new FlightEvent(FlightEvent.Type.EJECTION_CHARGE, 0.85, sideBoosters), + new FlightEvent(FlightEvent.Type.STAGE_SEPARATION, 0.85, sideBoosters), + new FlightEvent(FlightEvent.Type.TUMBLE, 1.0, null), + new FlightEvent(FlightEvent.Type.APOGEE, 1.01, rocket), + new FlightEvent(FlightEvent.Type.GROUND_HIT, 1.21, null), + new FlightEvent(FlightEvent.Type.SIMULATION_END, 1.21, null) + }; + default -> throw new IllegalStateException("Invalid branch number " + b); + }; checkEvents(expectedEvents, sim, b); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/RocketConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/RocketConfig.java index 12ad96479..8b208a6e2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/RocketConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/RocketConfig.java @@ -89,25 +89,25 @@ public class RocketConfig extends RocketComponentConfig { public void keyTyped(KeyEvent e) { String text = componentNameField.getText() + e.getKeyChar(); String msg = null; - String title = null; - switch (text) { - case "SA-508": + String title = switch (text) { + case "SA-508" -> { msg = "Houston, we have a problem.\n\nJust kidding, have fun building your 'Apollo 13' rocket!"; - title = "Oh oh..."; - break; - case "SA-506": + yield "Oh oh..."; + } + case "SA-506" -> { msg = "One small step for a rocket, one giant leap for rocketkind."; - title = "Or was that not the quote?"; - break; - case "Vega": + yield "Or was that not the quote?"; + } + case "Vega" -> { msg = "Viva las Vega!"; - title = "Vega, Ready for Launch and Laughs!"; - break; - case "Ariane 5": + yield "Vega, Ready for Launch and Laughs!"; + } + case "Ariane 5" -> { msg = "Non, je ne regrette rien\u2026 except for that one overflow error\u2026"; - title = "Happens to the best of us"; - break; - } + yield "Happens to the best of us"; + } + default -> null; + }; if (msg != null) { JOptionPane optionPane = new JOptionPane(msg, JOptionPane.INFORMATION_MESSAGE); JDialog dialog = optionPane.createDialog(RocketConfig.this, title); 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 a70b2c726..2da0615ab 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 @@ -60,30 +60,20 @@ class MotorMountTableModel extends AbstractTableModel implements ComponentChange @Override public Class getColumnClass(int column) { - switch (column) { - case 0: - return Boolean.class; - - case 1: - return String.class; - - default: - throw new IndexOutOfBoundsException("column=" + column); - } + return switch (column) { + case 0 -> Boolean.class; + case 1 -> String.class; + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } @Override public Object getValueAt(int row, int column) { - switch (column) { - case 0: - return Boolean.valueOf(potentialMounts.get(row).isMotorMount()); - - case 1: - return potentialMounts.get(row).toString(); - - default: - throw new IndexOutOfBoundsException("column=" + column); - } + return switch (column) { + case 0 -> Boolean.valueOf(potentialMounts.get(row).isMotorMount()); + case 1 -> potentialMounts.get(row).toString(); + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } @Override diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java index e0890c501..6a218a8c6 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/GeneralOptimizationDialog.java @@ -1346,35 +1346,25 @@ public class GeneralOptimizationDialog extends JDialog { @Override public String getColumnName(int column) { - switch (column) { - case PARAMETER: - return trans.get("table.col.parameter"); - case CURRENT: - return trans.get("table.col.current"); - case MIN: - return trans.get("table.col.min"); - case MAX: - return trans.get("table.col.max"); - default: - throw new IndexOutOfBoundsException("column=" + column); - } + return switch (column) { + case PARAMETER -> trans.get("table.col.parameter"); + case CURRENT -> trans.get("table.col.current"); + case MIN -> trans.get("table.col.min"); + case MAX -> trans.get("table.col.max"); + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } @Override public Class getColumnClass(int column) { - switch (column) { - case PARAMETER: - return String.class; - case CURRENT: - return Double.class; - case MIN: - return Double.class; - case MAX: - return Double.class; - default: - throw new IndexOutOfBoundsException("column=" + column); - } + return switch (column) { + case PARAMETER -> String.class; + case CURRENT -> Double.class; + case MIN -> Double.class; + case MAX -> Double.class; + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } @Override @@ -1438,18 +1428,13 @@ public class GeneralOptimizationDialog extends JDialog { @Override public boolean isCellEditable(int row, int column) { - switch (column) { - case PARAMETER: - return false; - case CURRENT: - return false; - case MIN: - return true; - case MAX: - return true; - default: - throw new IndexOutOfBoundsException("column=" + column); - } + return switch (column) { + case PARAMETER -> false; + case CURRENT -> false; + case MIN -> true; + case MAX -> true; + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/MaterialEditPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/MaterialEditPanel.java index 29e464d16..19560c68e 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/MaterialEditPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/MaterialEditPanel.java @@ -80,19 +80,12 @@ public class MaterialEditPanel extends JPanel { public Object getValueAt(int row) { Material m = getMaterial(row); double d = m.getDensity(); - switch (m.getType()) { - case LINE: - return UnitGroup.UNITS_DENSITY_LINE.toValue(d); - - case SURFACE: - return UnitGroup.UNITS_DENSITY_SURFACE.toValue(d); - - case BULK: - return UnitGroup.UNITS_DENSITY_BULK.toValue(d); - - default: - throw new IllegalStateException("Material type " + m.getType()); - } + return switch (m.getType()) { + case LINE -> UnitGroup.UNITS_DENSITY_LINE.toValue(d); + case SURFACE -> UnitGroup.UNITS_DENSITY_SURFACE.toValue(d); + case BULK -> UnitGroup.UNITS_DENSITY_BULK.toValue(d); + default -> throw new IllegalStateException("Material type " + m.getType()); + }; } @Override @@ -274,19 +267,12 @@ public class MaterialEditPanel extends JPanel { private Database getDatabase(Material m) { - switch (m.getType()) { - case BULK: - return Databases.BULK_MATERIAL; - - case SURFACE: - return Databases.SURFACE_MATERIAL; - - case LINE: - return Databases.LINE_MATERIAL; - - default: - throw new IllegalArgumentException("Material type invalid, m=" + m); - } + return switch (m.getType()) { + case BULK -> Databases.BULK_MATERIAL; + case SURFACE -> Databases.SURFACE_MATERIAL; + case LINE -> Databases.LINE_MATERIAL; + default -> throw new IllegalArgumentException("Material type invalid, m=" + m); + }; } diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java index 63205891d..0c6bcc879 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java @@ -174,16 +174,11 @@ public abstract class PreferencesPanel extends JPanel { @Override public Object getElementAt(int index) { - switch (index) { - case 0: - return def ? trueDesc : falseDesc; - - case 1: - return def ? falseDesc : trueDesc; - - default: - throw new IndexOutOfBoundsException("Boolean asked for index=" + index); - } + return switch (index) { + case 0 -> def ? trueDesc : falseDesc; + case 1 -> def ? falseDesc : trueDesc; + default -> throw new IndexOutOfBoundsException("Boolean asked for index=" + index); + }; } @Override diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java index 4c0c3d8ad..c68009299 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java @@ -130,20 +130,14 @@ public class FigureRenderer extends RocketRenderer { private static int getShine(RocketComponent c) { if (c instanceof ExternalComponent) { - switch (((ExternalComponent) c).getFinish()) { - case ROUGH: - return 10; - case UNFINISHED: - return 30; - case NORMAL: - return 40; - case SMOOTH: - return 80; - case POLISHED: - return 128; - default: - return 100; - } + return switch (((ExternalComponent) c).getFinish()) { + case ROUGH -> 10; + case UNFINISHED -> 30; + case NORMAL -> 40; + case SMOOTH -> 80; + case POLISHED -> 128; + default -> 100; + }; } return 20; } diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java index 6e18bb3d8..d68212e44 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java @@ -221,18 +221,13 @@ public class RealisticRenderer extends RocketRenderer { } private int toEdgeMode(Decal.EdgeMode m) { - switch (m) { - case REPEAT: - return GL.GL_REPEAT; - case MIRROR: - return GL.GL_MIRRORED_REPEAT; - case CLAMP: - return GL.GL_CLAMP_TO_EDGE; - case STICKER: - return GL2.GL_CLAMP_TO_BORDER; - default: - return GL.GL_CLAMP_TO_EDGE; - } + return switch (m) { + case REPEAT -> GL.GL_REPEAT; + case MIRROR -> GL.GL_MIRRORED_REPEAT; + case CLAMP -> GL.GL_CLAMP_TO_EDGE; + case STICKER -> GL2.GL_CLAMP_TO_BORDER; + default -> GL.GL_CLAMP_TO_EDGE; + }; } protected static void convertColor(ORColor color, float[] out) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java index 3339919c4..c5e4fe2c0 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java @@ -705,19 +705,12 @@ public class RocketFigure3d extends JPanel implements GLEventListener { // the renderer accordingly. There is certainly a better way to do this. - final RocketRenderer newRR; - - switch (t) { - case TYPE_FINISHED: - newRR = new RealisticRenderer(document); - break; - case TYPE_UNFINISHED: - newRR = new UnfinishedRenderer(document); - break; - default: - newRR = new FigureRenderer(); - } - + final RocketRenderer newRR = switch (t) { + case TYPE_FINISHED -> new RealisticRenderer(document); + case TYPE_UNFINISHED -> new UnfinishedRenderer(document); + default -> new FigureRenderer(); + }; + if (canvas instanceof GLCanvas && !((GLCanvas) canvas).isRealized()) { rr = newRR; } else if (canvas instanceof GLJPanel && !((GLJPanel) canvas).isRealized()) { 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 53c9068f0..1a615644a 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 @@ -555,21 +555,22 @@ public class ComponentAddButtons extends JPanel implements Scrollable { else pos = askPosition(); } - - switch (pos) { - case 0: - // Cancel - return null; - case 1: - // Insert after current position - return new Pair<>(parent, parent.getChildPosition(c) + 1); - case 2: - // Insert at the end of the parent - return new Pair<>(parent, null); - default: - Application.getExceptionHandler().handleErrorCondition("ERROR: Bad position type: " + pos); - return null; - } + + return switch (pos) { + case 0 -> + // Cancel + null; + case 1 -> + // Insert after current position + new Pair<>(parent, parent.getChildPosition(c) + 1); + case 2 -> + // Insert at the end of the parent + new Pair<>(parent, null); + default -> { + Application.getExceptionHandler().handleErrorCondition("ERROR: Bad position type: " + pos); + yield null; + } + }; } private int askPosition() { @@ -680,20 +681,21 @@ public class ComponentAddButtons extends JPanel implements Scrollable { pos = askPosition(); } - switch (pos) { - case 0: + return switch (pos) { + case 0 -> // Cancel - return null; - case 1: + null; + case 1 -> // Insert after current stage - return new Pair<>(document.getRocket(), document.getRocket().getChildPosition(parentStage) + 1); - case 2: + new Pair<>(document.getRocket(), document.getRocket().getChildPosition(parentStage) + 1); + case 2 -> // Insert at the end - return new Pair<>(document.getRocket(), null); - default: + new Pair<>(document.getRocket(), null); + default -> { Application.getExceptionHandler().handleErrorCondition("ERROR: Bad position type: " + pos); - return null; - } + yield null; + } + }; } private int askPosition() { diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/FlightConfigurationPanel.java b/swing/src/main/java/info/openrocket/swing/gui/main/FlightConfigurationPanel.java index 176c2869e..769f5e0d6 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/FlightConfigurationPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/FlightConfigurationPanel.java @@ -126,18 +126,12 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe @Override public void stateChanged(ChangeEvent e) { // Trigger a selection of the motor/recovery/configuration item - FlightConfigurablePanel panel = null; - switch (tabs.getSelectedIndex()) { - case MOTOR_TAB_INDEX: - panel = motorConfigurationPanel; - break; - case RECOVERY_TAB_INDEX: - panel = recoveryConfigurationPanel; - break; - case SEPARATION_TAB_INDEX: - panel = separationConfigurationPanel; - break; - } + FlightConfigurablePanel panel = switch (tabs.getSelectedIndex()) { + case MOTOR_TAB_INDEX -> motorConfigurationPanel; + case RECOVERY_TAB_INDEX -> recoveryConfigurationPanel; + case SEPARATION_TAB_INDEX -> separationConfigurationPanel; + default -> null; + }; // Update the panel selection, focus, and button state if (panel == null) return; @@ -360,16 +354,12 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe } private List getSelectedConfigurationIds() { - switch (tabs.getSelectedIndex()) { - case MOTOR_TAB_INDEX: - return this.motorConfigurationPanel.getSelectedConfigurationIds(); - case RECOVERY_TAB_INDEX: - return this.recoveryConfigurationPanel.getSelectedConfigurationIds(); - case SEPARATION_TAB_INDEX: - return this.separationConfigurationPanel.getSelectedConfigurationIds(); - default: - return null; - } + return switch (tabs.getSelectedIndex()) { + case MOTOR_TAB_INDEX -> this.motorConfigurationPanel.getSelectedConfigurationIds(); + case RECOVERY_TAB_INDEX -> this.recoveryConfigurationPanel.getSelectedConfigurationIds(); + case SEPARATION_TAB_INDEX -> this.separationConfigurationPanel.getSelectedConfigurationIds(); + default -> null; + }; } public void setSelectedComponent(RocketComponent component) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java index 06e83c6eb..f62a21c0f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java @@ -477,19 +477,11 @@ public class RocketFigure extends AbstractScaleFigure { } // Get the shapes - RocketComponentShapes[] returnValue; - switch (viewType) { - case SideView: - case TopView: - returnValue = RocketComponentShapeProvider.getShapesSide(component, transformation); - break; - case BackView: - returnValue = RocketComponentShapeProvider.getShapesBack(component, transformation); - break; - - default: - throw new BugException("Unknown figure type = " + viewType); - } + RocketComponentShapes[] returnValue = switch (viewType) { + case SideView, TopView -> RocketComponentShapeProvider.getShapesSide(component, transformation); + case BackView -> RocketComponentShapeProvider.getShapesBack(component, transformation); + default -> throw new BugException("Unknown figure type = " + viewType); + }; if (color != null) { for (RocketComponentShapes rcs : returnValue) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java index 142cb1024..06fddfa39 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java @@ -361,51 +361,38 @@ public class SimulationExportPanel extends JPanel { @Override public String getColumnName(int column) { - switch (column) { - case SELECTED: - return ""; - case NAME: - //// Variable - return trans.get("SimExpPan.Col.Variable"); - case UNIT: - //// Unit - return trans.get("SimExpPan.Col.Unit"); - default: - throw new IndexOutOfBoundsException("column=" + column); - } + return switch (column) { + case SELECTED -> ""; + case NAME -> + //// Variable + trans.get("SimExpPan.Col.Variable"); + case UNIT -> + //// Unit + trans.get("SimExpPan.Col.Unit"); + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } @Override public Class getColumnClass(int column) { - switch (column) { - case SELECTED: - return Boolean.class; - case NAME: - return FlightDataType.class; - case UNIT: - return Unit.class; - default: - throw new IndexOutOfBoundsException("column=" + column); - } + return switch (column) { + case SELECTED -> Boolean.class; + case NAME -> FlightDataType.class; + case UNIT -> Unit.class; + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } @Override public Object getValueAt(int row, int column) { - - switch (column) { - case SELECTED: - return selected[row]; - - case NAME: - return types[row]; - - case UNIT: - return units[row]; - - default: - throw new IndexOutOfBoundsException("column=" + column); - } + + return switch (column) { + case SELECTED -> selected[row]; + case NAME -> types[row]; + case UNIT -> units[row]; + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } @@ -434,19 +421,12 @@ public class SimulationExportPanel extends JPanel { @Override public boolean isCellEditable(int row, int column) { - switch (column) { - case SELECTED: - return true; - - case NAME: - return false; - - case UNIT: - return types[row].getUnitGroup().getUnitCount() > 1; - - default: - throw new IndexOutOfBoundsException("column=" + column); - } + return switch (column) { + case SELECTED -> true; + case NAME -> false; + case UNIT -> types[row].getUnitGroup().getUnitCount() > 1; + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } public void selectAll() { 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 480bd2090..2e3563ac7 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 @@ -604,30 +604,20 @@ public class SimulationPlotPanel extends JPanel { @Override public Class getColumnClass(int column) { - switch (column) { - case 0: - return Boolean.class; - - case 1: - return String.class; - - default: - throw new IndexOutOfBoundsException("column=" + column); - } + return switch (column) { + case 0 -> Boolean.class; + case 1 -> String.class; + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } @Override public Object getValueAt(int row, int column) { - switch (column) { - case 0: - return Boolean.valueOf(configuration.isEventActive(eventTypes[row])); - - case 1: - return eventTypes[row].toString(); - - default: - throw new IndexOutOfBoundsException("column=" + column); - } + return switch (column) { + case 0 -> Boolean.valueOf(configuration.isEventActive(eventTypes[row])); + case 1 -> eventTypes[row].toString(); + default -> throw new IndexOutOfBoundsException("column=" + column); + }; } @Override diff --git a/swing/src/main/java/info/openrocket/swing/logging/LogbackBufferLoggerAdaptor.java b/swing/src/main/java/info/openrocket/swing/logging/LogbackBufferLoggerAdaptor.java index 3c2313328..66ba5effc 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/LogbackBufferLoggerAdaptor.java +++ b/swing/src/main/java/info/openrocket/swing/logging/LogbackBufferLoggerAdaptor.java @@ -39,20 +39,14 @@ public class LogbackBufferLoggerAdaptor extends AppenderBase { } private LogLevel toORLevel(Level l) { - switch (l.toInt()) { - case Level.TRACE_INT: - return LogLevel.VBOSE; - case Level.DEBUG_INT: - return LogLevel.DEBUG; - case Level.INFO_INT: - return LogLevel.INFO; - case Level.WARN_INT: - return LogLevel.WARN; - case Level.ERROR_INT: - return LogLevel.ERROR; - default: - return LogLevel.ERROR; - } + return switch (l.toInt()) { + case Level.TRACE_INT -> LogLevel.VBOSE; + case Level.DEBUG_INT -> LogLevel.DEBUG; + case Level.INFO_INT -> LogLevel.INFO; + case Level.WARN_INT -> LogLevel.WARN; + case Level.ERROR_INT -> LogLevel.ERROR; + default -> LogLevel.ERROR; + }; } private LogLine toLogLine(ILoggingEvent e) { From 5174eebb3aa5d9b0b0426dce30ffa4e895d745e8 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:30:10 +0200 Subject: [PATCH 18/25] Use try with resources --- .../info/openrocket/core/database/MotorDatabaseLoader.java | 5 ++--- .../info/openrocket/core/file/motor/RASPMotorLoader.java | 3 +-- .../java/info/openrocket/core/preset/ComponentPreset.java | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/info/openrocket/core/database/MotorDatabaseLoader.java b/core/src/main/java/info/openrocket/core/database/MotorDatabaseLoader.java index 0eab90eca..cb8525b9d 100644 --- a/core/src/main/java/info/openrocket/core/database/MotorDatabaseLoader.java +++ b/core/src/main/java/info/openrocket/core/database/MotorDatabaseLoader.java @@ -103,9 +103,8 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader { */ @SuppressWarnings("unchecked") private void loadSerialized(Pair f) { - try { - log.debug("Reading motors from file " + f.getU().getPath()); - ObjectInputStream ois = new ObjectInputStream(f.getV()); + log.debug("Reading motors from file " + f.getU().getPath()); + try (ObjectInputStream ois = new ObjectInputStream(f.getV())) { List motors = (List) ois.readObject(); addMotors(motors); } catch (Exception ex) { diff --git a/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java b/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java index 419f69b71..5ac48c142 100644 --- a/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java +++ b/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java @@ -52,7 +52,6 @@ public class RASPMotorLoader extends AbstractMotorLoader { public List load(Reader reader, String filename, boolean removeDelayFromDesignation) throws IOException { List motors = new ArrayList<>(); - BufferedReader in = new BufferedReader(reader); String manufacturer = ""; String designation = ""; @@ -68,7 +67,7 @@ public class RASPMotorLoader extends AbstractMotorLoader { double propW = 0; double totalW = 0; - try { + try (BufferedReader in = new BufferedReader(reader)) { String line; String[] pieces, buf; diff --git a/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java b/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java index df3e00a8c..16ea7f85f 100644 --- a/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java +++ b/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java @@ -406,11 +406,9 @@ public class ComponentPreset implements Comparable, Serializabl * Package scope so the factory can call it. */ void computeDigest() { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); - try { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - DataOutputStream os = new DataOutputStream(bos); - + try (DataOutputStream os = new DataOutputStream(bos)) { List> keys = new ArrayList<>(properties.keySet()); keys.sort(new Comparator<>() { From 64b2b9a40e5deda4e096b81e202bd761f7ac0cf0 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:31:17 +0200 Subject: [PATCH 19/25] Fix combobox infer --- .../openrocket/swing/gui/dialogs/PrintSettingsDialog.java | 4 ++-- .../flightconfiguration/SeparationSelectionDialog.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java index 67b45cf5c..b7c28d48c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java @@ -78,13 +78,13 @@ public class PrintSettingsDialog extends JDialog { - final JComboBox sizeCombo = new JComboBox<>(new EnumModel<>(settings, "PaperSize")); + final JComboBox sizeCombo = new JComboBox<>(new EnumModel(settings, "PaperSize")); ////Paper size: panel.add(new JLabel(trans.get("lbl.Papersize"))); panel.add( sizeCombo, "growx, wrap para"); - final JComboBox orientCombo = new JComboBox<>(new EnumModel<>(settings, "PaperOrientation")); + final JComboBox orientCombo = new JComboBox<>(new EnumModel(settings, "PaperOrientation")); //// Paper orientation: panel.add(new JLabel(trans.get("lbl.Paperorientation"))); panel.add( orientCombo, "growx, wrap para*2"); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java index b4a371d89..43af524af 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java @@ -78,7 +78,7 @@ public class SeparationSelectionDialog extends JDialog { overrideButton.setSelected(true); } - final JComboBox event = new JComboBox<>(new EnumModel<>(newConfiguration, "SeparationEvent")); + final JComboBox event = new JComboBox<>(new EnumModel(newConfiguration, "SeparationEvent")); event.setSelectedItem(newConfiguration.getSeparationEvent()); panel.add(event, "wrap rel"); From 1c5bddf54bf3d2cd070b5fc02f675d5474cf5b57 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:37:47 +0200 Subject: [PATCH 20/25] Fix small numerical issues --- .../aerodynamics/BarrowmanCalculator.java | 16 +- .../defaults/DefaultAppearance.java | 10 +- .../openrocket/importt/ConfigHandler.java | 2 +- .../core/file/rasaero/export/BodyTubeDTO.java | 18 +- .../core/file/rasaero/export/BoosterDTO.java | 12 +- .../core/file/rasaero/export/FinDTO.java | 6 +- .../file/rasaero/export/LaunchSiteDTO.java | 12 +- .../core/file/rasaero/export/NoseConeDTO.java | 2 +- .../core/file/rasaero/export/RecoveryDTO.java | 12 +- .../file/rasaero/export/RocketDesignDTO.java | 8 +- .../file/rasaero/export/SimulationDTO.java | 38 ++-- .../file/rocksim/RockSimCommonConstants.java | 2 +- .../rocksim/export/AbstractTransitionDTO.java | 4 +- .../core/file/rocksim/export/BasePartDTO.java | 10 +- .../core/file/rocksim/export/BodyTubeDTO.java | 8 +- .../file/rocksim/export/CenteringRingDTO.java | 4 +- .../core/file/rocksim/export/FinSetDTO.java | 18 +- .../file/rocksim/export/LaunchLugDTO.java | 4 +- .../file/rocksim/export/MassObjectDTO.java | 4 +- .../core/file/rocksim/export/NoseConeDTO.java | 6 +- .../file/rocksim/export/ParachuteDTO.java | 8 +- .../file/rocksim/export/RocketDesignDTO.java | 20 +- .../core/file/rocksim/export/StreamerDTO.java | 2 +- .../file/rocksim/export/TransitionDTO.java | 12 +- .../file/rocksim/export/TubeFinSetDTO.java | 4 +- .../file/rocksim/importt/BaseHandler.java | 12 +- .../file/rocksim/importt/FinSetHandler.java | 20 +- .../file/rocksim/importt/NoseConeHandler.java | 2 +- .../importt/PositionDependentHandler.java | 4 +- .../importt/RecoveryDeviceHandler.java | 8 +- .../file/rocksim/importt/RockSimHandler.java | 12 +- .../rocksim/importt/TransitionHandler.java | 12 +- .../core/file/wavefrontobj/ObjUtils.java | 6 +- .../export/AppearanceExporter.java | 12 +- .../export/components/MassObjectExporter.java | 2 +- .../export/components/MotorExporter.java | 2 +- .../export/components/TransitionExporter.java | 8 +- .../export/shapes/PolygonExporter.java | 8 +- .../openrocket/core/masscalc/RigidBody.java | 4 +- .../core/motor/ThrustCurveMotor.java | 8 +- .../onedim/GoldenSectionSearchOptimizer.java | 2 +- .../core/preset/loader/NoseConeLoader.java | 2 +- .../rocketcomponent/ClusterConfiguration.java | 4 +- .../rocketcomponent/ExternalComponent.java | 16 +- .../core/rocketcomponent/FinSet.java | 14 +- .../core/rocketcomponent/FreeformFinSet.java | 4 +- .../core/rocketcomponent/ParallelStage.java | 2 +- .../core/rocketcomponent/PodSet.java | 2 +- .../core/rocketcomponent/RailButton.java | 4 +- .../core/rocketcomponent/Rocket.java | 2 +- .../core/rocketcomponent/RocketComponent.java | 6 +- .../rocketcomponent/position/AngleMethod.java | 2 +- .../position/RadiusMethod.java | 4 +- .../core/simulation/RK4SimulationStepper.java | 6 +- .../extension/example/DampingMoment.java | 2 +- .../openrocket/core/startup/Preferences.java | 2 +- .../java/info/openrocket/core/unit/Unit.java | 2 +- .../info/openrocket/core/unit/UnitGroup.java | 18 +- .../info/openrocket/core/util/LineStyle.java | 8 +- .../info/openrocket/core/util/Quaternion.java | 2 +- .../openrocket/core/util/TestRockets.java | 40 ++-- .../aerodynamics/BarrowmanCalculatorTest.java | 4 +- .../export/RockSimDocumentDTOTest.java | 2 +- .../rocksim/importt/BodyTubeHandlerTest.java | 24 +-- .../rocksim/importt/FinSetHandlerTest.java | 8 +- .../importt/InnerBodyTubeHandlerTest.java | 24 +-- .../rocksim/importt/LaunchLugHandlerTest.java | 18 +- .../importt/MassObjectHandlerTest.java | 6 +- .../rocksim/importt/NoseConeHandlerTest.java | 32 ++-- .../rocksim/importt/ParachuteHandlerTest.java | 12 +- .../file/rocksim/importt/RingHandlerTest.java | 40 ++-- .../rocksim/importt/StreamerHandlerTest.java | 16 +- .../importt/TransitionHandlerTest.java | 48 ++--- .../importt/TubeFinSetHandlerTest.java | 20 +- .../core/masscalc/MassCalculatorTest.java | 2 +- .../core/masscalc/RigidBodyTest.java | 2 +- .../core/motor/ThrustCurveMotorTest.java | 4 +- .../TestRocketOptimizationFunction.java | 2 +- .../core/rocketcomponent/FinSetTest.java | 24 +-- .../FlightConfigurationTest.java | 2 +- .../rocketcomponent/FreeformFinSetTest.java | 76 ++++---- .../rocketcomponent/ParallelStageTest.java | 10 +- .../rocketcomponent/TrapezoidFinSetTest.java | 16 +- .../core/unit/FractionalUnitTest.java | 154 +++++++-------- .../openrocket/core/util/ArrayUtilsTest.java | 2 +- .../openrocket/core/util/CoordinateTest.java | 2 +- .../core/util/ExpressionParserTest.java | 2 +- .../openrocket/core/util/MathUtilTest.java | 4 +- .../core/util/TestTransformation.java | 108 +++++------ .../openrocket/core/util/TextUtilTest.java | 180 +++++++++--------- .../core/util/WorldCoordinateTest.java | 2 +- .../swing/gui/components/StyledLabel.java | 8 +- .../components/compass/CompassSelector.java | 2 +- .../gui/configdialog/AppearancePanel.java | 4 +- .../swing/gui/configdialog/FinSetConfig.java | 8 +- .../gui/configdialog/InnerTubeConfig.java | 6 +- .../customexpression/OperatorSelector.java | 4 +- .../customexpression/VariableSelector.java | 6 +- .../swing/gui/dialogs/PrintDialog.java | 2 +- .../ThrustCurveMotorSelectionPanel.java | 2 +- .../optimization/OptimizationPlotDialog.java | 4 +- .../swing/gui/figure3d/FigureRenderer.java | 6 +- .../swing/gui/figure3d/RealisticRenderer.java | 8 +- .../swing/gui/figure3d/RocketFigure3d.java | 14 +- .../figure3d/geometry/ComponentRenderer.java | 18 +- .../figure3d/geometry/TransitionRenderer.java | 4 +- .../swing/gui/figure3d/photo/PhotoPanel.java | 16 +- .../gui/figure3d/photo/PhotoSettings.java | 10 +- .../figure3d/photo/exhaust/FlameRenderer.java | 18 +- .../gui/figure3d/photo/sky/SkySphere.java | 2 +- .../swing/gui/main/SimulationPanel.java | 2 +- .../swing/gui/print/DesignReport.java | 8 +- .../swing/gui/print/FinMarkingGuide.java | 2 +- .../swing/gui/print/PrintableTransition.java | 2 +- .../swing/gui/print/components/Rule.java | 4 +- .../swing/gui/print/visitor/Dimension.java | 2 +- .../visitor/PartsDetailVisitorStrategy.java | 26 +-- .../gui/simulation/SimulationPlotPanel.java | 2 +- .../openrocket/swing/gui/theme/UITheme.java | 54 +++--- .../gui/configdialog/FinSetConfigTest.java | 28 +-- 120 files changed, 812 insertions(+), 812 deletions(-) diff --git a/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java b/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java index a49a643f5..d4369374c 100644 --- a/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java +++ b/core/src/main/java/info/openrocket/core/aerodynamics/BarrowmanCalculator.java @@ -571,7 +571,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { if (configuration.getRocket().isPerfectFinish()) { // Assume partial laminar layer. Roughness-limitation is checked later. - if (Re < 1e4) { + if (Re < 1.0e4) { // Too low, constant Cf = 1.33e-2; } else if (Re < 5.39e5) { @@ -586,18 +586,18 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { if (mach < 1.1) { // Below Re=1e6 no correction - if (Re > 1e6) { - if (Re < 3e6) { - c1 = 1 - 0.1 * pow2(mach) * (Re - 1e6) / 2e6; // transition to turbulent + if (Re > 1.0e6) { + if (Re < 3.0e6) { + c1 = 1 - 0.1 * pow2(mach) * (Re - 1.0e6) / 2.0e6; // transition to turbulent } else { c1 = 1 - 0.1 * pow2(mach); } } } if (mach > 0.9) { - if (Re > 1e6) { - if (Re < 3e6) { - c2 = 1 + (1.0 / Math.pow(1 + 0.045 * pow2(mach), 0.25) - 1) * (Re - 1e6) / 2e6; + if (Re > 1.0e6) { + if (Re < 3.0e6) { + c2 = 1 + (1.0 / Math.pow(1 + 0.045 * pow2(mach), 0.25) - 1) * (Re - 1.0e6) / 2.0e6; } else { c2 = 1.0 / Math.pow(1 + 0.045 * pow2(mach), 0.25); } @@ -617,7 +617,7 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator { } else { // Assume fully turbulent. Roughness-limitation is checked later. - if (Re < 1e4) { + if (Re < 1.0e4) { // Too low, constant Cf = 1.48e-2; } else { diff --git a/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java b/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java index 2ce1c5ec3..19e114ac9 100644 --- a/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java +++ b/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java @@ -80,14 +80,14 @@ public class DefaultAppearance { private static final Appearance CHUTE = simple("/datafiles/textures/chute.jpg"); - private static final Appearance ESTES_BT = simpleAlpha(new ORColor(212, 185, 145), .3f, "/datafiles/textures/spiral-wound-alpha.png"); - private static final Appearance ESTES_IT = simpleAlpha(new ORColor(168, 146, 116), .1f, "/datafiles/textures/spiral-wound-alpha.png"); - private static final Appearance WHITE_BT = simpleAlpha(new ORColor(240, 240, 240), .3f, "/datafiles/textures/spiral-wound-alpha.png"); + private static final Appearance ESTES_BT = simpleAlpha(new ORColor(212, 185, 145), 0.3f, "/datafiles/textures/spiral-wound-alpha.png"); + private static final Appearance ESTES_IT = simpleAlpha(new ORColor(168, 146, 116), 0.1f, "/datafiles/textures/spiral-wound-alpha.png"); + private static final Appearance WHITE_BT = simpleAlpha(new ORColor(240, 240, 240), 0.3f, "/datafiles/textures/spiral-wound-alpha.png"); private static final Appearance ESTES_MOTOR = simple("/datafiles/textures/motors/estes.jpg"); private static final Appearance AEROTECH_MOTOR = simple("/datafiles/textures/motors/aerotech.png"); private static final Appearance KLIMA_MOTOR = simple("/datafiles/textures/motors/klima.jpg"); - private static final Appearance REUSABLE_MOTOR = simpleAlpha(new ORColor(195, 60, 50), .6f, "/datafiles/textures/motors/reusable.png"); + private static final Appearance REUSABLE_MOTOR = simpleAlpha(new ORColor(195, 60, 50), 0.6f, "/datafiles/textures/motors/reusable.png"); private static final HashMap plastics = new HashMap<>(); @@ -99,7 +99,7 @@ public class DefaultAppearance { */ private static Appearance getPlastic(ORColor c) { if (!plastics.containsKey(c)) { - plastics.put(c, new Appearance(c, .3)); + plastics.put(c, new Appearance(c, 0.3)); } return plastics.get(c); } diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java index c72f415c0..30716e443 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java @@ -73,7 +73,7 @@ public class ConfigHandler extends AbstractElementHandler { } } else { BigDecimal value = new BigDecimal(str); - if (value.equals(BigDecimal.valueOf(value.doubleValue()))) { + if (value.compareTo(BigDecimal.valueOf(value.doubleValue())) == 0) { return value.doubleValue(); } else { return value; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTO.java index 9ad4cd5d8..be970e520 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTO.java @@ -42,32 +42,32 @@ import info.openrocket.core.util.MathUtil; public class BodyTubeDTO extends BasePartDTO implements BodyTubeDTOAdapter { @XmlElement(name = RASAeroCommonConstants.LAUNCH_LUG_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double launchLugDiameter = 0d; + private Double launchLugDiameter = 0.0d; @XmlElement(name = RASAeroCommonConstants.LAUNCH_LUG_LENGTH) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double launchLugLength = 0d; + private Double launchLugLength = 0.0d; @XmlElement(name = RASAeroCommonConstants.RAIL_GUIDE_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double railGuideDiameter = 0d; + private Double railGuideDiameter = 0.0d; @XmlElement(name = RASAeroCommonConstants.RAIL_GUIDE_HEIGHT) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double railGuideHeight = 0d; + private Double railGuideHeight = 0.0d; @XmlElement(name = RASAeroCommonConstants.LAUNCH_SHOE_AREA) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double launchShoeArea = 0d; // Currently not available in OR + private Double launchShoeArea = 0.0d; // Currently not available in OR @XmlElement(name = RASAeroCommonConstants.BOATTAIL_LENGTH) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double boattailLength = 0d; + private Double boattailLength = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOATTAIL_REAR_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double boattailRearDiameter = 0d; + private Double boattailRearDiameter = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOATTAIL_OFFSET) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double boattailOffset = 0d; + private Double boattailOffset = 0.0d; @XmlElement(name = RASAeroCommonConstants.OVERHANG) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double overhang = 0d; + private Double overhang = 0.0d; @XmlElementRef(name = RASAeroCommonConstants.FIN, type = FinDTO.class) private FinDTO fin; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/BoosterDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/BoosterDTO.java index a16ae28cd..efd9a0422 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/BoosterDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/BoosterDTO.java @@ -44,19 +44,19 @@ public class BoosterDTO implements BodyTubeDTOAdapter { private Double insideDiameter; @XmlElement(name = RASAeroCommonConstants.LAUNCH_LUG_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double launchLugDiameter = 0d; + private Double launchLugDiameter = 0.0d; @XmlElement(name = RASAeroCommonConstants.LAUNCH_LUG_LENGTH) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double launchLugLength = 0d; + private Double launchLugLength = 0.0d; @XmlElement(name = RASAeroCommonConstants.RAIL_GUIDE_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double railGuideDiameter = 0d; + private Double railGuideDiameter = 0.0d; @XmlElement(name = RASAeroCommonConstants.RAIL_GUIDE_HEIGHT) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double railGuideHeight = 0d; + private Double railGuideHeight = 0.0d; @XmlElement(name = RASAeroCommonConstants.LAUNCH_SHOE_AREA) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double launchShoeArea = 0d; // Currently not available in OR + private Double launchShoeArea = 0.0d; // Currently not available in OR @XmlElement(name = RASAeroCommonConstants.LOCATION) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) private Double location; @@ -67,7 +67,7 @@ public class BoosterDTO implements BodyTubeDTOAdapter { private Double shoulderLength; @XmlElement(name = RASAeroCommonConstants.NOZZLE_EXIT_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double nozzleExitDiameter = 0d; + private Double nozzleExitDiameter = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOATTAIL_LENGTH) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) private Double boattailLength; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/FinDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/FinDTO.java index 2e9bb0e44..ef8ad003d 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/FinDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/FinDTO.java @@ -39,7 +39,7 @@ public class FinDTO { private Double thickness; @XmlElement(name = RASAeroCommonConstants.FIN_LE_RADIUS) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double LERadius = 0d; // Leading edge radius + private Double LERadius = 0.0d; // Leading edge radius @XmlElement(name = RASAeroCommonConstants.LOCATION) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) private Double location; @@ -47,10 +47,10 @@ public class FinDTO { private String airfoilSection; @XmlElement(name = RASAeroCommonConstants.FIN_FX1) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double FX1 = 0d; + private Double FX1 = 0.0d; @XmlElement(name = RASAeroCommonConstants.FIN_FX3) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double FX3 = 0d; + private Double FX3 = 0.0d; @XmlTransient private static final Translator trans = Application.getTranslator(); diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java index 132321650..44b023da6 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java @@ -22,22 +22,22 @@ public class LaunchSiteDTO { @XmlElement(name = RASAeroCommonConstants.LAUNCH_ALTITUDE) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double altitude = 0d; + private Double altitude = 0.0d; @XmlElement(name = RASAeroCommonConstants.LAUNCH_PRESSURE) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double pressure = 0d; + private Double pressure = 0.0d; @XmlElement(name = RASAeroCommonConstants.LAUNCH_ROD_ANGLE) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double rodAngle = 0d; + private Double rodAngle = 0.0d; @XmlElement(name = RASAeroCommonConstants.LAUNCH_ROD_LENGTH) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double rodLength = 0d; + private Double rodLength = 0.0d; @XmlElement(name = RASAeroCommonConstants.LAUNCH_TEMPERATURE) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double temperature = 0d; + private Double temperature = 0.0d; @XmlElement(name = RASAeroCommonConstants.LAUNCH_WIND_SPEED) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double windSpeed = 0d; + private Double windSpeed = 0.0d; /** * We need a default, no-args constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/NoseConeDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/NoseConeDTO.java index 194db48d6..2b8ae8d9d 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/NoseConeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/NoseConeDTO.java @@ -34,7 +34,7 @@ public class NoseConeDTO extends BasePartDTO { private String shape; @XmlElement(name = RASAeroCommonConstants.BLUNT_RADIUS) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double bluntRadius = 0d; + private Double bluntRadius = 0.0d; @XmlElement(name = RASAeroCommonConstants.POWER_LAW) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) private Double powerLaw; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/RecoveryDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/RecoveryDTO.java index d0c46a1e9..237949c8a 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/RecoveryDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/RecoveryDTO.java @@ -30,10 +30,10 @@ import java.util.List; public class RecoveryDTO { @XmlElement(name = RASAeroCommonConstants.RECOVERY_ALTITUDE + 1) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double altitude1 = 0d; + private Double altitude1 = 0.0d; @XmlElement(name = RASAeroCommonConstants.RECOVERY_ALTITUDE + 2) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double altitude2 = 0d; + private Double altitude2 = 0.0d; @XmlElement(name = RASAeroCommonConstants.RECOVERY_DEVICE_TYPE + 1) private String deviceType1 = "None"; @XmlElement(name = RASAeroCommonConstants.RECOVERY_DEVICE_TYPE + 2) @@ -46,20 +46,20 @@ public class RecoveryDTO { private Boolean event2 = false; @XmlElement(name = RASAeroCommonConstants.RECOVERY_SIZE + 1) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double size1 = 0d; + private Double size1 = 0.0d; @XmlElement(name = RASAeroCommonConstants.RECOVERY_SIZE + 2) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double size2 = 0d; + private Double size2 = 0.0d; @XmlElement(name = RASAeroCommonConstants.RECOVERY_EVENT_TYPE + 1) private String eventType1 = "None"; @XmlElement(name = RASAeroCommonConstants.RECOVERY_EVENT_TYPE + 2) private String eventType2 = "None"; @XmlElement(name = RASAeroCommonConstants.RECOVERY_CD + 1) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double CD1 = 0d; + private Double CD1 = 0.0d; @XmlElement(name = RASAeroCommonConstants.RECOVERY_CD + 2) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double CD2 = 0d; + private Double CD2 = 0.0d; @XmlTransient private static final Logger log = LoggerFactory.getLogger(RecoveryDTO.class); diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/RocketDesignDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/RocketDesignDTO.java index 5114c0d53..6f02eaaf1 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/RocketDesignDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/RocketDesignDTO.java @@ -45,7 +45,7 @@ public class RocketDesignDTO { private String surface = RASAeroCommonConstants.FINISH_SMOOTH; @XmlElement(name = RASAeroCommonConstants.CD) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double CD = 0d; + private Double CD = 0.0d; @XmlElement(name = RASAeroCommonConstants.MODIFIED_BARROWMAN) @XmlJavaTypeAdapter(CustomBooleanAdapter.class) private Boolean modifiedBarrowman = false; @@ -54,13 +54,13 @@ public class RocketDesignDTO { private Boolean turbulence = false; @XmlElement(name = RASAeroCommonConstants.SUSTAINER_NOZZLE) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double sustainerNozzle = 0d; + private Double sustainerNozzle = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOOSTER1_NOZZLE) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster1Nozzle = 0d; + private Double booster1Nozzle = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOOSTER2_NOZZLE) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster2Nozzle = 0d; + private Double booster2Nozzle = 0.0d; @XmlElement(name = RASAeroCommonConstants.USE_BOOSTER1) @XmlJavaTypeAdapter(CustomBooleanAdapter.class) private Boolean useBooster1 = false; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationDTO.java index 8d46567ff..03708a48a 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationDTO.java @@ -36,34 +36,34 @@ public class SimulationDTO { private String sustainerEngine; @XmlElement(name = RASAeroCommonConstants.SUSTAINER_LAUNCH_WT) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double sustainerLaunchWt = 0d; + private Double sustainerLaunchWt = 0.0d; @XmlElement(name = RASAeroCommonConstants.SUSTAINER_NOZZLE_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double sustainerNozzleDiameter = 0d; + private Double sustainerNozzleDiameter = 0.0d; @XmlElement(name = RASAeroCommonConstants.SUSTAINER_CG) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double sustainerCG = 0d; + private Double sustainerCG = 0.0d; @XmlElement(name = RASAeroCommonConstants.SUSTAINER_IGNITION_DELAY) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double sustainerIgnitionDelay = 0d; + private Double sustainerIgnitionDelay = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOOSTER1_ENGINE) private String booster1Engine; @XmlElement(name = RASAeroCommonConstants.BOOSTER1_LAUNCH_WT) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster1LaunchWt = 0d; + private Double booster1LaunchWt = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOOSTER1_SEPARATION_DELAY) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster1SeparationDelay = 0d; + private Double booster1SeparationDelay = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOOSTER1_IGNITION_DELAY) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster1IgnitionDelay = 0d; + private Double booster1IgnitionDelay = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOOSTER1_CG) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster1CG = 0d; + private Double booster1CG = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOOSTER1_NOZZLE_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster1NozzleDiameter = 0d; + private Double booster1NozzleDiameter = 0.0d; @XmlElement(name = RASAeroCommonConstants.INCLUDE_BOOSTER1) @XmlJavaTypeAdapter(CustomBooleanAdapter.class) private Boolean includeBooster1 = false; @@ -72,38 +72,38 @@ public class SimulationDTO { private String booster2Engine; @XmlElement(name = RASAeroCommonConstants.BOOSTER2_LAUNCH_WT) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster2LaunchWt = 0d; + private Double booster2LaunchWt = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOOSTER2_SEPARATION_DELAY) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster2Delay = 0d; + private Double booster2Delay = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOOSTER2_CG) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster2CG = 0d; + private Double booster2CG = 0.0d; @XmlElement(name = RASAeroCommonConstants.BOOSTER2_NOZZLE_DIAMETER) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double booster2NozzleDiameter = 0d; + private Double booster2NozzleDiameter = 0.0d; @XmlElement(name = RASAeroCommonConstants.INCLUDE_BOOSTER2) @XmlJavaTypeAdapter(CustomBooleanAdapter.class) private Boolean includeBooster2 = false; @XmlElement(name = RASAeroCommonConstants.FLIGHT_TIME) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double flightTime = 0d; + private Double flightTime = 0.0d; @XmlElement(name = RASAeroCommonConstants.TIME_TO_APOGEE) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double timetoApogee = 0d; + private Double timetoApogee = 0.0d; @XmlElement(name = RASAeroCommonConstants.MAX_ALTITUDE) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double maxAltitude = 0d; + private Double maxAltitude = 0.0d; @XmlElement(name = RASAeroCommonConstants.MAX_VELOCITY) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double maxVelocity = 0d; + private Double maxVelocity = 0.0d; @XmlElement(name = RASAeroCommonConstants.OPTIMUM_WT) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double optimumWt = 0d; + private Double optimumWt = 0.0d; @XmlElement(name = RASAeroCommonConstants.OPTIMUM_MAX_ALT) @XmlJavaTypeAdapter(CustomDoubleAdapter.class) - private Double optimumMaxAlt = 0d; + private Double optimumMaxAlt = 0.0d; @XmlTransient private static final Translator trans = Application.getTranslator(); diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/RockSimCommonConstants.java b/core/src/main/java/info/openrocket/core/file/rocksim/RockSimCommonConstants.java index 29d3e868c..87e19f91f 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/RockSimCommonConstants.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/RockSimCommonConstants.java @@ -108,7 +108,7 @@ public class RockSimCommonConstants { * Surface Density conversion. RockSim is in grams/sq centimeter, OpenRocket in * kilograms/sq meter. 1000/(100*100) = 1/10 */ - public static final double ROCKSIM_TO_OPENROCKET_SURFACE_DENSITY = 1 / 10d; + public static final double ROCKSIM_TO_OPENROCKET_SURFACE_DENSITY = 1 / 10.0d; /** * Line Density conversion. RockSim is in kilograms/meter, OpenRocket in * kilograms/meter. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java index d521ad9c3..77ad9920f 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java @@ -37,9 +37,9 @@ public class AbstractTransitionDTO extends BasePartDTO implements AttachablePart @XmlElement(name = RockSimCommonConstants.CONSTRUCTION_TYPE) private int constructionType = 1; @XmlElement(name = RockSimCommonConstants.WALL_THICKNESS) - private double wallThickness = 0d; + private double wallThickness = 0.0d; @XmlElement(name = RockSimCommonConstants.SHAPE_PARAMETER) - private double shapeParameter = 0d; + private double shapeParameter = 0.0d; @XmlElementWrapper(name = RockSimCommonConstants.ATTACHED_PARTS) @XmlElementRefs({ diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/BasePartDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/BasePartDTO.java index 2bde31409..e5e0c642d 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/BasePartDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/BasePartDTO.java @@ -34,9 +34,9 @@ public abstract class BasePartDTO { private static int currentSerialNumber = 1; @XmlElement(name = RockSimCommonConstants.KNOWN_MASS) - private double knownMass = 0d; + private double knownMass = 0.0d; @XmlElement(name = RockSimCommonConstants.DENSITY) - private double density = 0d; + private double density = 0.0d; @XmlElement(name = RockSimCommonConstants.MATERIAL) private String material = ""; @XmlElement(name = RockSimCommonConstants.NAME) @@ -48,9 +48,9 @@ public abstract class BasePartDTO { @XmlElement(name = RockSimCommonConstants.XB) private double xb = 0; @XmlElement(name = RockSimCommonConstants.CALC_MASS) - private double calcMass = 0d; + private double calcMass = 0.0d; @XmlElement(name = RockSimCommonConstants.CALC_CG) - private double calcCG = 0d; + private double calcCG = 0.0d; @XmlElement(name = RockSimCommonConstants.DENSITY_TYPE) private int densityType = 0; @XmlElement(name = RockSimCommonConstants.RADIAL_LOC) @@ -60,7 +60,7 @@ public abstract class BasePartDTO { @XmlElement(name = RockSimCommonConstants.LOCATION_MODE) private int locationMode = 0; @XmlElement(name = RockSimCommonConstants.LEN, required = false, nillable = false) - private double len = 0d; + private double len = 0.0d; @XmlElement(name = RockSimCommonConstants.FINISH_CODE) private int finishCode = 0; @XmlElement(name = RockSimCommonConstants.SERIAL_NUMBER) diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java index 4e83cf81c..40fc41ff0 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java @@ -37,15 +37,15 @@ import java.util.List; public class BodyTubeDTO extends BasePartDTO implements AttachableParts { @XmlElement(name = RockSimCommonConstants.OD) - private double od = 0d; + private double od = 0.0d; @XmlElement(name = RockSimCommonConstants.ID) - private double id = 0d; + private double id = 0.0d; @XmlElement(name = RockSimCommonConstants.IS_MOTOR_MOUNT) private int isMotorMount = 0; @XmlElement(name = RockSimCommonConstants.MOTOR_DIA) - private double motorDia = 0d; + private double motorDia = 0.0d; @XmlElement(name = RockSimCommonConstants.ENGINE_OVERHANG) - private double engineOverhang = 0d; + private double engineOverhang = 0.0d; @XmlElement(name = RockSimCommonConstants.IS_INSIDE_TUBE) private int isInsideTube = 0; @XmlElementWrapper(name = RockSimCommonConstants.ATTACHED_PARTS) diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/CenteringRingDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/CenteringRingDTO.java index 8be2a68b7..e72a05f3e 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/CenteringRingDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/CenteringRingDTO.java @@ -34,9 +34,9 @@ public class CenteringRingDTO extends BasePartDTO { } @XmlElement(name = RockSimCommonConstants.OD) - private double od = 0d; + private double od = 0.0d; @XmlElement(name = RockSimCommonConstants.ID) - private double id = 0d; + private double id = 0.0d; @XmlElement(name = RockSimCommonConstants.USAGE_CODE) private int usageCode = UsageCode.CenteringRing.ordinal; @XmlElement(name = RockSimCommonConstants.AUTO_SIZE) diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/FinSetDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/FinSetDTO.java index 2de813234..2a9521ad3 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/FinSetDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/FinSetDTO.java @@ -23,29 +23,29 @@ public class FinSetDTO extends BasePartDTO { @XmlElement(name = RockSimCommonConstants.FIN_COUNT) private int finCount = 0; @XmlElement(name = RockSimCommonConstants.ROOT_CHORD) - private double rootChord = 0d; + private double rootChord = 0.0d; @XmlElement(name = RockSimCommonConstants.TIP_CHORD) - private double tipChord = 0d; + private double tipChord = 0.0d; @XmlElement(name = RockSimCommonConstants.SEMI_SPAN) - private double semiSpan = 0d; + private double semiSpan = 0.0d; @XmlElement(name = RockSimCommonConstants.SWEEP_DISTANCE) - private double sweepDistance = 0d; + private double sweepDistance = 0.0d; @XmlElement(name = RockSimCommonConstants.THICKNESS) - private double thickness = 0d; + private double thickness = 0.0d; @XmlElement(name = RockSimCommonConstants.SHAPE_CODE) private int shapeCode = 0; @XmlElement(name = RockSimCommonConstants.TIP_SHAPE_CODE) private int tipShapeCode = 0; @XmlElement(name = RockSimCommonConstants.TAB_LENGTH) - private double tabLength = 0d; + private double tabLength = 0.0d; @XmlElement(name = RockSimCommonConstants.TAB_DEPTH) - private double tabDepth = 0d; + private double tabDepth = 0.0d; @XmlElement(name = RockSimCommonConstants.TAB_OFFSET) - private double tabOffset = 0d; + private double tabOffset = 0.0d; @XmlElement(name = RockSimCommonConstants.SWEEP_MODE) private int sweepMode = 1; @XmlElement(name = RockSimCommonConstants.CANT_ANGLE) - private double cantAngle = 0d; + private double cantAngle = 0.0d; /** * Constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/LaunchLugDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/LaunchLugDTO.java index 93e331da0..4c6e81d76 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/LaunchLugDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/LaunchLugDTO.java @@ -16,9 +16,9 @@ import info.openrocket.core.rocketcomponent.LaunchLug; public class LaunchLugDTO extends BasePartDTO { @XmlElement(name = RockSimCommonConstants.OD) - private double od = 0d; + private double od = 0.0d; @XmlElement(name = RockSimCommonConstants.ID) - private double id = 0d; + private double id = 0.0d; /** * Default constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/MassObjectDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/MassObjectDTO.java index c9d2b71ba..3bcbcfd3f 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/MassObjectDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/MassObjectDTO.java @@ -33,8 +33,8 @@ public class MassObjectDTO extends BasePartDTO { super(mo); setRadialAngle(mo.getRadialDirection()); setRadialLoc(mo.getRadialPosition() * RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); - setCalcMass(0d); - setCalcCG(0d); + setCalcMass(0.0d); + setCalcCG(0.0d); setKnownCG(getXb()); setUseKnownCG(1); } diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/NoseConeDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/NoseConeDTO.java index 851cb539b..6bf8de30f 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/NoseConeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/NoseConeDTO.java @@ -16,11 +16,11 @@ import jakarta.xml.bind.annotation.XmlRootElement; public class NoseConeDTO extends AbstractTransitionDTO { @XmlElement(name = RockSimCommonConstants.BASE_DIA) - private double baseDia = 0d; + private double baseDia = 0.0d; @XmlElement(name = RockSimCommonConstants.SHOULDER_LEN) - private double shoulderLen = 0d; + private double shoulderLen = 0.0d; @XmlElement(name = RockSimCommonConstants.SHOULDER_OD) - private double shoulderOD = 0d; + private double shoulderOD = 0.0d; /** * Default constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/ParachuteDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/ParachuteDTO.java index 87da492ce..81292a41a 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/ParachuteDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/ParachuteDTO.java @@ -16,17 +16,17 @@ import jakarta.xml.bind.annotation.XmlRootElement; public class ParachuteDTO extends BasePartDTO { @XmlElement(name = RockSimCommonConstants.DIAMETER) - private double dia = 0d; + private double dia = 0.0d; @XmlElement(name = RockSimCommonConstants.SHROUD_LINE_COUNT) private int ShroudLineCount = 0; @XmlElement(name = RockSimCommonConstants.THICKNESS) - private double thickness = 0d; + private double thickness = 0.0d; @XmlElement(name = RockSimCommonConstants.SHROUD_LINE_LEN) - private double shroudLineLen = 0d; + private double shroudLineLen = 0.0d; @XmlElement(name = RockSimCommonConstants.CHUTE_COUNT) private int chuteCount = 1; @XmlElement(name = RockSimCommonConstants.SHROUD_LINE_MASS_PER_MM) - private double shroudLineMassPerMM = 0d; + private double shroudLineMassPerMM = 0.0d; @XmlElement(name = RockSimCommonConstants.SHROUD_LINE_MATERIAL) private String shroudLineMaterial = ""; @XmlElement(name = RockSimCommonConstants.DRAG_COEFFICIENT) diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/RocketDesignDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/RocketDesignDTO.java index d35e33bc4..cf1ed5130 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/RocketDesignDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/RocketDesignDTO.java @@ -28,9 +28,9 @@ public class RocketDesignDTO { @XmlElement(name = "ViewStageCountEdit") private final int viewStageCountEdit = 3; @XmlElement(name = "ZoomFactor") - private final double zoomFactor = 0d; + private final double zoomFactor = 0.0d; @XmlElement(name = "ZoomFactorEdit") - private final double zoomFactorEdit = 0d; + private final double zoomFactorEdit = 0.0d; @XmlElement(name = "ScrollPosX") private final int scrollPosX = 0; @XmlElement(name = "ScrollPosY") @@ -46,21 +46,21 @@ public class RocketDesignDTO { @XmlElement(name = "LastSerialNumber") private int lastSerialNumber = -1; @XmlElement(name = "Stage3Mass") - private double stage3Mass = 0d; + private double stage3Mass = 0.0d; @XmlElement(name = "Stage2Mass") - private double stage2Mass = 0d; + private double stage2Mass = 0.0d; @XmlElement(name = "Stage1Mass") - private double stage1Mass = 0d; + private double stage1Mass = 0.0d; @XmlElement(name = "Stage3CG") - private double stage3CG = 0d; + private double stage3CG = 0.0d; @XmlElement(name = "Stage2CGAlone") - private double stage2CGAlone = 0d; + private double stage2CGAlone = 0.0d; @XmlElement(name = "Stage1CGAlone") - private double stage1CGAlone = 0d; + private double stage1CGAlone = 0.0d; @XmlElement(name = "Stage321CG") - private double stage321CG = 0d; + private double stage321CG = 0.0d; @XmlElement(name = "Stage32CG") - private double stage32CG = 0d; + private double stage32CG = 0.0d; @XmlElement(name = "CPCalcFlags") private final int cpCalcFlags = 1; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/StreamerDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/StreamerDTO.java index 0bc66d4f3..3c15129fe 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/StreamerDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/StreamerDTO.java @@ -16,7 +16,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; public class StreamerDTO extends BasePartDTO { @XmlElement(name = RockSimCommonConstants.WIDTH) - private double width = 0d; + private double width = 0.0d; @XmlElement(name = RockSimCommonConstants.DRAG_COEFFICIENT) private double dragCoefficient = 0.75d; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/TransitionDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/TransitionDTO.java index 94417dd0b..3a18c658f 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/TransitionDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/TransitionDTO.java @@ -16,17 +16,17 @@ import jakarta.xml.bind.annotation.XmlRootElement; public class TransitionDTO extends AbstractTransitionDTO { @XmlElement(name = RockSimCommonConstants.FRONT_SHOULDER_LEN) - private double frontShoulderLen = 0d; + private double frontShoulderLen = 0.0d; @XmlElement(name = RockSimCommonConstants.REAR_SHOULDER_LEN) - private double rearShoulderLen = 0d; + private double rearShoulderLen = 0.0d; @XmlElement(name = RockSimCommonConstants.FRONT_SHOULDER_DIA) - private double frontShoulderDia = 0d; + private double frontShoulderDia = 0.0d; @XmlElement(name = RockSimCommonConstants.REAR_SHOULDER_DIA) - private double rearShoulderDia = 0d; + private double rearShoulderDia = 0.0d; @XmlElement(name = RockSimCommonConstants.FRONT_DIA) - private double frontDia = 0d; + private double frontDia = 0.0d; @XmlElement(name = RockSimCommonConstants.REAR_DIA) - private double rearDia = 0d; + private double rearDia = 0.0d; /** * Default constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeFinSetDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeFinSetDTO.java index 8fa6b69da..df8a56a9b 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeFinSetDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeFinSetDTO.java @@ -16,9 +16,9 @@ import jakarta.xml.bind.annotation.XmlRootElement; public class TubeFinSetDTO extends BasePartDTO { @XmlElement(name = RockSimCommonConstants.OD) - private double od = 0d; + private double od = 0.0d; @XmlElement(name = RockSimCommonConstants.ID) - private double id = 0d; + private double id = 0.0d; @XmlElement(name = RockSimCommonConstants.TUBE_COUNT) private int tubeCount = 0; @XmlElement(name = RockSimCommonConstants.MAX_TUBES_ALLOWED) diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/importt/BaseHandler.java b/core/src/main/java/info/openrocket/core/file/rocksim/importt/BaseHandler.java index 6b3f0eaa3..03d11c9d3 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/importt/BaseHandler.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/importt/BaseHandler.java @@ -36,15 +36,15 @@ public abstract class BaseHandler extends AbstractEle /** * The overridden mass. */ - private Double mass = 0d; + private Double mass = 0.0d; /** * The overridden Cg. */ - private Double cg = 0d; + private Double cg = 0.0d; /** * The density of the material in the component. */ - private Double density = 0d; + private Double density = 0.0d; /** * The internal Rocksim density type. */ @@ -83,13 +83,13 @@ public abstract class BaseHandler extends AbstractEle component.setName(content); } if (RockSimCommonConstants.KNOWN_MASS.equals(element)) { - mass = Math.max(0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS); + mass = Math.max(0.0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS); } if (RockSimCommonConstants.DENSITY.equals(element)) { - density = Math.max(0d, Double.parseDouble(content)); + density = Math.max(0.0d, Double.parseDouble(content)); } if (RockSimCommonConstants.KNOWN_CG.equals(element)) { - cg = Math.max(0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); + cg = Math.max(0.0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); } if (RockSimCommonConstants.USE_KNOWN_CG.equals(element)) { // Rocksim sets UseKnownCG to true to control the // override of both cg and mass diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/importt/FinSetHandler.java b/core/src/main/java/info/openrocket/core/file/rocksim/importt/FinSetHandler.java index 1cdf228ca..d43d69acd 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/importt/FinSetHandler.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/importt/FinSetHandler.java @@ -128,15 +128,15 @@ class FinSetHandler extends AbstractElementHandler { /** * The overridden mass. */ - private Double mass = 0d; + private Double mass = 0.0d; /** * The overridden Cg. */ - private Double cg = 0d; + private Double cg = 0.0d; /** * The density of the material in the component. */ - private Double density = 0d; + private Double density = 0.0d; /** * The material name. */ @@ -144,11 +144,11 @@ class FinSetHandler extends AbstractElementHandler { /** * The Rocksim calculated mass. */ - private Double calcMass = 0d; + private Double calcMass = 0.0d; /** * The Rocksim calculated cg. */ - private Double calcCg = 0d; + private Double calcCg = 0.0d; private final RockSimAppearanceBuilder appearanceBuilder; @@ -257,14 +257,14 @@ class FinSetHandler extends AbstractElementHandler { pointList = content; } if (RockSimCommonConstants.KNOWN_MASS.equals(element)) { - mass = Math.max(0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS); + mass = Math.max(0.0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS); } if (RockSimCommonConstants.DENSITY.equals(element)) { - density = Math.max(0d, + density = Math.max(0.0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_BULK_DENSITY); } if (RockSimCommonConstants.KNOWN_CG.equals(element)) { - cg = Math.max(0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS); + cg = Math.max(0.0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS); } if (RockSimCommonConstants.USE_KNOWN_CG.equals(element)) { override = "1".equals(content); @@ -359,10 +359,10 @@ class FinSetHandler extends AbstractElementHandler { Double radiusFront = result.getParentFrontRadius(component); Double radiusTrailing = result.getParentTrailingRadius(component); if (radiusFront == null) { - radiusFront = 0d; + radiusFront = 0.0d; } if (radiusTrailing == null) { - radiusTrailing = 0d; + radiusTrailing = 0.0d; } double tabDepthOffset = Math.max(radiusFront - radiusTrailing, 0); result.setTabHeight(tabDepth - tabDepthOffset); diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/importt/NoseConeHandler.java b/core/src/main/java/info/openrocket/core/file/rocksim/importt/NoseConeHandler.java index 456c62bb1..7d2667295 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/importt/NoseConeHandler.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/importt/NoseConeHandler.java @@ -32,7 +32,7 @@ class NoseConeHandler extends BaseHandler { /** * The wall thickness. Used for hollow nose cones. */ - private double thickness = 0d; + private double thickness = 0.0d; /** * Constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/importt/PositionDependentHandler.java b/core/src/main/java/info/openrocket/core/file/rocksim/importt/PositionDependentHandler.java index 0a8258486..b5a17df98 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/importt/PositionDependentHandler.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/importt/PositionDependentHandler.java @@ -27,7 +27,7 @@ import org.xml.sax.SAXException; public abstract class PositionDependentHandler extends BaseHandler { /** Temporary axialMethod value. */ - private Double positionValue = 0d; + private Double positionValue = 0.0d; /** Temporary axialMethod. */ private AxialMethod axialMethod = AxialMethod.TOP; @@ -82,7 +82,7 @@ public abstract class PositionDependentHandler extend } getComponent().setAxialMethod(axialMethod); if (axialMethod.equals(AxialMethod.BOTTOM)) { - getComponent().setAxialOffset(-1d * positionValue); + getComponent().setAxialOffset(-1.0d * positionValue); } else { getComponent().setAxialOffset(positionValue); } diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/importt/RecoveryDeviceHandler.java b/core/src/main/java/info/openrocket/core/file/rocksim/importt/RecoveryDeviceHandler.java index 613fa75d9..3284d10d8 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/importt/RecoveryDeviceHandler.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/importt/RecoveryDeviceHandler.java @@ -29,12 +29,12 @@ public abstract class RecoveryDeviceHandler extends Po * The thickness. Not used by every component, and some component handlers may * parse it for their own purposes. */ - private double thickness = 0d; + private double thickness = 0.0d; /** * The Rocksim calculated mass. Used only when not overridden and when Rocksim * says density == 0 (Rocksim bug). */ - private Double calcMass = 0d; + private Double calcMass = 0.0d; public RecoveryDeviceHandler(DocumentLoadingContext context) { super(context); @@ -53,7 +53,7 @@ public abstract class RecoveryDeviceHandler extends Po thickness = Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH; } if (RockSimCommonConstants.CALC_MASS.equals(element)) { - calcMass = Math.max(0d, + calcMass = Math.max(0.0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS); } } catch (NumberFormatException nfe) { @@ -76,7 +76,7 @@ public abstract class RecoveryDeviceHandler extends Po double result; - if (rawDensity > 0d) { + if (rawDensity > 0.0d) { // ROCKSIM_SURFACE is a square area density; compute normally // ROCKSIM_LINE is a single length dimension (kg/m) but Rocksim ignores // thickness for this type and treats diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/importt/RockSimHandler.java b/core/src/main/java/info/openrocket/core/file/rocksim/importt/RockSimHandler.java index 51a5cce08..9930827be 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/importt/RockSimHandler.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/importt/RockSimHandler.java @@ -176,27 +176,27 @@ class RocketDesignHandler extends AbstractElementHandler { /** * The overridden stage 1 mass. */ - private double stage1Mass = 0d; + private double stage1Mass = 0.0d; /** * The overridden stage 2 mass. */ - private double stage2Mass = 0d; + private double stage2Mass = 0.0d; /** * The overridden stage 3 mass. */ - private double stage3Mass = 0d; + private double stage3Mass = 0.0d; /** * The overridden stage 1 Cg. */ - private double stage1CG = 0d; + private double stage1CG = 0.0d; /** * The overridden stage 2 Cg. */ - private double stage2CG = 0d; + private double stage2CG = 0.0d; /** * The overridden stage 3 Cg. */ - private double stage3CG = 0d; + private double stage3CG = 0.0d; /** * Constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/importt/TransitionHandler.java b/core/src/main/java/info/openrocket/core/file/rocksim/importt/TransitionHandler.java index 8d8f554f3..ddb511a78 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/importt/TransitionHandler.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/importt/TransitionHandler.java @@ -30,7 +30,7 @@ class TransitionHandler extends BaseHandler { /** * The wall thickness. Used for hollow nose cones. */ - private double thickness = 0d; + private double thickness = 0.0d; /** * Constructor. @@ -80,23 +80,23 @@ class TransitionHandler extends BaseHandler { content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS)); } if ("WallThickness".equals(element)) { - thickness = Math.max(0d, + thickness = Math.max(0.0d, Double.parseDouble(content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); } if ("FrontShoulderDia".equals(element)) { - transition.setForeShoulderRadius(Math.max(0d, Double.parseDouble( + transition.setForeShoulderRadius(Math.max(0.0d, Double.parseDouble( content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS)); } if ("RearShoulderDia".equals(element)) { - transition.setAftShoulderRadius(Math.max(0d, Double.parseDouble( + transition.setAftShoulderRadius(Math.max(0.0d, Double.parseDouble( content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS)); } if ("FrontShoulderLen".equals(element)) { - transition.setForeShoulderLength(Math.max(0d, Double.parseDouble( + transition.setForeShoulderLength(Math.max(0.0d, Double.parseDouble( content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH)); } if ("RearShoulderLen".equals(element)) { - transition.setAftShoulderLength(Math.max(0d, Double.parseDouble( + transition.setAftShoulderLength(Math.max(0.0d, Double.parseDouble( content) / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH)); } if ("ShapeParameter".equals(element)) { diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/ObjUtils.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/ObjUtils.java index a863577ec..104b26387 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/ObjUtils.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/ObjUtils.java @@ -411,9 +411,9 @@ public class ObjUtils { * @return the normalized normal vector of the polygon */ private static FloatTuple calculateNormalNewell(FloatTuple[] vertices) { - float x = 0f; - float y = 0f; - float z = 0f; + float x = 0.0f; + float y = 0.0f; + float z = 0.0f; for (int i = 0; i < vertices.length; i++) { FloatTuple current = vertices[i]; FloatTuple next = vertices[(i + 1) % vertices.length]; diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/AppearanceExporter.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/AppearanceExporter.java index 17540fc3e..06993d4e1 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/AppearanceExporter.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/AppearanceExporter.java @@ -102,7 +102,7 @@ public class AppearanceExporter { final Coordinate scale = texture.getScale(); float scaleX = (float) scale.x; float scaleY = (float) scale.y; - textureOptions.setS(scaleX, scaleY, 1f); + textureOptions.setS(scaleX, scaleY, 1.0f); // Texture offset // Need an extra offset because the texture scale origin is different in OR @@ -110,7 +110,7 @@ public class AppearanceExporter { float origX = (float) (scaleX*(-1 - origin.x) + 1); float origY = (float) (scaleY*(-1 - origin.y) + 1); - textureOptions.setO(origX, origY, 0f); + textureOptions.setO(origX, origY, 0.0f); // Texture rotation is not possible in MTL... @@ -131,15 +131,15 @@ public class AppearanceExporter { final float g = convertColorToFloat(color.getGreen(), options.isUseSRGB()); final float b = convertColorToFloat(color.getBlue(), options.isUseSRGB()); material.setKd(r, g, b); // Diffuse color - material.setKa(0f, 0f, 0f); // No emission - material.setKs(.25f, .25f, .25f); // Not too strong specular highlights - material.setD(color.getAlpha()/255f); // Opacity + material.setKa(0.0f, 0.0f, 0.0f); // No emission + material.setKs(0.25f, 0.25f, 0.25f); // Not too strong specular highlights + material.setD(color.getAlpha()/ 255.0f); // Opacity material.setNs((float) appearance.getShine() * 750); // Shine (max is 1000, but this too strong compared to OpenRocket's max) material.setIllum(2); // Use Phong reflection (specular highlights etc.) } private static float convertColorToFloat(int color, boolean sRGB) { - float convertedColor = color / 255f; + float convertedColor = color / 255.0f; if (sRGB) { convertedColor = linearTosRGB(convertedColor); } diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/MassObjectExporter.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/MassObjectExporter.java index b5e7dab2a..1de745bcd 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/MassObjectExporter.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/MassObjectExporter.java @@ -83,7 +83,7 @@ public class MassObjectExporter extends RocketComponentExporter { } // Add final UV coordinate to close the texture - final float u = 1f; + final float u = 1.0f; final float v = (float) (numStacks-j) / numStacks; obj.addTexCoord(u, v); } diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/MotorExporter.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/MotorExporter.java index 765573794..8df239c79 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/MotorExporter.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/MotorExporter.java @@ -120,7 +120,7 @@ public class MotorExporter { //// Cone tip for (int i = 0; i <= numSides; i++) { final float u = ((float) i) / numSides; - obj.addTexCoord(u, 0f); + obj.addTexCoord(u, 0.0f); } int endIdx = Math.max(obj.getNumVertices() - 1, startIdx); // Clamp in case no vertices were added diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/TransitionExporter.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/TransitionExporter.java index 5e37c8d9f..9829e7bbf 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/TransitionExporter.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/export/components/TransitionExporter.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; public class TransitionExporter extends RocketComponentExporter { - private static final double RADIUS_EPSILON = 1e-4; + private static final double RADIUS_EPSILON = 1.0e-4; private final int nrOfSides; private static final Translator trans = Application.getTranslator(); @@ -209,7 +209,7 @@ public class TransitionExporter extends RocketComponentExporter { obj.addNormal(transformer.convertLocWithoutOriginOffs(isOutside ? -1 : 1, 0, 0)); for (int i = 0; i <= numSides; i++) { float u = (float) i / numSides; - float v = 1f; + float v = 1.0f; obj.addTexCoord(u, v); } @@ -257,7 +257,7 @@ public class TransitionExporter extends RocketComponentExporter { obj.addNormal(transformer.convertLocWithoutOriginOffs(isOutside ? 1 : -1, 0, 0)); for (int i = 0; i <= numSides; i++) { float u = (float) i / numSides; - float v = 0f; + float v = 0.0f; obj.addTexCoord(u, v); } isAftTip = true; @@ -414,7 +414,7 @@ public class TransitionExporter extends RocketComponentExporter { // Need to add a last texture coordinate to close the texture final float v = (float) ((length-x) / length); - obj.addTexCoord(1f, v); + obj.addTexCoord(1.0f, v); } private void addQuadFaces(int numSides, int numStacks, int startIdx, int normalsStartIdx, int texCoordsStartIdx, boolean isOutside) { 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 f539f8cd1..ed99c9b56 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 @@ -44,9 +44,9 @@ public class PolygonExporter { // Compute texture coordinates based on normalized position float u = (pointLocationsX[i] - boundaries.getMinX()) / (boundaries.getMaxX() - boundaries.getMinX()); - u = 1f - u; + u = 1.0f - u; float v = (pointLocationsY[i] - boundaries.getMinY()) / (boundaries.getMaxY() - boundaries.getMinY()); - v = 1f - v; + v = 1.0f - v; obj.addTexCoord(u, v); } @@ -56,9 +56,9 @@ public class PolygonExporter { // Compute texture coordinates based on normalized position float u = (pointLocationsX[i] - boundaries.getMinX()) / (boundaries.getMaxX() - boundaries.getMinX()); - u = 1f - u; + u = 1.0f - u; float v = (pointLocationsY[i] - boundaries.getMinY()) / (boundaries.getMaxY() - boundaries.getMinY()); - v = 1f - v; + v = 1.0f - v; obj.addTexCoord(u, v); } diff --git a/core/src/main/java/info/openrocket/core/masscalc/RigidBody.java b/core/src/main/java/info/openrocket/core/masscalc/RigidBody.java index edf1f4555..42e474eba 100644 --- a/core/src/main/java/info/openrocket/core/masscalc/RigidBody.java +++ b/core/src/main/java/info/openrocket/core/masscalc/RigidBody.java @@ -13,7 +13,7 @@ public class RigidBody { public final double Iyy; public final double Izz; - public static final RigidBody EMPTY = new RigidBody(Coordinate.ZERO, 0., 0., 0.); + public static final RigidBody EMPTY = new RigidBody(Coordinate.ZERO, 0.0, 0.0, 0.0); public RigidBody(Coordinate _cm, double I_axial, double I_long) { this(_cm, I_axial, I_long, I_long); @@ -107,7 +107,7 @@ public class RigidBody { * @return RigidBody with rebased moment of inertia */ public RigidBody rebase(final Coordinate newLocation) { - final Coordinate delta = this.cm.sub(newLocation).setWeight(0.); + final Coordinate delta = this.cm.sub(newLocation).setWeight(0.0); double x2 = pow2(delta.x); double y2 = pow2(delta.y); double z2 = pow2(delta.z); diff --git a/core/src/main/java/info/openrocket/core/motor/ThrustCurveMotor.java b/core/src/main/java/info/openrocket/core/motor/ThrustCurveMotor.java index 0545738af..f0b2c424e 100644 --- a/core/src/main/java/info/openrocket/core/motor/ThrustCurveMotor.java +++ b/core/src/main/java/info/openrocket/core/motor/ThrustCurveMotor.java @@ -21,7 +21,7 @@ public class ThrustCurveMotor implements Motor, Comparable, Se @SuppressWarnings("unused") private static final Logger log = LoggerFactory.getLogger(ThrustCurveMotor.class); - public static final double MAX_THRUST = 10e6; + public static final double MAX_THRUST = 10.0e6; // Comparators: private static final Collator COLLATOR = Collator.getInstance(Locale.US); @@ -323,7 +323,7 @@ public class ThrustCurveMotor implements Motor, Comparable, Se // we are already at the end of the time array. if (upperBoundIndex == time.length) { - return 0.; + return 0.0; } final double lowerBoundTime = time[lowerBoundIndex]; @@ -333,10 +333,10 @@ public class ThrustCurveMotor implements Motor, Comparable, Se if (SNAP_DISTANCE > indexFraction) { // round down to previous index - return 0.; + return 0.0; } else if ((1 - SNAP_DISTANCE) < indexFraction) { // round up to next index - return 1.; + return 1.0; } else { // general case return indexFraction; diff --git a/core/src/main/java/info/openrocket/core/optimization/general/onedim/GoldenSectionSearchOptimizer.java b/core/src/main/java/info/openrocket/core/optimization/general/onedim/GoldenSectionSearchOptimizer.java index e961c51ca..5fb5f3f88 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/onedim/GoldenSectionSearchOptimizer.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/onedim/GoldenSectionSearchOptimizer.java @@ -26,7 +26,7 @@ import info.openrocket.core.util.Statistics; public class GoldenSectionSearchOptimizer implements FunctionOptimizer, Statistics { private static final Logger log = LoggerFactory.getLogger(GoldenSectionSearchOptimizer.class); - private static final double ALPHA = (Math.sqrt(5) - 1) / 2.0; + private static final double ALPHA = (2.23606797749979 - 1) / 2.0; // Math.sqrt(5) - ... private ParallelFunctionCache functionExecutor; diff --git a/core/src/main/java/info/openrocket/core/preset/loader/NoseConeLoader.java b/core/src/main/java/info/openrocket/core/preset/loader/NoseConeLoader.java index 472cd0d00..ecd4f69b5 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/NoseConeLoader.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/NoseConeLoader.java @@ -33,7 +33,7 @@ public class NoseConeLoader extends BaseComponentLoader { if (props.containsKey(ComponentPreset.THICKNESS)) { double thickness = props.get(ComponentPreset.THICKNESS); - if (thickness == 0d) { + if (thickness == 0.0d) { props.remove(ComponentPreset.THICKNESS); props.put(ComponentPreset.FILLED, true); } diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java b/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java index 932dbd349..da53372b1 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java @@ -16,8 +16,8 @@ import java.util.List; public class ClusterConfiguration { // Helper vars private static final double R5 = 1.0 / (2 * Math.sin(2 * Math.PI / 10)); - private static final double SQRT2 = Math.sqrt(2); - private static final double SQRT3 = Math.sqrt(3); + private static final double SQRT2 = 1.4142135623730951; + private static final double SQRT3 = 1.7320508075688772; /** A single motor */ public static final ClusterConfiguration SINGLE = new ClusterConfiguration("single", 0, 0); diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/ExternalComponent.java b/core/src/main/java/info/openrocket/core/rocketcomponent/ExternalComponent.java index 871b774d1..d169f56d6 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/ExternalComponent.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/ExternalComponent.java @@ -32,19 +32,19 @@ public abstract class ExternalComponent extends RocketComponent { */ //// Rough - ROUGH("ExternalComponent.Rough", 500e-6), + ROUGH("ExternalComponent.Rough", 500.0e-6), //// Rough unfinished - ROUGHUNFINISHED("ExternalComponent.Roughunfinished", 250e-6), + ROUGHUNFINISHED("ExternalComponent.Roughunfinished", 250.0e-6), //// Unfinished - UNFINISHED("ExternalComponent.Unfinished", 150e-6), + UNFINISHED("ExternalComponent.Unfinished", 150.0e-6), //// Regular paint - NORMAL("ExternalComponent.Regularpaint", 60e-6), + NORMAL("ExternalComponent.Regularpaint", 60.0e-6), //// Smooth paint - SMOOTH("ExternalComponent.Smoothpaint", 20e-6), + SMOOTH("ExternalComponent.Smoothpaint", 20.0e-6), //// Optimum paint - OPTIMUM("ExternalComponent.Optimumpaint", 5e-6), + OPTIMUM("ExternalComponent.Optimumpaint", 5.0e-6), //// Polished - POLISHED("ExternalComponent.Polished", 2e-6), + POLISHED("ExternalComponent.Polished", 2.0e-6), /* * The "polished" surface roughness was originally set at 2.0 microns. However, @@ -62,7 +62,7 @@ public abstract class ExternalComponent extends RocketComponent { */ //// Optimum paint - FINISHPOLISHED("ExternalComponent.Finishedpolished", .5e-6), + FINISHPOLISHED("ExternalComponent.Finishedpolished", 0.5e-6), //// Optimum paint MIRROR("ExternalComponent.Mirror", 0.0e-6); diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/FinSet.java b/core/src/main/java/info/openrocket/core/rocketcomponent/FinSet.java index 7bfe01c9f..14f8bfb4d 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FinSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FinSet.java @@ -114,13 +114,13 @@ public abstract class FinSet extends ExternalComponent /* * Fin tab properties. */ - private static final double minimumTabArea = 1e-8; + private static final double minimumTabArea = 1.0e-8; private double tabHeight = 0; private double tabLength = 0.05; // this is always measured from the root-lead point. private double tabPosition = 0.0; private AxialMethod tabOffsetMethod = AxialMethod.MIDDLE; - private double tabOffset = 0.; + private double tabOffset = 0.0; /* * Fin fillet properties @@ -193,7 +193,7 @@ public abstract class FinSet extends ExternalComponent @Override public double getBoundingRadius(){ - return 0.; + return 0.0; } /** @@ -566,7 +566,7 @@ public abstract class FinSet extends ExternalComponent - innerArcAngle * bodyRadius * bodyRadius / 2); if (Double.isNaN(crossSectionArea)) { - crossSectionArea = 0.; + crossSectionArea = 0.0; } else { // each fin has a fillet on each side crossSectionArea *= 2; @@ -637,7 +637,7 @@ public abstract class FinSet extends ExternalComponent Transformation rotation = Transformation.rotate_x( getAngleOffset()); return rotation.transform(filletVolumeCentroid); } else{ - return filletVolumeCentroid.setY(0.); + return filletVolumeCentroid.setY(0.0); } } @@ -1065,7 +1065,7 @@ public abstract class FinSet extends ExternalComponent return null; } - return getMountPoints(0., parent.getLength(), 0,0); + return getMountPoints(0.0, parent.getLength(), 0,0); } /** @@ -1666,7 +1666,7 @@ public abstract class FinSet extends ExternalComponent if (finCount == 1) { this.centerOfMass = baseRotation.transform( eachFinCenterOfMass ); } else { - this.centerOfMass = eachFinCenterOfMass.setY(0.).setWeight( eachFinMass * this.finCount); + this.centerOfMass = eachFinCenterOfMass.setY(0.0).setWeight( eachFinMass * this.finCount); } } diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/FreeformFinSet.java b/core/src/main/java/info/openrocket/core/rocketcomponent/FreeformFinSet.java index 01d419718..faf5ff1e0 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FreeformFinSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FreeformFinSet.java @@ -21,8 +21,8 @@ public class FreeformFinSet extends FinSet { // this class uses certain features of 'ArrayList' which are not implemented in other 'List' implementations. private ArrayList points = new ArrayList<>(); - private static final double SNAP_SMALLER_THAN = 5e-3; - private static final double IGNORE_SMALLER_THAN = 1e-12; + private static final double SNAP_SMALLER_THAN = 5.0e-3; + private static final double IGNORE_SMALLER_THAN = 1.0e-12; // attempts to set a fin value any larger than this will be snapped to this max value public static final double SNAP_LARGER_THAN = 2.5; // in meters diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java b/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java index 40737108a..1cf31ee37 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java @@ -239,7 +239,7 @@ public class ParallelStage extends AxialStage implements FlightConfigurableCompo double newRadius = requestedRadius; if (requestedMethod.clampToZero()) { - newRadius = 0.; + newRadius = 0.0; } this.radiusMethod = requestedMethod; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/PodSet.java b/core/src/main/java/info/openrocket/core/rocketcomponent/PodSet.java index 907759808..50a5560d7 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/PodSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/PodSet.java @@ -273,7 +273,7 @@ public class PodSet extends ComponentAssembly implements RingInstanceable { double newRadius = requestRadius; if (this.radiusMethod.clampToZero()) { - newRadius = 0.; + newRadius = 0.0; } this.radiusMethod = requestMethod; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java b/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java index bef61f53f..ed2bcd5df 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java @@ -302,7 +302,7 @@ public class RailButton extends ExternalComponent final double volOuter = Math.PI*Math.pow( outerDiameter_m/2, 2)*flangeHeight_m; final double volInner = Math.PI*Math.pow( innerDiameter_m/2, 2)*getInnerHeight(); final double volStandoff = Math.PI*Math.pow( outerDiameter_m/2, 2)* baseHeight_m; - final double volScrew = 2f/3 * Math.PI * MathUtil.pow2(outerDiameter_m/2) * screwHeight_m; + final double volScrew = 2.0f /3 * Math.PI * MathUtil.pow2(outerDiameter_m/2) * screwHeight_m; final double volInstance = volOuter + volInner + volStandoff + volScrew; return volInstance * getInstanceCount(); } @@ -371,7 +371,7 @@ public class RailButton extends ExternalComponent final double massBase = Math.pow(outerDiameter_m / 2, 2) * this.baseHeight_m; final double massInner = Math.pow(innerDiameter_m / 2, 2)* getInnerHeight(); final double massFlange = Math.pow(outerDiameter_m / 2, 2)* this.flangeHeight_m; - final double massScrew = 2f/3 * MathUtil.pow2(outerDiameter_m/2) * screwHeight_m; + final double massScrew = 2.0f /3 * MathUtil.pow2(outerDiameter_m/2) * screwHeight_m; final double totalMass = massFlange + massInner + massBase + massScrew; final double baseCM = this.baseHeight_m /2; final double innerCM = this.baseHeight_m + this.getInnerHeight()/2; 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 02161ed32..fc900514a 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java @@ -294,7 +294,7 @@ public class Rocket extends ComponentAssembly { @Override public void setAxialOffset(final double requestOffset) { - this.axialOffset = 0.; + this.axialOffset = 0.0; this.position = Coordinate.ZERO; } diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java b/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java index 479b624eb..2b573293d 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java @@ -1447,12 +1447,12 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab } this.axialMethod = AxialMethod.AFTER; - this.axialOffset = 0.; + this.axialOffset = 0.0; // if first component in the stage. => position from the top of the parent final int thisIndex = this.parent.getChildPosition(this); if (0 == thisIndex) { - this.position = this.position.setX(0.); + this.position = this.position.setX(0.0); } else if (0 < thisIndex) { int idx = thisIndex - 1; RocketComponent referenceComponent = parent.getChild(idx); @@ -1463,7 +1463,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab // If previous components are inactive, set this as the new reference point if (!getRocket().getSelectedConfiguration().isComponentActive(referenceComponent)) { - this.position = this.position.setX(0.); + this.position = this.position.setX(0.0); return; } diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/position/AngleMethod.java b/core/src/main/java/info/openrocket/core/rocketcomponent/position/AngleMethod.java index e66d01261..595d96eb2 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/position/AngleMethod.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/position/AngleMethod.java @@ -25,7 +25,7 @@ public enum AngleMethod implements DistanceMethod { @Override public double getAngle(final RocketComponent parentComponent, final RocketComponent thisComponent, final double requestedAngleOffset_radians) { - return 0.; + return 0.00; } }, diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/position/RadiusMethod.java b/core/src/main/java/info/openrocket/core/rocketcomponent/position/RadiusMethod.java index 18c7c43b4..e961cd854 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/position/RadiusMethod.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/position/RadiusMethod.java @@ -14,7 +14,7 @@ public enum RadiusMethod implements DistanceMethod { @Override public double getRadius(final RocketComponent parentComponent, final RocketComponent thisComponent, final double requestedOffset) { - return 0.; + return 0.0; } @Override @@ -85,7 +85,7 @@ public enum RadiusMethod implements DistanceMethod { @Override public double getRadius(final RocketComponent parentComponent, final RocketComponent thisComponent, final double requestedOffset) { - double radius = 0.; + double radius = 0.0; if (parentComponent instanceof BodyTube) { radius += ((BodyTube) parentComponent).getOuterRadius(); } 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 9ab38acd1..f94746090 100644 --- a/core/src/main/java/info/openrocket/core/simulation/RK4SimulationStepper.java +++ b/core/src/main/java/info/openrocket/core/simulation/RK4SimulationStepper.java @@ -247,9 +247,9 @@ public class RK4SimulationStepper extends AbstractSimulationStepper { store.storeData(status); // Verify that values don't run out of range - if (status.getRocketVelocity().length2() > 1e18 || - status.getRocketPosition().length2() > 1e18 || - status.getRocketRotationVelocity().length2() > 1e18) { + if (status.getRocketVelocity().length2() > 1.0e18 || + status.getRocketPosition().length2() > 1.0e18 || + status.getRocketRotationVelocity().length2() > 1.0e18) { throw new SimulationCalculationException(trans.get("error.valuesTooLarge"), status.getFlightDataBranch()); } } diff --git a/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java b/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java index 6d092fde1..e4c6d41cf 100644 --- a/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java +++ b/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java @@ -150,7 +150,7 @@ public class DampingMoment extends AbstractSimulationExtension { double rho = flightConditions.getAtmosphericConditions().getDensity(); double ar = flightConditions.getRefArea(); - aerodynamicPart = aerodynamicPart * .5 * rho * v * ar; + aerodynamicPart = aerodynamicPart * 0.5 * rho * v * ar; return aerodynamicPart + propulsivePart; } diff --git a/core/src/main/java/info/openrocket/core/startup/Preferences.java b/core/src/main/java/info/openrocket/core/startup/Preferences.java index 08f88f3af..e1acc0829 100644 --- a/core/src/main/java/info/openrocket/core/startup/Preferences.java +++ b/core/src/main/java/info/openrocket/core/startup/Preferences.java @@ -398,7 +398,7 @@ public abstract class Preferences implements ChangeSource { public double getWindSpeedDeviation() { - return this.getDouble(WIND_AVERAGE, 2) * this.getDouble(WIND_TURBULENCE, .1); + return this.getDouble(WIND_AVERAGE, 2) * this.getDouble(WIND_TURBULENCE, 0.1); } public void setWindSpeedDeviation(double windDeviation) { diff --git a/core/src/main/java/info/openrocket/core/unit/Unit.java b/core/src/main/java/info/openrocket/core/unit/Unit.java index b286305c9..3bad75409 100644 --- a/core/src/main/java/info/openrocket/core/unit/Unit.java +++ b/core/src/main/java/info/openrocket/core/unit/Unit.java @@ -104,7 +104,7 @@ public abstract class Unit { double val = toUnit(value); - if (Math.abs(val) > 1E6) { + if (Math.abs(val) > 1.0E6) { return expFormat.format(val); } if (Math.abs(val) >= 100) { 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 1e922a8d9..6fc40e63c 100644 --- a/core/src/main/java/info/openrocket/core/unit/UnitGroup.java +++ b/core/src/main/java/info/openrocket/core/unit/UnitGroup.java @@ -106,27 +106,27 @@ public class UnitGroup { UNITS_ENERGY = new UnitGroup(); UNITS_ENERGY.addUnit(new GeneralUnit(1, "J")); - UNITS_ENERGY.addUnit(new GeneralUnit(1e-7, "erg")); + UNITS_ENERGY.addUnit(new GeneralUnit(1.0e-7, "erg")); UNITS_ENERGY.addUnit(new GeneralUnit(1.055, "BTU")); UNITS_ENERGY.addUnit(new GeneralUnit(4.184, "cal")); UNITS_ENERGY.addUnit(new GeneralUnit(1.3558179483314, "ft" + DOT + "lbf")); UNITS_POWER = new UnitGroup(); - UNITS_POWER.addUnit(new GeneralUnit(1e-3, "mW")); + UNITS_POWER.addUnit(new GeneralUnit(1.0e-3, "mW")); UNITS_POWER.addUnit(new GeneralUnit(1, "W")); - UNITS_POWER.addUnit(new GeneralUnit(1e3, "kW")); - UNITS_POWER.addUnit(new GeneralUnit(1e-7, "ergs")); + UNITS_POWER.addUnit(new GeneralUnit(1.0e3, "kW")); + UNITS_POWER.addUnit(new GeneralUnit(1.0e-7, "ergs")); UNITS_POWER.addUnit(new GeneralUnit(745.699872, "hp")); UNITS_MOMENTUM = new UnitGroup(); UNITS_MOMENTUM.addUnit(new GeneralUnit(1, "kg" + DOT + "m/s")); UNITS_VOLTAGE = new UnitGroup(); - UNITS_VOLTAGE.addUnit(new GeneralUnit(1e-3, "mV")); + UNITS_VOLTAGE.addUnit(new GeneralUnit(1.0e-3, "mV")); UNITS_VOLTAGE.addUnit(new GeneralUnit(1, "V")); UNITS_CURRENT = new UnitGroup(); - UNITS_CURRENT.addUnit(new GeneralUnit(1e-3, "mA")); + UNITS_CURRENT.addUnit(new GeneralUnit(1.0e-3, "mA")); UNITS_CURRENT.addUnit(new GeneralUnit(1, "A")); UNITS_LENGTH = new UnitGroup(); @@ -134,7 +134,7 @@ public class UnitGroup { UNITS_LENGTH.addUnit(new GeneralUnit(0.01, "cm")); UNITS_LENGTH.addUnit(new GeneralUnit(1, "m")); UNITS_LENGTH.addUnit(new InchUnit(0.0254, "in", 1)); - UNITS_LENGTH.addUnit(new FractionalUnit(0.0254, "in/64", "in", 64, 1d / 16d, 0.5d / 64d)); + UNITS_LENGTH.addUnit(new FractionalUnit(0.0254, "in/64", "in", 64, 1.0d / 16.0d, 0.5d / 64.0d)); UNITS_LENGTH.addUnit(new GeneralUnit(0.3048, "ft")); UNITS_MOTOR_DIMENSIONS = new UnitGroup(); @@ -157,7 +157,7 @@ public class UnitGroup { UNITS_ALL_LENGTHS.addUnit(new GeneralUnit(1, "m")); UNITS_ALL_LENGTHS.addUnit(new GeneralUnit(1000, "km")); UNITS_ALL_LENGTHS.addUnit(new GeneralUnit(0.0254, "in")); - UNITS_ALL_LENGTHS.addUnit(new FractionalUnit(0.0254, "in/64", "in", 64, 1d / 16d, 0.5d / 64d)); + UNITS_ALL_LENGTHS.addUnit(new FractionalUnit(0.0254, "in/64", "in", 64, 1.0d / 16.0d, 0.5d / 64.0d)); UNITS_ALL_LENGTHS.addUnit(new GeneralUnit(0.3048, "ft")); UNITS_ALL_LENGTHS.addUnit(new GeneralUnit(0.9144, "yd")); UNITS_ALL_LENGTHS.addUnit(new GeneralUnit(1609.344, "mi")); @@ -318,7 +318,7 @@ public class UnitGroup { // This is not used by OpenRocket, and not extensively tested: UNITS_FREQUENCY = new UnitGroup(); - UNITS_FREQUENCY.addUnit(new FrequencyUnit(.001, "mHz")); + UNITS_FREQUENCY.addUnit(new FrequencyUnit(0.001, "mHz")); UNITS_FREQUENCY.addUnit(new FrequencyUnit(1, "Hz")); UNITS_FREQUENCY.addUnit(new FrequencyUnit(1000, "kHz")); diff --git a/core/src/main/java/info/openrocket/core/util/LineStyle.java b/core/src/main/java/info/openrocket/core/util/LineStyle.java index 47d7a4663..535a906e3 100644 --- a/core/src/main/java/info/openrocket/core/util/LineStyle.java +++ b/core/src/main/java/info/openrocket/core/util/LineStyle.java @@ -15,13 +15,13 @@ import info.openrocket.core.startup.Application; public enum LineStyle { //// Solid - SOLID("LineStyle.Solid", new float[] { 10f, 0f }), + SOLID("LineStyle.Solid", new float[] {10.0f, 0.0f}), //// Dashed - DASHED("LineStyle.Dashed", new float[] { 6f, 4f }), + DASHED("LineStyle.Dashed", new float[] {6.0f, 4.0f}), //// Dotted - DOTTED("LineStyle.Dotted", new float[] { 2f, 3f }), + DOTTED("LineStyle.Dotted", new float[] {2.0f, 3.0f}), //// Dash-dotted - DASHDOT("LineStyle.Dash-dotted", new float[] { 8f, 3f, 2f, 3f }); + DASHDOT("LineStyle.Dash-dotted", new float[] {8.0f, 3.0f, 2.0f, 3.0f}); private static final Translator trans = Application.getTranslator(); private final String name; diff --git a/core/src/main/java/info/openrocket/core/util/Quaternion.java b/core/src/main/java/info/openrocket/core/util/Quaternion.java index ef6d4ea3f..4c76cb345 100644 --- a/core/src/main/java/info/openrocket/core/util/Quaternion.java +++ b/core/src/main/java/info/openrocket/core/util/Quaternion.java @@ -268,7 +268,7 @@ public class Quaternion { assert (Math.abs(norm2() - 1) < 0.00001) : "Quaternion not unit length: " + this; // (a,b,c,d) = (this)^-1 * coord = (w,-x,-y,-z) * (0,cx,cy,cz) - a = +x * coord.x + y * coord.y + z * coord.z; + a = x * coord.x + y * coord.y + z * coord.z; b = w * coord.x - y * coord.z + z * coord.y; c = w * coord.y + x * coord.z - z * coord.x; d = w * coord.z - x * coord.y + y * coord.x; 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 c2333402b..b4213d9da 100644 --- a/core/src/main/java/info/openrocket/core/util/TestRockets.java +++ b/core/src/main/java/info/openrocket/core/util/TestRockets.java @@ -135,8 +135,8 @@ public class TestRockets { .setTimePoints(new double[] { 0, 1, 2 }) .setThrustPoints(new double[] { 0, 9, 0 }) .setCGPoints(new Coordinate[] { - new Coordinate(0.035, 0, 0, 0.0164), new Coordinate(.035, 0, 0, 0.0145), - new Coordinate(.035, 0, 0, 0.0131) }) + new Coordinate(0.035, 0, 0, 0.0164), new Coordinate(0.035, 0, 0, 0.0145), + new Coordinate(0.035, 0, 0, 0.0131) }) .setDigest("digest A8 test") .build(); } @@ -194,8 +194,8 @@ public class TestRockets { .setTimePoints(new double[] { 0, 1, 2 }) .setThrustPoints(new double[] { 0, 11.4, 0 }) .setCGPoints(new Coordinate[] { - new Coordinate(0.035, 0, 0, 0.0195), new Coordinate(.035, 0, 0, 0.0155), - new Coordinate(.035, 0, 0, 0.013) }) + new Coordinate(0.035, 0, 0, 0.0195), new Coordinate(0.035, 0, 0, 0.0155), + new Coordinate(0.035, 0, 0, 0.013) }) .setDigest("digest B4 test") .build(); } @@ -215,8 +215,8 @@ public class TestRockets { .setTimePoints(new double[] { 0, 1, 2 }) .setThrustPoints(new double[] { 0, 6, 0 }) .setCGPoints(new Coordinate[] { - new Coordinate(0.035, 0, 0, 0.0227), new Coordinate(.035, 0, 0, 0.0165), - new Coordinate(.035, 0, 0, 0.012) }) + new Coordinate(0.035, 0, 0, 0.0227), new Coordinate(0.035, 0, 0, 0.0165), + new Coordinate(0.035, 0, 0, 0.012) }) .setDigest("digest C6 test") .build(); } @@ -236,8 +236,8 @@ public class TestRockets { .setTimePoints(new double[] { 0, 1, 2 }) .setThrustPoints(new double[] { 0, 32, 0 }) .setCGPoints(new Coordinate[] { - new Coordinate(.035, 0, 0, 0.025), new Coordinate(.035, 0, 0, .020), - new Coordinate(.035, 0, 0, 0.0154) }) + new Coordinate(0.035, 0, 0, 0.025), new Coordinate(0.035, 0, 0, 0.020), + new Coordinate(0.035, 0, 0, 0.0154) }) .setDigest("digest D21 test") .build(); } @@ -257,8 +257,8 @@ public class TestRockets { .setTimePoints(new double[] { 0, 1, 2 }) .setThrustPoints(new double[] { 0, 1357, 0 }) .setCGPoints(new Coordinate[] { - new Coordinate(.311, 0, 0, 4.808), new Coordinate(.311, 0, 0, 3.389), - new Coordinate(.311, 0, 0, 1.970) }) + new Coordinate(0.311, 0, 0, 4.808), new Coordinate(0.311, 0, 0, 3.389), + new Coordinate(0.311, 0, 0, 1.970) }) .setDigest("digest M1350 test") .build(); } @@ -278,8 +278,8 @@ public class TestRockets { .setTimePoints(new double[] { 0, 1, 2 }) .setThrustPoints(new double[] { 0, 20, 0 }) .setCGPoints(new Coordinate[] { - new Coordinate(.062, 0, 0, 0.123), new Coordinate(.062, 0, 0, .0935), - new Coordinate(.062, 0, 0, 0.064) }) + new Coordinate(0.062, 0, 0, 0.123), new Coordinate(0.062, 0, 0, 0.0935), + new Coordinate(0.062, 0, 0, 0.064) }) .setDigest("digest G77 test") .build(); } @@ -483,8 +483,8 @@ public class TestRockets { TrapezoidFinSet finset; { int finCount = 3; - double finRootChord = .05; - double finTipChord = .03; + double finRootChord = 0.05; + double finTipChord = 0.03; double finSweep = 0.02; double finHeight = 0.05; finset = new TrapezoidFinSet(finCount, finRootChord, finTipChord, finSweep, finHeight); @@ -648,15 +648,15 @@ public class TestRockets { boosterBody.addChild(coupler); int finCount = 3; - double finRootChord = .05; - double finTipChord = .03; + double finRootChord = 0.05; + double finTipChord = 0.03; double finSweep = 0.02; double finHeight = 0.05; FinSet finset = new TrapezoidFinSet(finCount, finRootChord, finTipChord, finSweep, finHeight); finset.setName("Booster Fins"); finset.setThickness(0.0032); finset.setAxialMethod(AxialMethod.BOTTOM); - finset.setAxialOffset(0.); + finset.setAxialOffset(0.0); boosterBody.addChild(finset); // Motor mount @@ -1474,7 +1474,7 @@ public class TestRockets { // make fins with fin tabs and add to body tube TrapezoidFinSet fins = new TrapezoidFinSet(); fins.setFinCount(3); - fins.setFinShape(1.0, 1.0, 0.0, 1.0, .005); + fins.setFinShape(1.0, 1.0, 0.0, 1.0, 0.005); fins.setTabHeight(0.25); fins.setTabLength(0.25); bodyTube.addChild(fins); @@ -1862,7 +1862,7 @@ public class TestRockets { TrapezoidFinSet fins1 = new TrapezoidFinSet(); fins1.setFinCount(3); - fins1.setFinShape(1.5, 1.5, 0.0, 1.5, .005); + fins1.setFinShape(1.5, 1.5, 0.0, 1.5, 0.005); bodyTube1.addChild(fins1); // make 1st stage recovery device with deployment config in default @@ -1889,7 +1889,7 @@ public class TestRockets { // make 2nd stage fins TrapezoidFinSet fins2 = new TrapezoidFinSet(); fins2.setFinCount(3); - fins2.setFinShape(1.0, 1.0, 0.0, 1.0, .005); + fins2.setFinShape(1.0, 1.0, 0.0, 1.0, 0.005); bodyTube2.addChild(fins2); OpenRocketDocument rocketDoc = OpenRocketDocumentFactory.createDocumentFromRocket(rocket); diff --git a/core/src/test/java/info/openrocket/core/aerodynamics/BarrowmanCalculatorTest.java b/core/src/test/java/info/openrocket/core/aerodynamics/BarrowmanCalculatorTest.java index b198635e8..35b32498f 100644 --- a/core/src/test/java/info/openrocket/core/aerodynamics/BarrowmanCalculatorTest.java +++ b/core/src/test/java/info/openrocket/core/aerodynamics/BarrowmanCalculatorTest.java @@ -167,8 +167,8 @@ public class BarrowmanCalculatorTest { final Coordinate cp_1fin = calc.getCP(config, conditions, warnings); assertEquals(7.6981823141, cp_1fin.weight, EPSILON, " Falcon 9 Heavy CNa value is incorrect:"); assertEquals(0.8095779106, cp_1fin.x, EPSILON, " Falcon 9 Heavy CP x value is incorrect:"); - assertEquals(0f, cp_1fin.y, EPSILON, " Falcon 9 Heavy CP y value is incorrect:"); - assertEquals(0f, cp_1fin.z, EPSILON, " Falcon 9 Heavy CP z value is incorrect:"); + assertEquals(0.0f, cp_1fin.y, EPSILON, " Falcon 9 Heavy CP y value is incorrect:"); + assertEquals(0.0f, cp_1fin.z, EPSILON, " Falcon 9 Heavy CP z value is incorrect:"); } } diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTOTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTOTest.java index 5d50b216f..aff04d670 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTOTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTOTest.java @@ -54,7 +54,7 @@ public class RockSimDocumentDTOTest extends RockSimTestBase { marshaller.setProperty("jaxb.fragment", Boolean.TRUE); NoseConeDTO noseCone = new NoseConeDTO(); - noseCone.setBaseDia(10d); + noseCone.setBaseDia(10.0d); noseCone.setCalcCG(1.3d); StageDTO stage1 = new StageDTO(); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java index 701c656f4..b9cf76a39 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java @@ -72,33 +72,33 @@ public class BodyTubeHandlerTest extends RockSimTestBase { WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("OD", attributes, "0", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("OD", attributes, "75", warnings); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), 0.001); handler.closeElement("OD", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("ID", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "0", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "75", warnings); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("Len", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getLength(), 0.001); + Assertions.assertEquals(0.0d, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); @@ -111,13 +111,13 @@ public class BodyTubeHandlerTest extends RockSimTestBase { Assertions.assertFalse(component.isMotorMount()); handler.closeElement("EngineOverhang", attributes, "-1", warnings); - Assertions.assertEquals(-1d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), + Assertions.assertEquals(-1.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), 0.001); handler.closeElement("EngineOverhang", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), 0.001); handler.closeElement("EngineOverhang", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), 0.001); handler.closeElement("EngineOverhang", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java index 8d344531b..5db83166c 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java @@ -117,7 +117,7 @@ public class FinSetHandlerTest { assertEquals(0.04d, fins.getTabLength(), EPSILON, "imported fin tab length does not match: " + debugInfo); assertEquals(0.05d, fins.getTabHeight(), EPSILON, "imported fin tab height does not match: " + debugInfo); assertEquals(0.03d, fins.getTabOffset(), EPSILON, "imported fin shift does not match."); - assertEquals(.123d, fins.getBaseRotation(), EPSILON, "imported fin rotation does not match."); + assertEquals(0.123d, fins.getBaseRotation(), EPSILON, "imported fin rotation does not match."); dto.closeElement("ShapeCode", attributes, "1", warnings); @@ -133,7 +133,7 @@ public class FinSetHandlerTest { assertEquals(0.04d, fins.getTabLength(), EPSILON, "imported fin tab length does not match."); assertEquals(0.05d, fins.getTabHeight(), EPSILON, "imported fin tab height does not match."); assertEquals(0.03d, fins.getTabOffset(), EPSILON, "imported fin tab shift does not match."); - assertEquals(.123d, fins.getBaseRotation(), EPSILON, "imported fin rotation does not match."); + assertEquals(0.123d, fins.getBaseRotation(), EPSILON, "imported fin rotation does not match."); } /** @@ -219,7 +219,7 @@ public class FinSetHandlerTest { assertNotNull(result); assertEquals(4, result.length); assertEquals(new Coordinate(0, 0), result[0]); - assertEquals(new Coordinate(.51816, 0), result[3]); + assertEquals(new Coordinate(0.51816, 0), result[3]); assertEquals(0, warnings.size()); warnings.clear(); @@ -229,7 +229,7 @@ public class FinSetHandlerTest { assertNotNull(result); assertEquals(4, result.length); assertEquals(new Coordinate(0, 0), result[0]); - assertEquals(new Coordinate(.51816, 0), result[3]); + assertEquals(new Coordinate(0.51816, 0), result[3]); assertEquals(0, warnings.size()); warnings.clear(); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java index e7ac0f85d..1798330f7 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java @@ -71,33 +71,33 @@ public class InnerBodyTubeHandlerTest extends RockSimTestBase { WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("OD", attributes, "0", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("OD", attributes, "75", warnings); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), 0.001); handler.closeElement("OD", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("ID", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "0", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "75", warnings); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("Len", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getLength(), 0.001); + Assertions.assertEquals(0.0d, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); @@ -110,13 +110,13 @@ public class InnerBodyTubeHandlerTest extends RockSimTestBase { Assertions.assertFalse(component.isMotorMount()); handler.closeElement("EngineOverhang", attributes, "-1", warnings); - Assertions.assertEquals(-1d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), + Assertions.assertEquals(-1.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), 0.001); handler.closeElement("EngineOverhang", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), 0.001); handler.closeElement("EngineOverhang", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getMotorOverhang(), 0.001); handler.closeElement("EngineOverhang", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java index 2afe4f9c0..c3bb4e92a 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java @@ -70,33 +70,33 @@ public class LaunchLugHandlerTest extends RockSimTestBase { WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getOuterRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getOuterRadius(), 0.001); handler.closeElement("OD", attributes, "0", warnings); - Assertions.assertEquals(0d, component.getOuterRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getOuterRadius(), 0.001); handler.closeElement("OD", attributes, "75", warnings); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getOuterRadius(), + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getOuterRadius(), 0.001); handler.closeElement("OD", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("ID", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "0", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "75", warnings); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("Len", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getLength(), 0.001); + Assertions.assertEquals(0.0d, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java index d36cbcd2c..c4900cbe4 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java @@ -71,7 +71,7 @@ public class MassObjectHandlerTest extends RockSimTestBase { MassComponent component = (MassComponent) getField(handler, "mass"); handler.closeElement("Len", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getLength(), 0.001); + Assertions.assertEquals(0.0d, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10", warnings); Assertions.assertEquals(0.01, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10.0", warnings); @@ -81,9 +81,9 @@ public class MassObjectHandlerTest extends RockSimTestBase { warnings.clear(); handler.closeElement("KnownMass", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getComponentMass(), 0.001); + Assertions.assertEquals(0.0d, component.getComponentMass(), 0.001); handler.closeElement("KnownMass", attributes, "100", warnings); - Assertions.assertEquals(100d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS, component.getComponentMass(), + Assertions.assertEquals(100.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_MASS, component.getComponentMass(), 0.001); handler.closeElement("KnownMass", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java index 467687ad6..d99ecec2f 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java @@ -87,25 +87,25 @@ public class NoseConeHandlerTest extends RockSimTestBase { warnings.clear(); handler.closeElement("Len", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getLength(), 0.001); + Assertions.assertEquals(0.0d, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("BaseDia", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getAftRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getAftRadius(), 0.001); handler.closeElement("BaseDia", attributes, "100", warnings); - Assertions.assertEquals(100d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getAftRadius(), + Assertions.assertEquals(100.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getAftRadius(), 0.001); handler.closeElement("BaseDia", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); - final double aft = 100d; + final double aft = 100.0d; component.setAftRadius(aft); handler.closeElement("ConstructionType", attributes, "0", warnings); @@ -126,8 +126,8 @@ public class NoseConeHandlerTest extends RockSimTestBase { component.setAftShoulderRadius(1.1d); handler.closeElement("WallThickness", attributes, "-1", warnings); handler.endHandler("Transition", attributes, null, warnings); - Assertions.assertEquals(0d, component.getThickness(), 0.001); - Assertions.assertEquals(0d, component.getAftShoulderThickness(), 0.001); + Assertions.assertEquals(0.0d, component.getThickness(), 0.001); + Assertions.assertEquals(0.0d, component.getAftShoulderThickness(), 0.001); handler.closeElement("WallThickness", attributes, "1.1", warnings); handler.endHandler("Transition", attributes, null, warnings); Assertions.assertEquals(1.1d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getThickness(), @@ -136,21 +136,21 @@ public class NoseConeHandlerTest extends RockSimTestBase { component.getAftShoulderThickness(), 0.001); handler.closeElement("ShoulderLen", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getAftShoulderLength(), 0.001); + Assertions.assertEquals(0.0d, component.getAftShoulderLength(), 0.001); handler.closeElement("ShoulderLen", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getAftShoulderLength(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getAftShoulderLength(), 0.001); handler.closeElement("ShoulderLen", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getAftShoulderLength(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getAftShoulderLength(), 0.001); handler.closeElement("ShoulderLen", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("ShoulderOD", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getAftShoulderRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getAftShoulderRadius(), 0.001); handler.closeElement("ShoulderOD", attributes, "100", warnings); - Assertions.assertEquals(100d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, + Assertions.assertEquals(100.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getAftShoulderRadius(), 0.001); handler.closeElement("ShoulderOD", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); @@ -158,7 +158,7 @@ public class NoseConeHandlerTest extends RockSimTestBase { component.setShapeType(Transition.Shape.HAACK); handler.closeElement("ShapeParameter", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getShapeParameter(), 0.001); + Assertions.assertEquals(0.0d, component.getShapeParameter(), 0.001); handler.closeElement("ShapeParameter", attributes, "100", warnings); Assertions.assertEquals(Transition.Shape.HAACK.maxParameter(), component.getShapeParameter(), 0.001); handler.closeElement("ShapeParameter", attributes, "foo", warnings); @@ -168,9 +168,9 @@ public class NoseConeHandlerTest extends RockSimTestBase { warnings.clear(); component.setShapeType(Transition.Shape.CONICAL); - component.setShapeParameter(0d); + component.setShapeParameter(0.0d); handler.closeElement("ShapeParameter", attributes, "100", warnings); - Assertions.assertEquals(0d, component.getShapeParameter(), 0.001); + Assertions.assertEquals(0.0d, component.getShapeParameter(), 0.001); handler.closeElement("FinishCode", attributes, "-1", warnings); Assertions.assertEquals(ExternalComponent.Finish.NORMAL, component.getFinish()); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java index 7d17fabe7..de38cf55a 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java @@ -59,9 +59,9 @@ public class ParachuteHandlerTest extends RockSimTestBase { warnings.clear(); handler.closeElement("Dia", attributes, "-1", warnings); - Assertions.assertEquals(-1d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getDiameter(), 0.001); + Assertions.assertEquals(-1.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getDiameter(), 0.001); handler.closeElement("Dia", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getDiameter(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getDiameter(), 0.001); handler.closeElement("Dia", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); @@ -75,9 +75,9 @@ public class ParachuteHandlerTest extends RockSimTestBase { warnings.clear(); handler.closeElement("ShroudLineLen", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getLineLength(), 0.001); + Assertions.assertEquals(0.0d, component.getLineLength(), 0.001); handler.closeElement("ShroudLineLen", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLineLength(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLineLength(), 0.001); handler.closeElement("ShroudLineLen", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); @@ -159,14 +159,14 @@ public class ParachuteHandlerTest extends RockSimTestBase { handler.closeElement("LocationMode", attributes, "1", warnings); handler.endHandler("Parachute", attributes, null, warnings); Assertions.assertEquals(AxialMethod.ABSOLUTE, component.getAxialMethod()); - Assertions.assertEquals(component.getAxialOffset(), -10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, + Assertions.assertEquals(component.getAxialOffset(), -10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, 0.001); handler.closeElement("Xb", attributes, "-10", warnings); handler.closeElement("LocationMode", attributes, "2", warnings); handler.endHandler("Parachute", attributes, null, warnings); Assertions.assertEquals(AxialMethod.BOTTOM, component.getAxialMethod()); - Assertions.assertEquals(component.getAxialOffset(), 10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, + Assertions.assertEquals(component.getAxialOffset(), 10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, 0.001); } } diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java index 138ab832a..e9cbfea6e 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java @@ -53,29 +53,29 @@ public class RingHandlerTest extends RockSimTestBase { WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "0", warnings); - Assertions.assertEquals(0d, component.getOuterRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getOuterRadius(), 0.001); handler.closeElement("OD", attributes, "75", warnings); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getOuterRadius(), + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getOuterRadius(), 0.001); handler.closeElement("OD", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("ID", attributes, "0", warnings); - Assertions.assertEquals(0d, component.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "75", warnings); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("Len", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getLength(), 0.001); + Assertions.assertEquals(0.0d, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); @@ -112,9 +112,9 @@ public class RingHandlerTest extends RockSimTestBase { Assertions.assertEquals(1, tube.getChildren().size()); RingComponent child = (RingComponent) tube.getChild(0); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getOuterRadius(), 0.001); - Assertions.assertEquals(0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getInnerRadius(), 0.001); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, child.getLength(), 0.001); + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getOuterRadius(), 0.001); + Assertions.assertEquals(0.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getInnerRadius(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, child.getLength(), 0.001); Assertions.assertEquals(child.getName(), "Test Name"); Assertions.assertEquals(109.9 / 1000, child.getMass(), 0.001); Assertions.assertEquals(0, child.getAxialOffset(), 0.0); @@ -148,9 +148,9 @@ public class RingHandlerTest extends RockSimTestBase { RingComponent child = (RingComponent) tube.getChild(0); Assertions.assertTrue(child instanceof TubeCoupler); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getOuterRadius(), 0.001); - Assertions.assertEquals(70d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getInnerRadius(), 0.001); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, child.getLength(), 0.001); + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getOuterRadius(), 0.001); + Assertions.assertEquals(70.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getInnerRadius(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, child.getLength(), 0.001); Assertions.assertEquals(child.getName(), "Test Name"); Assertions.assertEquals(109.9 / 1000, child.getMass(), 0.001); Assertions.assertEquals(0, child.getAxialOffset(), 0.0); @@ -183,14 +183,14 @@ public class RingHandlerTest extends RockSimTestBase { RingComponent child = (RingComponent) tube.getChild(0); Assertions.assertTrue(child instanceof EngineBlock); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getOuterRadius(), 0.001); - Assertions.assertEquals(70d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getInnerRadius(), 0.001); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, child.getLength(), 0.001); + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getOuterRadius(), 0.001); + Assertions.assertEquals(70.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getInnerRadius(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, child.getLength(), 0.001); Assertions.assertEquals(child.getName(), "Test Name"); Assertions.assertEquals(109.9 / 1000, child.getMass(), 0.001); Assertions.assertEquals(0, child.getAxialOffset(), 0.0); Assertions.assertEquals(AxialMethod.TOP, child.getAxialMethod()); - Assertions.assertEquals(4d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, child.getCG().x, 0.000001); + Assertions.assertEquals(4.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, child.getCG().x, 0.000001); } @@ -218,9 +218,9 @@ public class RingHandlerTest extends RockSimTestBase { Assertions.assertEquals(1, tube.getChildren().size()); RingComponent child = (RingComponent) tube.getChild(0); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getOuterRadius(), 0.001); - Assertions.assertEquals(0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getInnerRadius(), 0.001); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, child.getLength(), 0.001); + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getOuterRadius(), 0.001); + Assertions.assertEquals(0.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, child.getInnerRadius(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, child.getLength(), 0.001); Assertions.assertEquals(child.getName(), "Test Name"); Assertions.assertEquals(109.9 / 1000, child.getMass(), 0.001); Assertions.assertEquals(0, child.getAxialOffset(), 0.0); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java index ae2345079..1a1d4d4d5 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java @@ -50,21 +50,21 @@ public class StreamerHandlerTest extends RockSimTestBase { WarningSet warnings = new WarningSet(); handler.closeElement("Width", attributes, "0", warnings); - Assertions.assertEquals(0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getStripWidth(), 0.001); + Assertions.assertEquals(0.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getStripWidth(), 0.001); handler.closeElement("Width", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getStripWidth(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getStripWidth(), 0.001); handler.closeElement("Width", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("Len", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getStripLength(), 0.001); + Assertions.assertEquals(0.0d, component.getStripLength(), 0.001); handler.closeElement("Len", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getStripLength(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getStripLength(), 0.001); handler.closeElement("Len", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getStripLength(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getStripLength(), 0.001); handler.closeElement("Len", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); @@ -157,18 +157,18 @@ public class StreamerHandlerTest extends RockSimTestBase { handler.closeElement("LocationMode", attributes, "1", warnings); handler.endHandler("Streamer", attributes, null, warnings); Assertions.assertEquals(AxialMethod.ABSOLUTE, component.getAxialMethod()); - Assertions.assertEquals(component.getAxialOffset(), -10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, + Assertions.assertEquals(component.getAxialOffset(), -10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, 0.001); handler.closeElement("Xb", attributes, "-10", warnings); handler.closeElement("LocationMode", attributes, "2", warnings); handler.endHandler("Streamer", attributes, null, warnings); Assertions.assertEquals(AxialMethod.BOTTOM, component.getAxialMethod()); - Assertions.assertEquals(component.getAxialOffset(), 10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, + Assertions.assertEquals(component.getAxialOffset(), 10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, 0.001); handler.closeElement("Thickness", attributes, "0.02", warnings); - Assertions.assertEquals(0.01848, handler.computeDensity(RockSimDensityType.ROCKSIM_BULK, 924d), 0.001); + Assertions.assertEquals(0.01848, handler.computeDensity(RockSimDensityType.ROCKSIM_BULK, 924.0d), 0.001); // Test Density Type 0 (Bulk) handler.closeElement("Density", attributes, "924.0", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java index c9954b44d..b14281344 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java @@ -81,34 +81,34 @@ public class TransitionHandlerTest extends RockSimTestBase { warnings.clear(); handler.closeElement("Len", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getLength(), 0.001); + Assertions.assertEquals(0.0d, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getLength(), 0.001); handler.closeElement("Len", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("FrontDia", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getForeRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getForeRadius(), 0.001); handler.closeElement("FrontDia", attributes, "100", warnings); - Assertions.assertEquals(100d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getForeRadius(), + Assertions.assertEquals(100.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getForeRadius(), 0.001); handler.closeElement("FrontDia", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("RearDia", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getAftRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getAftRadius(), 0.001); handler.closeElement("RearDia", attributes, "100", warnings); - Assertions.assertEquals(100d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getAftRadius(), + Assertions.assertEquals(100.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getAftRadius(), 0.001); handler.closeElement("RearDia", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); - final double aft = 100d; + final double aft = 100.0d; component.setAftRadius(aft); handler.closeElement("ConstructionType", attributes, "0", warnings); @@ -132,9 +132,9 @@ public class TransitionHandlerTest extends RockSimTestBase { component.setForeShoulderRadius(1.1d); handler.closeElement("WallThickness", attributes, "-1", warnings); handler.endHandler("Transition", attributes, null, warnings); - Assertions.assertEquals(0d, component.getThickness(), 0.001); - Assertions.assertEquals(0d, component.getAftShoulderThickness(), 0.001); - Assertions.assertEquals(0d, component.getForeShoulderThickness(), 0.001); + Assertions.assertEquals(0.0d, component.getThickness(), 0.001); + Assertions.assertEquals(0.0d, component.getAftShoulderThickness(), 0.001); + Assertions.assertEquals(0.0d, component.getForeShoulderThickness(), 0.001); handler.closeElement("WallThickness", attributes, "1.1", warnings); handler.endHandler("Transition", attributes, null, warnings); Assertions.assertEquals(1.1d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getThickness(), @@ -145,42 +145,42 @@ public class TransitionHandlerTest extends RockSimTestBase { component.getForeShoulderThickness(), 0.001); handler.closeElement("FrontShoulderLen", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getForeShoulderLength(), 0.001); + Assertions.assertEquals(0.0d, component.getForeShoulderLength(), 0.001); handler.closeElement("FrontShoulderLen", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getForeShoulderLength(), 0.001); handler.closeElement("FrontShoulderLen", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getForeShoulderLength(), 0.001); handler.closeElement("FrontShoulderLen", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("RearShoulderLen", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getAftShoulderLength(), 0.001); + Assertions.assertEquals(0.0d, component.getAftShoulderLength(), 0.001); handler.closeElement("RearShoulderLen", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getAftShoulderLength(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getAftShoulderLength(), 0.001); handler.closeElement("RearShoulderLen", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getAftShoulderLength(), + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, component.getAftShoulderLength(), 0.001); handler.closeElement("RearShoulderLen", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("FrontShoulderDia", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getForeShoulderRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getForeShoulderRadius(), 0.001); handler.closeElement("FrontShoulderDia", attributes, "100", warnings); - Assertions.assertEquals(100d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, + Assertions.assertEquals(100.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getForeShoulderRadius(), 0.001); handler.closeElement("FrontShoulderDia", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("RearShoulderDia", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getAftShoulderRadius(), 0.001); + Assertions.assertEquals(0.0d, component.getAftShoulderRadius(), 0.001); handler.closeElement("RearShoulderDia", attributes, "100", warnings); - Assertions.assertEquals(100d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, + Assertions.assertEquals(100.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, component.getAftShoulderRadius(), 0.001); handler.closeElement("RearShoulderDia", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); @@ -188,7 +188,7 @@ public class TransitionHandlerTest extends RockSimTestBase { component.setShapeType(Transition.Shape.HAACK); handler.closeElement("ShapeParameter", attributes, "-1", warnings); - Assertions.assertEquals(0d, component.getShapeParameter(), 0.001); + Assertions.assertEquals(0.0d, component.getShapeParameter(), 0.001); handler.closeElement("ShapeParameter", attributes, "100", warnings); Assertions.assertEquals(Transition.Shape.HAACK.maxParameter(), component.getShapeParameter(), 0.001); handler.closeElement("ShapeParameter", attributes, "foo", warnings); @@ -198,9 +198,9 @@ public class TransitionHandlerTest extends RockSimTestBase { warnings.clear(); component.setShapeType(Transition.Shape.CONICAL); - component.setShapeParameter(0d); + component.setShapeParameter(0.0d); handler.closeElement("ShapeParameter", attributes, "100", warnings); - Assertions.assertEquals(0d, component.getShapeParameter(), 0.001); + Assertions.assertEquals(0.0d, component.getShapeParameter(), 0.001); handler.closeElement("FinishCode", attributes, "-1", warnings); Assertions.assertEquals(ExternalComponent.Finish.NORMAL, component.getFinish()); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/TubeFinSetHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/TubeFinSetHandlerTest.java index 8356e5453..14ebfa85d 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/TubeFinSetHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/TubeFinSetHandlerTest.java @@ -38,34 +38,34 @@ public class TubeFinSetHandlerTest { Assertions.assertEquals(fins.getName(), "The name"); Assertions.assertEquals(4, fins.getFinCount()); - Assertions.assertEquals(.123d, fins.getBaseRotation(), 0d); + Assertions.assertEquals(0.123d, fins.getBaseRotation(), 0.0d); handler.closeElement("OD", attributes, "-1", warnings); - Assertions.assertEquals(0d, fins.getOuterRadius(), 0.001); + Assertions.assertEquals(0.0d, fins.getOuterRadius(), 0.001); handler.closeElement("OD", attributes, "0", warnings); - Assertions.assertEquals(0d, fins.getOuterRadius(), 0.001); + Assertions.assertEquals(0.0d, fins.getOuterRadius(), 0.001); handler.closeElement("OD", attributes, "75", warnings); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, fins.getOuterRadius(), 0.001); + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, fins.getOuterRadius(), 0.001); handler.closeElement("OD", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("ID", attributes, "-1", warnings); - Assertions.assertEquals(0d, fins.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, fins.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "0", warnings); - Assertions.assertEquals(0d, fins.getInnerRadius(), 0.001); + Assertions.assertEquals(0.0d, fins.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "75", warnings); - Assertions.assertEquals(75d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, fins.getInnerRadius(), 0.001); + Assertions.assertEquals(75.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS, fins.getInnerRadius(), 0.001); handler.closeElement("ID", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); handler.closeElement("Len", attributes, "-1", warnings); - Assertions.assertEquals(0d, fins.getLength(), 0.001); + Assertions.assertEquals(0.0d, fins.getLength(), 0.001); handler.closeElement("Len", attributes, "10", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, fins.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, fins.getLength(), 0.001); handler.closeElement("Len", attributes, "10.0", warnings); - Assertions.assertEquals(10d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, fins.getLength(), 0.001); + Assertions.assertEquals(10.0d / RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH, fins.getLength(), 0.001); handler.closeElement("Len", attributes, "foo", warnings); Assertions.assertEquals(1, warnings.size()); warnings.clear(); 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 3e91f261f..f3adec241 100644 --- a/core/src/test/java/info/openrocket/core/masscalc/MassCalculatorTest.java +++ b/core/src/test/java/info/openrocket/core/masscalc/MassCalculatorTest.java @@ -1011,7 +1011,7 @@ public class MassCalculatorTest extends BaseTestCase { final Motor boosterMotor = mnt.getMotorConfig(config.getFlightConfigurationID()).getMotor(); final double expBoosterPropMassEach = boosterMotor.getLaunchMass(); - final double boosterSetMotorCount = 8.; /// use a double merely to prevent type-casting issues + final double boosterSetMotorCount = 8.0; /// use a double merely to prevent type-casting issues final double expBoosterPropMass = expBoosterPropMassEach * boosterSetMotorCount; final Coordinate expCM = new Coordinate(1.31434, 0, 0, expBoosterPropMass); diff --git a/core/src/test/java/info/openrocket/core/masscalc/RigidBodyTest.java b/core/src/test/java/info/openrocket/core/masscalc/RigidBodyTest.java index 309f9af5c..efd34062a 100644 --- a/core/src/test/java/info/openrocket/core/masscalc/RigidBodyTest.java +++ b/core/src/test/java/info/openrocket/core/masscalc/RigidBodyTest.java @@ -14,7 +14,7 @@ public class RigidBodyTest extends BaseTestCase { // tolerance for compared double test results protected final double EPSILON = MathUtil.EPSILON; - protected final Coordinate ZERO = new Coordinate(0., 0., 0.); + protected final Coordinate ZERO = new Coordinate(0.0, 0.0, 0.0); @Test public void testTwoPointInline() { diff --git a/core/src/test/java/info/openrocket/core/motor/ThrustCurveMotorTest.java b/core/src/test/java/info/openrocket/core/motor/ThrustCurveMotorTest.java index cf55a145b..562182a5e 100644 --- a/core/src/test/java/info/openrocket/core/motor/ThrustCurveMotorTest.java +++ b/core/src/test/java/info/openrocket/core/motor/ThrustCurveMotorTest.java @@ -108,7 +108,7 @@ public class ThrustCurveMotorTest { private class TestPair extends Pair { private TestPair() { - super(0., 0.); + super(0.0, 0.0); } public TestPair(Double u, Double v) { @@ -173,7 +173,7 @@ public class ThrustCurveMotorTest { public void testTimeRetrieval() { final ThrustCurveMotor mtr = motorX6; - final double[] timeList = { 0.2, 0.441, 0.512, 1., 2., 3 }; + final double[] timeList = { 0.2, 0.441, 0.512, 1.0, 2.0, 3 }; for (double searchTime : timeList) { assertEquals(searchTime, mtr.getTime(searchTime), 0.00001); 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 16eca4261..6de2aef96 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 @@ -163,7 +163,7 @@ public class TestRocketOptimizationFunction extends BaseTestCase { function.addRocketOptimizationListener(listener); double value = function.evaluate(new Point(p1, p2)); - assertTrue(value > 1e100); + assertTrue(value > 1.0e100); // Verify the interactions verify(modifier1).modify(simulation, p1); diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/FinSetTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/FinSetTest.java index e5aa84029..3c3b06395 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/FinSetTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/FinSetTest.java @@ -14,7 +14,7 @@ import info.openrocket.core.util.BaseTestCase; public class FinSetTest extends BaseTestCase { - private static final double EPSILON = 1E-8; + private static final double EPSILON = 1.0E-8; @Test public void testMultiplicity() { @@ -200,8 +200,8 @@ public class FinSetTest extends BaseTestCase { final double expArea = 0.06 * 0.06 * 0.5; final Coordinate actCentroid = FinSet.calculateCurveIntegral(basicPoints); assertEquals(expArea, actCentroid.weight, EPSILON, " basic area doesn't match..."); - assertEquals(0.04, actCentroid.x, 1e-8, " basic centroid x doesn't match: "); - assertEquals(0.02, actCentroid.y, 1e-8, " basic centroid y doesn't match: "); + assertEquals(0.04, actCentroid.x, 1.0e-8, " basic centroid x doesn't match: "); + assertEquals(0.02, actCentroid.y, 1.0e-8, " basic centroid y doesn't match: "); } @Test @@ -222,8 +222,8 @@ public class FinSetTest extends BaseTestCase { final double expArea = 0.06 * 0.12 * 0.5; final Coordinate actCentroid = FinSet.calculateCurveIntegral(basicPoints); assertEquals(expArea, actCentroid.weight, EPSILON, " basic area doesn't match..."); - assertEquals(0.06, actCentroid.x, 1e-8, " basic centroid x doesn't match: "); - assertEquals(0.02, actCentroid.y, 1e-8, " basic centroid y doesn't match: "); + assertEquals(0.06, actCentroid.x, 1.0e-8, " basic centroid x doesn't match: "); + assertEquals(0.02, actCentroid.y, 1.0e-8, " basic centroid y doesn't match: "); } @Test @@ -244,8 +244,8 @@ public class FinSetTest extends BaseTestCase { final double expArea = 0.04 * 0.05; final Coordinate actCentroid = FinSet.calculateCurveIntegral(basicPoints); assertEquals(expArea, actCentroid.weight, EPSILON, " basic area doesn't match..."); - assertEquals(0.03000, actCentroid.x, 1e-8, " basic centroid x doesn't match: "); - assertEquals(0.020833333, actCentroid.y, 1e-8, " basic centroid y doesn't match: "); + assertEquals(0.03000, actCentroid.x, 1.0e-8, " basic centroid x doesn't match: "); + assertEquals(0.020833333, actCentroid.y, 1.0e-8, " basic centroid y doesn't match: "); } @Test @@ -258,12 +258,12 @@ public class FinSetTest extends BaseTestCase { // => [ .523, 2.61, 4.71 ] final double[] instanceAngles = fins.getInstanceAngles(); - assertEquals((1. / 6.) * Math.PI, fins.getBaseRotation(), EPSILON); - assertEquals((1. / 6.) * Math.PI, fins.getAngleOffset(), EPSILON); + assertEquals((1.0 / 6.0) * Math.PI, fins.getBaseRotation(), EPSILON); + assertEquals((1.0 / 6.0) * Math.PI, fins.getAngleOffset(), EPSILON); - assertEquals((1. / 6.) * Math.PI, instanceAngles[0], EPSILON); - assertEquals((5. / 6.) * Math.PI, instanceAngles[1], EPSILON); - assertEquals((9. / 6.) * Math.PI, instanceAngles[2], EPSILON); + assertEquals((1.0 / 6.0) * Math.PI, instanceAngles[0], EPSILON); + assertEquals((5.0 / 6.0) * Math.PI, instanceAngles[1], EPSILON); + assertEquals((9.0 / 6.0) * Math.PI, instanceAngles[2], EPSILON); } @Test diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/FlightConfigurationTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/FlightConfigurationTest.java index 861573eb6..a7ae74c83 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/FlightConfigurationTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/FlightConfigurationTest.java @@ -25,7 +25,7 @@ import info.openrocket.core.util.BaseTestCase; import info.openrocket.core.util.ModID; public class FlightConfigurationTest extends BaseTestCase { - private final static double EPSILON = MathUtil.EPSILON * 1E3; + private final static double EPSILON = MathUtil.EPSILON * 1.0E3; /** * Empty rocket (no components) specific configuration tests diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/FreeformFinSetTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/FreeformFinSetTest.java index 7caa5be21..4cceeaefa 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/FreeformFinSetTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/FreeformFinSetTest.java @@ -29,7 +29,7 @@ import info.openrocket.core.util.BaseTestCase; public class FreeformFinSetTest extends BaseTestCase { - private static final double EPSILON = 1E-6; + private static final double EPSILON = 1.0E-6; private FreeformFinSet testFreeformConvert(FinSet sourceSet) { sourceSet.setName("test-convert-finset"); @@ -94,7 +94,7 @@ public class FreeformFinSetTest extends BaseTestCase { stage.addChild(tail); // zero-length body tube -- triggers a whole other class of errors - final BodyTube phantom = new BodyTube(0., 0.5, 0.01); + final BodyTube phantom = new BodyTube(0.0, 0.5, 0.01); phantom.setName("Phantom Body Tube"); body.setOuterRadiusAutomatic(true); stage.addChild(phantom); @@ -534,7 +534,7 @@ public class FreeformFinSetTest extends BaseTestCase { // some extra points which are very close to previous points. // in particular for points 0 & 1, // y0 + y1 is very small. - final double PERMUTATION = 1e-15; + final double PERMUTATION = 1.0e-15; Coordinate[] points = new Coordinate[] { new Coordinate(0.0, 0.0), // original new Coordinate(0, PERMUTATION), @@ -1165,7 +1165,7 @@ public class FreeformFinSetTest extends BaseTestCase { Coordinate[] points = new Coordinate[] { new Coordinate(0, 0), new Coordinate(0, 1), - new Coordinate(.5, 1), + new Coordinate(0.5, 1), new Coordinate(1, 0) }; fins.setPoints(points); @@ -1315,20 +1315,20 @@ public class FreeformFinSetTest extends BaseTestCase { final Coordinate[] finPoints = fins.getFinPoints(); // p0 - assertEquals(0., finPoints[0].x, EPSILON, "incorrect body points! "); - assertEquals(0., finPoints[0].y, EPSILON, "incorrect body points! "); + assertEquals(0.0, finPoints[0].x, EPSILON, "incorrect body points! "); + assertEquals(0.0, finPoints[0].y, EPSILON, "incorrect body points! "); // p1 - assertEquals(0., finPoints[1].x, EPSILON, "incorrect body points! "); - assertEquals(1., finPoints[1].y, EPSILON, "incorrect body points! "); + assertEquals(0.0, finPoints[1].x, EPSILON, "incorrect body points! "); + assertEquals(1.0, finPoints[1].y, EPSILON, "incorrect body points! "); // p2 - assertEquals(1., finPoints[2].x, EPSILON, "incorrect body points! "); - assertEquals(1., finPoints[2].y, EPSILON, "incorrect body points! "); + assertEquals(1.0, finPoints[2].x, EPSILON, "incorrect body points! "); + assertEquals(1.0, finPoints[2].y, EPSILON, "incorrect body points! "); // pf - assertEquals(0., finPoints[3].x, EPSILON, "incorrect body points! "); - assertEquals(0., finPoints[3].y, EPSILON, "incorrect body points! "); + assertEquals(0.0, finPoints[3].x, EPSILON, "incorrect body points! "); + assertEquals(0.0, finPoints[3].y, EPSILON, "incorrect body points! "); } @Test @@ -1423,8 +1423,8 @@ public class FreeformFinSetTest extends BaseTestCase { { // fin points (relative to fin) // preconditions assertEquals(4, finPoints.length); - assertEquals(0f, finPoints[0].x, EPSILON, "incorrect fin points! "); - assertEquals(0f, finPoints[0].y, EPSILON, "incorrect fin points! "); + assertEquals(0.0f, finPoints[0].x, EPSILON, "incorrect fin points! "); + assertEquals(0.0f, finPoints[0].y, EPSILON, "incorrect fin points! "); assertEquals(0.8, finPoints[3].x, EPSILON, "incorrect fin points! "); @@ -1481,8 +1481,8 @@ public class FreeformFinSetTest extends BaseTestCase { { // move first point out of bounds, keep last point in bounds fins.setAxialOffset(AxialMethod.TOP, 0); fins.setPoints(initialPoints); - assertEquals(0f, fins.getFinFront().x, EPSILON); - assertEquals(1f, fins.getFinFront().y, EPSILON); + assertEquals(0.0f, fins.getFinFront().x, EPSILON); + assertEquals(1.0f, fins.getFinFront().y, EPSILON); // Move first point fins.setPoint(0, -0.1, 0.1f); @@ -1490,11 +1490,11 @@ public class FreeformFinSetTest extends BaseTestCase { final Coordinate[] rootPoints = fins.getRootPoints(); assertEquals(3, rootPoints.length); - assertEquals(0f, rootPoints[0].x, EPSILON, "incorrect body points! "); - assertEquals(0f, rootPoints[0].y, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[0].x, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[0].y, EPSILON, "incorrect body points! "); assertEquals(0.1f, rootPoints[1].x, EPSILON, "incorrect body points! "); - assertEquals(0f, rootPoints[1].y, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[1].y, EPSILON, "incorrect body points! "); assertEquals(0.5f, rootPoints[2].x, EPSILON, "incorrect body points! "); assertEquals(-0.2f, rootPoints[2].y, EPSILON, "incorrect body points! "); @@ -1504,8 +1504,8 @@ public class FreeformFinSetTest extends BaseTestCase { { // move both first and last point out of bounds to the left fins.setAxialOffset(AxialMethod.TOP, 0); fins.setPoints(initialPoints); - assertEquals(0f, fins.getFinFront().x, EPSILON); - assertEquals(1f, fins.getFinFront().y, EPSILON); + assertEquals(0.0f, fins.getFinFront().x, EPSILON); + assertEquals(1.0f, fins.getFinFront().y, EPSILON); // Move first and last point fins.setPoint(0, -0.2, 0.1f); @@ -1514,29 +1514,29 @@ public class FreeformFinSetTest extends BaseTestCase { final Coordinate[] rootPoints = fins.getRootPoints(); assertEquals(2, rootPoints.length); - assertEquals(0f, rootPoints[0].x, EPSILON, "incorrect body points! "); - assertEquals(0f, rootPoints[0].y, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[0].x, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[0].y, EPSILON, "incorrect body points! "); assertEquals(0.1f, rootPoints[1].x, EPSILON, "incorrect body points! "); - assertEquals(0f, rootPoints[1].y, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[1].y, EPSILON, "incorrect body points! "); assertEquals(0.034, fins.getMass(), EPSILON, "incorrect fin mass! "); } { // move last point out of bounds, keep first point in bounds fins.setPoints(initialPoints); fins.setAxialOffset(AxialMethod.BOTTOM, fins.getLength()); - assertEquals(1f, fins.getFinFront().x, EPSILON); + assertEquals(1.0f, fins.getFinFront().x, EPSILON); assertEquals(0.5f, fins.getFinFront().y, EPSILON); // Move first point fins.setPoint(0, -0.1f, 0.1f); - fins.setPoint(fins.getPointCount() - 1, 0.2f, 0f); + fins.setPoint(fins.getPointCount() - 1, 0.2f, 0.0f); final Coordinate[] rootPoints = fins.getRootPoints(); assertEquals(3, rootPoints.length); - assertEquals(0f, rootPoints[0].x, EPSILON, "incorrect body points! "); - assertEquals(0f, rootPoints[0].y, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[0].x, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[0].y, EPSILON, "incorrect body points! "); assertEquals(0.1f, rootPoints[1].x, EPSILON, "incorrect body points! "); assertEquals(-0.05f, rootPoints[1].y, EPSILON, "incorrect body points! "); @@ -1549,7 +1549,7 @@ public class FreeformFinSetTest extends BaseTestCase { { // move both first and last point out of bounds to the right fins.setPoints(initialPoints); fins.setAxialOffset(AxialMethod.BOTTOM, fins.getLength()); - assertEquals(1f, fins.getFinFront().x, EPSILON); + assertEquals(1.0f, fins.getFinFront().x, EPSILON); assertEquals(0.5f, fins.getFinFront().y, EPSILON); // Move first and last point @@ -1559,11 +1559,11 @@ public class FreeformFinSetTest extends BaseTestCase { final Coordinate[] rootPoints = fins.getRootPoints(); assertEquals(2, rootPoints.length); - assertEquals(0f, rootPoints[0].x, EPSILON, "incorrect body points! "); - assertEquals(0f, rootPoints[0].y, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[0].x, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[0].y, EPSILON, "incorrect body points! "); assertEquals(0.2f, rootPoints[1].x, EPSILON, "incorrect body points! "); - assertEquals(0f, rootPoints[1].y, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[1].y, EPSILON, "incorrect body points! "); assertEquals(0.068, fins.getMass(), EPSILON, "incorrect fin mass! "); } @@ -1581,11 +1581,11 @@ public class FreeformFinSetTest extends BaseTestCase { final Coordinate[] rootPoints = fins.getRootPoints(); assertEquals(4, rootPoints.length); - assertEquals(0f, rootPoints[0].x, EPSILON, "incorrect body points! "); - assertEquals(0f, rootPoints[0].y, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[0].x, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[0].y, EPSILON, "incorrect body points! "); assertEquals(0.1f, rootPoints[1].x, EPSILON, "incorrect body points! "); - assertEquals(0f, rootPoints[1].y, EPSILON, "incorrect body points! "); + assertEquals(0.0f, rootPoints[1].y, EPSILON, "incorrect body points! "); assertEquals(1.1f, rootPoints[2].x, EPSILON, "incorrect body points! "); assertEquals(-0.5f, rootPoints[2].y, EPSILON, "incorrect body points! "); @@ -1706,12 +1706,12 @@ public class FreeformFinSetTest extends BaseTestCase { assertEquals(0.04241800, fins.length, EPSILON); // p_first - assertEquals(0f, finPoints[0].x, EPSILON); - assertEquals(0f, finPoints[0].y, EPSILON); + assertEquals(0.0f, finPoints[0].x, EPSILON); + assertEquals(0.0f, finPoints[0].y, EPSILON); // p_last assertEquals(0.042418, finPoints[36].x, EPSILON); - assertEquals(0., finPoints[36].y, EPSILON); + assertEquals(0.0, finPoints[36].y, EPSILON); } } diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/ParallelStageTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/ParallelStageTest.java index 147ef1d1e..ed3b311ab 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/ParallelStageTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/ParallelStageTest.java @@ -159,8 +159,8 @@ public class ParallelStageTest extends BaseTestCase { final Rocket rocket = TestRockets.makeFalcon9Heavy(); AxialStage sustainer = (AxialStage) rocket.getChild(0); - Coordinate expectedPosition = new Coordinate(0, 0., 0.); // i.e. half the tube length - Coordinate targetPosition = new Coordinate(+4.0, 0., 0.); + Coordinate expectedPosition = new Coordinate(0, 0.0, 0.0); // i.e. half the tube length + Coordinate targetPosition = new Coordinate(+4.0, 0.0, 0.0); // without making the rocket 'external' and the Stage should be restricted to // AFTER positioning. @@ -584,7 +584,7 @@ public class ParallelStageTest extends BaseTestCase { final AxialStage coreStage = (AxialStage) rocket.getChild(1); final ParallelStage boosterStage = (ParallelStage) coreStage.getChild(0).getChild(0); - final double targetOffset = +2.50; + final double targetOffset = 2.50; final AxialMethod targetMethod = AxialMethod.TOP; boosterStage.setAxialOffset(targetMethod, targetOffset); String treeDumpBefore = rocket.toDebugTree(); @@ -626,8 +626,8 @@ public class ParallelStageTest extends BaseTestCase { boosterB.setName("Booster B Stage"); coreBody.addChild(boosterB); - double targetOffset = +4.5; - double expectedOffset = +4.5; + double targetOffset = 4.5; + double expectedOffset = 4.5; // requirement: regardless of initialization order (which we cannot control) // two boosters with identical initialization commands should end up at the same // place. diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/TrapezoidFinSetTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/TrapezoidFinSetTest.java index f9fcec471..b19d1e8b4 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/TrapezoidFinSetTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/TrapezoidFinSetTest.java @@ -12,7 +12,7 @@ import info.openrocket.core.util.BaseTestCase; public class TrapezoidFinSetTest extends BaseTestCase { - private static final double EPSILON = 1E-8; + private static final double EPSILON = 1.0E-8; private Rocket createSimpleTrapezoidalFin() { final Rocket rkt = new Rocket(); @@ -185,7 +185,7 @@ public class TrapezoidFinSetTest extends BaseTestCase { final TrapezoidFinSet fins = (TrapezoidFinSet) rkt.getChild(0).getChild(0).getChild(0); // This is a simple square fin with sides of 0.1. - fins.setFinShape(0.1, 0.1, 0.0, 0.1, .005); + fins.setFinShape(0.1, 0.1, 0.0, 0.1, 0.005); // should return a single-fin-planform area assertEquals(0.01, fins.getPlanformArea(), 0.00001, "area calculation doesn't match: "); @@ -312,7 +312,7 @@ public class TrapezoidFinSetTest extends BaseTestCase { // This is a simple square fin with sides of 1.0. TrapezoidFinSet fins = new TrapezoidFinSet(); fins.setFinCount(1); - fins.setFinShape(1.0, 1.0, 0.0, 1.0, .005); + fins.setFinShape(1.0, 1.0, 0.0, 1.0, 0.005); Coordinate coords = fins.getCG(); assertEquals(1.0, fins.getPlanformArea(), 0.001); @@ -328,7 +328,7 @@ public class TrapezoidFinSetTest extends BaseTestCase { // +------+ TrapezoidFinSet fins = new TrapezoidFinSet(); fins.setFinCount(1); - fins.setFinShape(1.0, 0.5, 0.0, 1.0, .005); + fins.setFinShape(1.0, 0.5, 0.0, 1.0, 0.005); Coordinate coords = fins.getCG(); assertEquals(0.75, fins.getPlanformArea(), 0.001); @@ -413,7 +413,7 @@ public class TrapezoidFinSetTest extends BaseTestCase { // This is a simple square fin with sides of 1.0. TrapezoidFinSet fins = new TrapezoidFinSet(); fins.setFinCount(4); - fins.setFinShape(1.0, 1.0, 0.0, 1.0, .005); + fins.setFinShape(1.0, 1.0, 0.0, 1.0, 0.005); fins.setBaseRotation(Math.PI / 2); BodyTube body = new BodyTube(1.0, 0.05); @@ -435,7 +435,7 @@ public class TrapezoidFinSetTest extends BaseTestCase { // This is a simple square fin with sides of 1.0. TrapezoidFinSet fins = new TrapezoidFinSet(); fins.setFinCount(4); - fins.setFinShape(1.0, 1.0, 0.0, 1.0, .005); + fins.setFinShape(1.0, 1.0, 0.0, 1.0, 0.005); fins.setBaseRotation(Math.PI / 4); BodyTube body = new BodyTube(1.0, 0.05); @@ -457,7 +457,7 @@ public class TrapezoidFinSetTest extends BaseTestCase { // This is a simple square fin with sides of 1.0. TrapezoidFinSet fins = new TrapezoidFinSet(); fins.setFinCount(4); - fins.setFinShape(1.0, 1.0, 0.0, 1.0, .005); + fins.setFinShape(1.0, 1.0, 0.0, 1.0, 0.005); fins.setBaseRotation(0.0); double[] angles = fins.getInstanceAngles(); @@ -473,7 +473,7 @@ public class TrapezoidFinSetTest extends BaseTestCase { // This is a simple square fin with sides of 1.0. TrapezoidFinSet fins = new TrapezoidFinSet(); fins.setFinCount(4); - fins.setFinShape(1.0, 1.0, 0.0, 1.0, .005); + fins.setFinShape(1.0, 1.0, 0.0, 1.0, 0.005); fins.setBaseRotation(Math.PI / 2); double[] angles = fins.getInstanceAngles(); diff --git a/core/src/test/java/info/openrocket/core/unit/FractionalUnitTest.java b/core/src/test/java/info/openrocket/core/unit/FractionalUnitTest.java index 604379890..f9beb8cc7 100644 --- a/core/src/test/java/info/openrocket/core/unit/FractionalUnitTest.java +++ b/core/src/test/java/info/openrocket/core/unit/FractionalUnitTest.java @@ -12,54 +12,54 @@ public class FractionalUnitTest { private final static Unit testUnit = new FractionalUnit(1, "unit", "unit", 4, 0.5); private final static Unit testUnitApprox = new FractionalUnit(1, "unit", "unit", 16, 0.5, 0.02); - private final static Unit inchUnit = new FractionalUnit(0.0254, "in/64", "in", 64, 1d / 16d); + private final static Unit inchUnit = new FractionalUnit(0.0254, "in/64", "in", 64, 1.0d / 16.0d); @Test public void testRound() { - assertEquals(-1d, testUnit.round(-1.125), 0.0); // rounds to -1 since mod is even - assertEquals(-1d, testUnit.round(-1.0), 0.0); - assertEquals(-1d, testUnit.round(-.875), 0.0); // rounds to -1 since mod is even + assertEquals(-1.0d, testUnit.round(-1.125), 0.0); // rounds to -1 since mod is even + assertEquals(-1.0d, testUnit.round(-1.0), 0.0); + assertEquals(-1.0d, testUnit.round(-0.875), 0.0); // rounds to -1 since mod is even - assertEquals(-0.75d, testUnit.round(-.874), 0.0); - assertEquals(-0.75d, testUnit.round(-.75), 0.0); - assertEquals(-0.75d, testUnit.round(-.626), 0.0); + assertEquals(-0.75d, testUnit.round(-0.874), 0.0); + assertEquals(-0.75d, testUnit.round(-0.75), 0.0); + assertEquals(-0.75d, testUnit.round(-0.626), 0.0); - assertEquals(-0.5d, testUnit.round(-.625), 0.0); // rounds to -.5 since mod is even - assertEquals(-0.5d, testUnit.round(-.5), 0.0); - assertEquals(-0.5d, testUnit.round(-.375), 0.0); // rounds to -.5 since mod is even + assertEquals(-0.5d, testUnit.round(-0.625), 0.0); // rounds to -.5 since mod is even + assertEquals(-0.5d, testUnit.round(-0.5), 0.0); + assertEquals(-0.5d, testUnit.round(-0.375), 0.0); // rounds to -.5 since mod is even - assertEquals(-0.25d, testUnit.round(-.374), 0.0); - assertEquals(-0.25d, testUnit.round(-.25), 0.0); - assertEquals(-0.25d, testUnit.round(-.126), 0.0); + assertEquals(-0.25d, testUnit.round(-0.374), 0.0); + assertEquals(-0.25d, testUnit.round(-0.25), 0.0); + assertEquals(-0.25d, testUnit.round(-0.126), 0.0); - assertEquals(0d, testUnit.round(-.125), 0.0); - assertEquals(0d, testUnit.round(0), 0.0); - assertEquals(0d, testUnit.round(.125), 0.0); + assertEquals(0.0d, testUnit.round(-0.125), 0.0); + assertEquals(0.0d, testUnit.round(0), 0.0); + assertEquals(0.0d, testUnit.round(0.125), 0.0); - assertEquals(0.25d, testUnit.round(.126), 0.0); - assertEquals(0.25d, testUnit.round(.25), 0.0); - assertEquals(0.25d, testUnit.round(.374), 0.0); + assertEquals(0.25d, testUnit.round(0.126), 0.0); + assertEquals(0.25d, testUnit.round(0.25), 0.0); + assertEquals(0.25d, testUnit.round(0.374), 0.0); - assertEquals(0.5d, testUnit.round(.375), 0.0); // rounds to .5 since mod is even - assertEquals(0.5d, testUnit.round(.5), 0.0); - assertEquals(0.5d, testUnit.round(.625), 0.0); // rounds to .5 since mod is even + assertEquals(0.5d, testUnit.round(0.375), 0.0); // rounds to .5 since mod is even + assertEquals(0.5d, testUnit.round(0.5), 0.0); + assertEquals(0.5d, testUnit.round(0.625), 0.0); // rounds to .5 since mod is even - assertEquals(0.75d, testUnit.round(.626), 0.0); - assertEquals(0.75d, testUnit.round(.75), 0.0); - assertEquals(0.75d, testUnit.round(.874), 0.0); + assertEquals(0.75d, testUnit.round(0.626), 0.0); + assertEquals(0.75d, testUnit.round(0.75), 0.0); + assertEquals(0.75d, testUnit.round(0.874), 0.0); - assertEquals(1d, testUnit.round(.875), 0.0); // rounds to 1 since mod is even - assertEquals(1d, testUnit.round(1.0), 0.0); - assertEquals(1d, testUnit.round(1.125), 0.0); // rounds to 1 since mod is even + assertEquals(1.0d, testUnit.round(0.875), 0.0); // rounds to 1 since mod is even + assertEquals(1.0d, testUnit.round(1.0), 0.0); + assertEquals(1.0d, testUnit.round(1.125), 0.0); // rounds to 1 since mod is even } @Test public void testIncrement() { - assertEquals(-1d, testUnit.getNextValue(-1.2), 0.0); - assertEquals(-1d, testUnit.getNextValue(-1.4), 0.0); + assertEquals(-1.0d, testUnit.getNextValue(-1.2), 0.0); + assertEquals(-1.0d, testUnit.getNextValue(-1.4), 0.0); assertEquals(-0.5d, testUnit.getNextValue(-0.7), 0.0); assertEquals(-0.5d, testUnit.getNextValue(-0.9), 0.0); @@ -75,8 +75,8 @@ public class FractionalUnitTest { assertEquals(0.5d, testUnit.getNextValue(0.062), 0.0); assertEquals(0.5d, testUnit.getNextValue(0.0625), 0.0); - assertEquals(1d, testUnit.getNextValue(0.51), 0.0); - assertEquals(1d, testUnit.getNextValue(0.7), 0.0); + assertEquals(1.0d, testUnit.getNextValue(0.51), 0.0); + assertEquals(1.0d, testUnit.getNextValue(0.7), 0.0); } @Test @@ -86,8 +86,8 @@ public class FractionalUnitTest { assertEquals(-1.5d, testUnit.getPreviousValue(-1.4), 0.0); assertEquals(-1.5d, testUnit.getPreviousValue(-1.0), 0.0); - assertEquals(-1d, testUnit.getPreviousValue(-0.7), 0.0); - assertEquals(-1d, testUnit.getPreviousValue(-0.9), 0.0); + assertEquals(-1.0d, testUnit.getPreviousValue(-0.7), 0.0); + assertEquals(-1.0d, testUnit.getPreviousValue(-0.9), 0.0); assertEquals(-0.5d, testUnit.getPreviousValue(-0.01), 0.0); assertEquals(-0.5d, testUnit.getPreviousValue(-0.05), 0.0); @@ -111,14 +111,14 @@ public class FractionalUnitTest { assertEquals(testUnit.toString(-1.2), "-1.2"); assertEquals(testUnit.toString(-1.3), "-1.3"); - assertEquals(testUnit.toString(-.2), "-0.2"); - assertEquals(testUnit.toString(-.3), "-0.3"); + assertEquals(testUnit.toString(-0.2), "-0.2"); + assertEquals(testUnit.toString(-0.3), "-0.3"); - assertEquals(testUnit.toString(-.1), "-0.1"); - assertEquals(testUnit.toString(.1), "0.1"); + assertEquals(testUnit.toString(-0.1), "-0.1"); + assertEquals(testUnit.toString(0.1), "0.1"); - assertEquals(testUnit.toString(.2), "0.2"); - assertEquals(testUnit.toString(.3), "0.3"); + assertEquals(testUnit.toString(0.2), "0.2"); + assertEquals(testUnit.toString(0.3), "0.3"); assertEquals(testUnit.toString(1.2), "1.2"); assertEquals(testUnit.toString(1.3), "1.3"); @@ -126,14 +126,14 @@ public class FractionalUnitTest { assertEquals(testUnit.toString(-1.2), "-1,2"); assertEquals(testUnit.toString(-1.3), "-1,3"); - assertEquals(testUnit.toString(-.2), "-0,2"); - assertEquals(testUnit.toString(-.3), "-0,3"); + assertEquals(testUnit.toString(-0.2), "-0,2"); + assertEquals(testUnit.toString(-0.3), "-0,3"); - assertEquals(testUnit.toString(-.1), "-0,1"); - assertEquals(testUnit.toString(.1), "0,1"); + assertEquals(testUnit.toString(-0.1), "-0,1"); + assertEquals(testUnit.toString(0.1), "0,1"); - assertEquals(testUnit.toString(.2), "0,2"); - assertEquals(testUnit.toString(.3), "0,3"); + assertEquals(testUnit.toString(0.2), "0,2"); + assertEquals(testUnit.toString(0.3), "0,3"); assertEquals(testUnit.toString(1.2), "1,2"); assertEquals(testUnit.toString(1.3), "1,3"); @@ -146,19 +146,19 @@ public class FractionalUnitTest { assertEquals(testUnit.toString(-1.25), "-1 \u00B9\u2044\u2084"); assertEquals(testUnit.toString(-1.275), "-1 \u00B9\u2044\u2084"); - assertEquals(testUnit.toString(-.225), "-\u00B9\u2044\u2084"); - assertEquals(testUnit.toString(-.25), "-\u00B9\u2044\u2084"); - assertEquals(testUnit.toString(-.274), "-\u00B9\u2044\u2084"); + assertEquals(testUnit.toString(-0.225), "-\u00B9\u2044\u2084"); + assertEquals(testUnit.toString(-0.25), "-\u00B9\u2044\u2084"); + assertEquals(testUnit.toString(-0.274), "-\u00B9\u2044\u2084"); // assertEquals(testUnit.toString(-.275), "-1/4"); // this has round-off error // which pushes it over epsilon assertEquals(testUnit.toString(-0.024), "0"); assertEquals(testUnit.toString(0), "0"); - assertEquals(testUnit.toString(.024), "0"); + assertEquals(testUnit.toString(0.024), "0"); - assertEquals(testUnit.toString(.225), "\u00B9\u2044\u2084"); - assertEquals(testUnit.toString(.25), "\u00B9\u2044\u2084"); - assertEquals(testUnit.toString(.274), "\u00B9\u2044\u2084"); + assertEquals(testUnit.toString(0.225), "\u00B9\u2044\u2084"); + assertEquals(testUnit.toString(0.25), "\u00B9\u2044\u2084"); + assertEquals(testUnit.toString(0.274), "\u00B9\u2044\u2084"); assertEquals(testUnit.toString(1.225), "1 \u00B9\u2044\u2084"); assertEquals(testUnit.toString(1.25), "1 \u00B9\u2044\u2084"); @@ -171,18 +171,18 @@ public class FractionalUnitTest { assertEquals(testUnitApprox.toString(-1.225), "-1.225"); assertEquals(testUnitApprox.toString(-1.275), "-1.275"); - assertEquals(testUnitApprox.toString(-.225), "-0.225"); - assertEquals(testUnitApprox.toString(-.275), "-0.275"); + assertEquals(testUnitApprox.toString(-0.225), "-0.225"); + assertEquals(testUnitApprox.toString(-0.275), "-0.275"); - assertEquals(testUnitApprox.toString(-.1), "-0.1"); + assertEquals(testUnitApprox.toString(-0.1), "-0.1"); assertEquals(testUnitApprox.toString(-0.024), "-0.024"); - assertEquals(testUnitApprox.toString(.024), "0.024"); + assertEquals(testUnitApprox.toString(0.024), "0.024"); - assertEquals(testUnitApprox.toString(.1), "0.1"); + assertEquals(testUnitApprox.toString(0.1), "0.1"); - assertEquals(testUnitApprox.toString(.275), "0.275"); - assertEquals(testUnitApprox.toString(.225), "0.225"); + assertEquals(testUnitApprox.toString(0.275), "0.275"); + assertEquals(testUnitApprox.toString(0.225), "0.225"); assertEquals(testUnitApprox.toString(1.225), "1.225"); assertEquals(testUnitApprox.toString(1.275), "1.275"); @@ -190,18 +190,18 @@ public class FractionalUnitTest { assertEquals(testUnitApprox.toString(-1.225), "-1,225"); assertEquals(testUnitApprox.toString(-1.275), "-1,275"); - assertEquals(testUnitApprox.toString(-.225), "-0,225"); - assertEquals(testUnitApprox.toString(-.275), "-0,275"); + assertEquals(testUnitApprox.toString(-0.225), "-0,225"); + assertEquals(testUnitApprox.toString(-0.275), "-0,275"); - assertEquals(testUnitApprox.toString(-.1), "-0,1"); + assertEquals(testUnitApprox.toString(-0.1), "-0,1"); assertEquals(testUnitApprox.toString(-0.024), "-0,024"); - assertEquals(testUnitApprox.toString(.024), "0,024"); + assertEquals(testUnitApprox.toString(0.024), "0,024"); - assertEquals(testUnitApprox.toString(.1), "0,1"); + assertEquals(testUnitApprox.toString(0.1), "0,1"); - assertEquals(testUnitApprox.toString(.275), "0,275"); - assertEquals(testUnitApprox.toString(.225), "0,225"); + assertEquals(testUnitApprox.toString(0.275), "0,275"); + assertEquals(testUnitApprox.toString(0.225), "0,225"); assertEquals(testUnitApprox.toString(1.225), "1,225"); assertEquals(testUnitApprox.toString(1.275), "1,275"); @@ -212,15 +212,15 @@ public class FractionalUnitTest { assertEquals(testUnitApprox.toString(-1.25), "-1 \u00B9\u2044\u2084"); assertEquals(testUnitApprox.toString(-1.3), "-1 \u2075\u2044\u2081\u2086"); - assertEquals(testUnitApprox.toString(-.2), "-\u00B3\u2044\u2081\u2086"); - assertEquals(testUnitApprox.toString(-.25), "-\u00B9\u2044\u2084"); - assertEquals(testUnitApprox.toString(-.3), "-\u2075\u2044\u2081\u2086"); + assertEquals(testUnitApprox.toString(-0.2), "-\u00B3\u2044\u2081\u2086"); + assertEquals(testUnitApprox.toString(-0.25), "-\u00B9\u2044\u2084"); + assertEquals(testUnitApprox.toString(-0.3), "-\u2075\u2044\u2081\u2086"); assertEquals(testUnitApprox.toString(0), "0"); - assertEquals(testUnitApprox.toString(.2), "\u00B3\u2044\u2081\u2086"); - assertEquals(testUnitApprox.toString(.25), "\u00B9\u2044\u2084"); - assertEquals(testUnitApprox.toString(.3), "\u2075\u2044\u2081\u2086"); + assertEquals(testUnitApprox.toString(0.2), "\u00B3\u2044\u2081\u2086"); + assertEquals(testUnitApprox.toString(0.25), "\u00B9\u2044\u2084"); + assertEquals(testUnitApprox.toString(0.3), "\u2075\u2044\u2081\u2086"); assertEquals(testUnitApprox.toString(1.2), "1 \u00B3\u2044\u2081\u2086"); assertEquals(testUnitApprox.toString(1.25), "1 \u00B9\u2044\u2084"); @@ -235,11 +235,11 @@ public class FractionalUnitTest { public void testInchToString() { // Just some random test points. - assertEquals(inchUnit.toString(1d / 64d * 0.0254), "\u00B9\u2044\u2086\u2084"); + assertEquals(inchUnit.toString(1.0d / 64.0d * 0.0254), "\u00B9\u2044\u2086\u2084"); - assertEquals(inchUnit.toString(-5d / 64d * 0.0254), "-\u2075\u2044\u2086\u2084"); + assertEquals(inchUnit.toString(-5.0d / 64.0d * 0.0254), "-\u2075\u2044\u2086\u2084"); - assertEquals(inchUnit.toString(9d / 2d * 0.0254), "4 \u00B9\u2044\u2082"); + assertEquals(inchUnit.toString(9.0d / 2.0d * 0.0254), "4 \u00B9\u2044\u2082"); if (isPointDecimalSeparator()) { assertEquals(inchUnit.toString(0.002 * 0.0254), "0.002"); @@ -248,7 +248,7 @@ public class FractionalUnitTest { } // default body tube length: - double length = 8d * 0.025; + double length = 8.0d * 0.025; assertEquals(inchUnit.toString(length), "7 \u2077\u2044\u2088"); diff --git a/core/src/test/java/info/openrocket/core/util/ArrayUtilsTest.java b/core/src/test/java/info/openrocket/core/util/ArrayUtilsTest.java index ec8ac3969..8eb4dd715 100644 --- a/core/src/test/java/info/openrocket/core/util/ArrayUtilsTest.java +++ b/core/src/test/java/info/openrocket/core/util/ArrayUtilsTest.java @@ -91,7 +91,7 @@ public class ArrayUtilsTest { @Test public void testRante0() { - double[] ary = ArrayUtils.range(0., 0., 1.0); + double[] ary = ArrayUtils.range(0.0, 0.0, 1.0); assertEquals(1, ary.length); assertEquals(0.0, ary[0], 0.0); } diff --git a/core/src/test/java/info/openrocket/core/util/CoordinateTest.java b/core/src/test/java/info/openrocket/core/util/CoordinateTest.java index 815d4123a..cc797bbe0 100644 --- a/core/src/test/java/info/openrocket/core/util/CoordinateTest.java +++ b/core/src/test/java/info/openrocket/core/util/CoordinateTest.java @@ -42,7 +42,7 @@ public class CoordinateTest { assertEquals(1 + 2 + 3, Coordinate.dot(x, y), EPS); assertEquals(x.dot(x), x.length2(), EPS); assertEquals(y.dot(y), y.length2(), EPS); - assertEquals(Math.sqrt(1 + 4 + 9), y.length(), EPS); + assertEquals(3.7416573867739413, y.length(), EPS); assertEquals(1, y.normalize().length(), EPS); assertCoordinateEquals(new Coordinate(1.75, 1.75, 1.75, 4), diff --git a/core/src/test/java/info/openrocket/core/util/ExpressionParserTest.java b/core/src/test/java/info/openrocket/core/util/ExpressionParserTest.java index 3605d9024..41660c696 100644 --- a/core/src/test/java/info/openrocket/core/util/ExpressionParserTest.java +++ b/core/src/test/java/info/openrocket/core/util/ExpressionParserTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; public class ExpressionParserTest { - private static final double EPS = 1e-10; + private static final double EPS = 1.0e-10; private final ExpressionParser parser = new ExpressionParser(); diff --git a/core/src/test/java/info/openrocket/core/util/MathUtilTest.java b/core/src/test/java/info/openrocket/core/util/MathUtilTest.java index f96fc0ada..097dfd4ee 100644 --- a/core/src/test/java/info/openrocket/core/util/MathUtilTest.java +++ b/core/src/test/java/info/openrocket/core/util/MathUtilTest.java @@ -62,7 +62,7 @@ public class MathUtilTest { for (int i = 0; i < 10000; i++) { double x = Math.random() * 100 - 50; - double y = Math.random() * i - i / 2; + double y = Math.random() * i - (double) i / 2; double z = Math.hypot(x, y); assertEquals(z, MathUtil.hypot(x, y), EPS); } @@ -170,7 +170,7 @@ public class MathUtilTest { } - for (double value : new double[] { PI * 1e20, -PI * 1e20 }) { + for (double value : new double[] { PI * 1.0e20, -PI * 1.0e20}) { assertTrue(MathUtil.equals(value, value + 1), "value=" + value); assertTrue(MathUtil.equals(value, Math.nextUp(value)), "value=" + value); assertTrue(MathUtil.equals(value, value * (1 + MathUtil.EPSILON)), "value=" + value); diff --git a/core/src/test/java/info/openrocket/core/util/TestTransformation.java b/core/src/test/java/info/openrocket/core/util/TestTransformation.java index 059660e82..08653604c 100644 --- a/core/src/test/java/info/openrocket/core/util/TestTransformation.java +++ b/core/src/test/java/info/openrocket/core/util/TestTransformation.java @@ -27,25 +27,25 @@ public class TestTransformation { Transformation t = Transformation.IDENTITY; DoubleBuffer buf = t.getGLMatrix(); - assertEquals(1.0, buf.get(0), 1e-6); - assertEquals(0.0, buf.get(1), 1e-6); - assertEquals(0.0, buf.get(2), 1e-6); - assertEquals(0.0, buf.get(3), 1e-6); + assertEquals(1.0, buf.get(0), 1.0e-6); + assertEquals(0.0, buf.get(1), 1.0e-6); + assertEquals(0.0, buf.get(2), 1.0e-6); + assertEquals(0.0, buf.get(3), 1.0e-6); - assertEquals(0.0, buf.get(4), 1e-6); - assertEquals(1.0, buf.get(5), 1e-6); - assertEquals(0.0, buf.get(6), 1e-6); - assertEquals(0.0, buf.get(7), 1e-6); + assertEquals(0.0, buf.get(4), 1.0e-6); + assertEquals(1.0, buf.get(5), 1.0e-6); + assertEquals(0.0, buf.get(6), 1.0e-6); + assertEquals(0.0, buf.get(7), 1.0e-6); - assertEquals(0.0, buf.get(8), 1e-6); - assertEquals(0.0, buf.get(9), 1e-6); - assertEquals(1.0, buf.get(10), 1e-6); - assertEquals(0.0, buf.get(11), 1e-6); + assertEquals(0.0, buf.get(8), 1.0e-6); + assertEquals(0.0, buf.get(9), 1.0e-6); + assertEquals(1.0, buf.get(10), 1.0e-6); + assertEquals(0.0, buf.get(11), 1.0e-6); - assertEquals(0.0, buf.get(12), 1e-6); - assertEquals(0.0, buf.get(13), 1e-6); - assertEquals(0.0, buf.get(14), 1e-6); - assertEquals(1.0, buf.get(15), 1e-6); + assertEquals(0.0, buf.get(12), 1.0e-6); + assertEquals(0.0, buf.get(13), 1.0e-6); + assertEquals(0.0, buf.get(14), 1.0e-6); + assertEquals(1.0, buf.get(15), 1.0e-6); } @Test @@ -53,25 +53,25 @@ public class TestTransformation { Transformation translate = new Transformation(1, 2, 3); DoubleBuffer buf = translate.getGLMatrix(); - assertEquals(1.0, buf.get(0), 1e-6); - assertEquals(0.0, buf.get(1), 1e-6); - assertEquals(0.0, buf.get(2), 1e-6); - assertEquals(0.0, buf.get(3), 1e-6); + assertEquals(1.0, buf.get(0), 1.0e-6); + assertEquals(0.0, buf.get(1), 1.0e-6); + assertEquals(0.0, buf.get(2), 1.0e-6); + assertEquals(0.0, buf.get(3), 1.0e-6); - assertEquals(0.0, buf.get(4), 1e-6); - assertEquals(1.0, buf.get(5), 1e-6); - assertEquals(0.0, buf.get(6), 1e-6); - assertEquals(0.0, buf.get(7), 1e-6); + assertEquals(0.0, buf.get(4), 1.0e-6); + assertEquals(1.0, buf.get(5), 1.0e-6); + assertEquals(0.0, buf.get(6), 1.0e-6); + assertEquals(0.0, buf.get(7), 1.0e-6); - assertEquals(0.0, buf.get(8), 1e-6); - assertEquals(0.0, buf.get(9), 1e-6); - assertEquals(1.0, buf.get(10), 1e-6); - assertEquals(0.0, buf.get(11), 1e-6); + assertEquals(0.0, buf.get(8), 1.0e-6); + assertEquals(0.0, buf.get(9), 1.0e-6); + assertEquals(1.0, buf.get(10), 1.0e-6); + assertEquals(0.0, buf.get(11), 1.0e-6); - assertEquals(1.0, buf.get(12), 1e-6); - assertEquals(2.0, buf.get(13), 1e-6); - assertEquals(3.0, buf.get(14), 1e-6); - assertEquals(1.0, buf.get(15), 1e-6); + assertEquals(1.0, buf.get(12), 1.0e-6); + assertEquals(2.0, buf.get(13), 1.0e-6); + assertEquals(3.0, buf.get(14), 1.0e-6); + assertEquals(1.0, buf.get(15), 1.0e-6); } @Test @@ -79,25 +79,25 @@ public class TestTransformation { Transformation translate = Transformation.getAxialRotation(M_PI_2); DoubleBuffer buf = translate.getGLMatrix(); - assertEquals(1.0, buf.get(0), 1e-6); - assertEquals(0.0, buf.get(1), 1e-6); - assertEquals(0.0, buf.get(2), 1e-6); - assertEquals(0.0, buf.get(3), 1e-6); + assertEquals(1.0, buf.get(0), 1.0e-6); + assertEquals(0.0, buf.get(1), 1.0e-6); + assertEquals(0.0, buf.get(2), 1.0e-6); + assertEquals(0.0, buf.get(3), 1.0e-6); - assertEquals(0.0, buf.get(4), 1e-6); - assertEquals(0.0, buf.get(5), 1e-6); - assertEquals(1.0, buf.get(6), 1e-6); - assertEquals(0.0, buf.get(7), 1e-6); + assertEquals(0.0, buf.get(4), 1.0e-6); + assertEquals(0.0, buf.get(5), 1.0e-6); + assertEquals(1.0, buf.get(6), 1.0e-6); + assertEquals(0.0, buf.get(7), 1.0e-6); - assertEquals(0.0, buf.get(8), 1e-6); - assertEquals(-1.0, buf.get(9), 1e-6); - assertEquals(0.0, buf.get(10), 1e-6); - assertEquals(0.0, buf.get(11), 1e-6); + assertEquals(0.0, buf.get(8), 1.0e-6); + assertEquals(-1.0, buf.get(9), 1.0e-6); + assertEquals(0.0, buf.get(10), 1.0e-6); + assertEquals(0.0, buf.get(11), 1.0e-6); - assertEquals(0.0, buf.get(12), 1e-6); - assertEquals(0.0, buf.get(13), 1e-6); - assertEquals(0.0, buf.get(14), 1e-6); - assertEquals(1.0, buf.get(15), 1e-6); + assertEquals(0.0, buf.get(12), 1.0e-6); + assertEquals(0.0, buf.get(13), 1.0e-6); + assertEquals(0.0, buf.get(14), 1.0e-6); + assertEquals(1.0, buf.get(15), 1.0e-6); } @Test @@ -133,17 +133,17 @@ public class TestTransformation { Coordinate v1 = t.transform(x_unit); // we need to test individual coordinates due to error. - assertEquals(1, v1.x, .001); - assertEquals(0, v1.y, .001); - assertEquals(-.01, v1.z, .001); + assertEquals(1, v1.x, 0.001); + assertEquals(0, v1.y, 0.001); + assertEquals(-0.01, v1.z, 0.001); assertEquals(y_unit, t.transform(y_unit)); Coordinate v2 = t.transform(z_unit); // we need to test individual coordinates due to error. - assertEquals(.01, v2.x, .001); - assertEquals(0, v2.y, .001); - assertEquals(1, v2.z, .001); + assertEquals(0.01, v2.x, 0.001); + assertEquals(0, v2.y, 0.001); + assertEquals(1, v2.z, 0.001); } @Test diff --git a/core/src/test/java/info/openrocket/core/util/TextUtilTest.java b/core/src/test/java/info/openrocket/core/util/TextUtilTest.java index 6c524fc5c..b20e9eb8c 100644 --- a/core/src/test/java/info/openrocket/core/util/TextUtilTest.java +++ b/core/src/test/java/info/openrocket/core/util/TextUtilTest.java @@ -73,113 +73,113 @@ public class TextUtilTest { @Test public void longTest() { - assertEquals(TextUtil.doubleToString(PI * 1e-5), "3.142e-5"); - assertEquals(TextUtil.doubleToString(PI * 1e-4), "3.142e-4"); - assertEquals(TextUtil.doubleToString(PI * 1e-3), "0.003"); - assertEquals(TextUtil.doubleToString(PI * 1e-2), "0.031"); - assertEquals(TextUtil.doubleToString(PI * 1e-1), "0.314"); + assertEquals(TextUtil.doubleToString(PI * 1.0e-5), "3.142e-5"); + assertEquals(TextUtil.doubleToString(PI * 1.0e-4), "3.142e-4"); + assertEquals(TextUtil.doubleToString(PI * 1.0e-3), "0.003"); + assertEquals(TextUtil.doubleToString(PI * 1.0e-2), "0.031"); + assertEquals(TextUtil.doubleToString(PI * 1.0e-1), "0.314"); assertEquals(TextUtil.doubleToString(PI), "3.142"); - assertEquals(TextUtil.doubleToString(PI * 1e1), "31.416"); - assertEquals(TextUtil.doubleToString(PI * 1e2), "314.159"); - assertEquals(TextUtil.doubleToString(PI * 1e3), "3141.593"); - assertEquals(TextUtil.doubleToString(PI * 1e4), "3.142e4"); - assertEquals(TextUtil.doubleToString(PI * 1e5), "3.142e5"); - assertEquals(TextUtil.doubleToString(PI * 1e6), "3.142e6"); - assertEquals(TextUtil.doubleToString(PI * 1e7), "3.142e7"); - assertEquals(TextUtil.doubleToString(PI * 1e8), "3.142e8"); - assertEquals(TextUtil.doubleToString(PI * 1e9), "3.142e9"); - assertEquals(TextUtil.doubleToString(PI * 1e10), "3.142e10"); + assertEquals(TextUtil.doubleToString(PI * 1.0e1), "31.416"); + assertEquals(TextUtil.doubleToString(PI * 1.0e2), "314.159"); + assertEquals(TextUtil.doubleToString(PI * 1.0e3), "3141.593"); + assertEquals(TextUtil.doubleToString(PI * 1.0e4), "3.142e4"); + assertEquals(TextUtil.doubleToString(PI * 1.0e5), "3.142e5"); + assertEquals(TextUtil.doubleToString(PI * 1.0e6), "3.142e6"); + assertEquals(TextUtil.doubleToString(PI * 1.0e7), "3.142e7"); + assertEquals(TextUtil.doubleToString(PI * 1.0e8), "3.142e8"); + assertEquals(TextUtil.doubleToString(PI * 1.0e9), "3.142e9"); + assertEquals(TextUtil.doubleToString(PI * 1.0e10), "3.142e10"); - assertEquals(TextUtil.doubleToString(-PI * 1e-5), "-3.142e-5"); - assertEquals(TextUtil.doubleToString(-PI * 1e-4), "-3.142e-4"); - assertEquals(TextUtil.doubleToString(-PI * 1e-3), "-0.003"); - assertEquals(TextUtil.doubleToString(-PI * 1e-2), "-0.031"); - assertEquals(TextUtil.doubleToString(-PI * 1e-1), "-0.314"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e-5), "-3.142e-5"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e-4), "-3.142e-4"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e-3), "-0.003"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e-2), "-0.031"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e-1), "-0.314"); assertEquals(TextUtil.doubleToString(-PI), "-3.142"); - assertEquals(TextUtil.doubleToString(-PI * 1e1), "-31.416"); - assertEquals(TextUtil.doubleToString(-PI * 1e2), "-314.159"); - assertEquals(TextUtil.doubleToString(-PI * 1e3), "-3141.593"); - assertEquals(TextUtil.doubleToString(-PI * 1e4), "-3.142e4"); - assertEquals(TextUtil.doubleToString(-PI * 1e5), "-3.142e5"); - assertEquals(TextUtil.doubleToString(-PI * 1e6), "-3.142e6"); - assertEquals(TextUtil.doubleToString(-PI * 1e7), "-3.142e7"); - assertEquals(TextUtil.doubleToString(-PI * 1e8), "-3.142e8"); - assertEquals(TextUtil.doubleToString(-PI * 1e9), "-3.142e9"); - assertEquals(TextUtil.doubleToString(-PI * 1e10), "-3.142e10"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e1), "-31.416"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e2), "-314.159"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e3), "-3141.593"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e4), "-3.142e4"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e5), "-3.142e5"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e6), "-3.142e6"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e7), "-3.142e7"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e8), "-3.142e8"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e9), "-3.142e9"); + assertEquals(TextUtil.doubleToString(-PI * 1.0e10), "-3.142e10"); } @Test public void shortTest() { double p = 3.1; - assertEquals(TextUtil.doubleToString(p * 1e-5), "3.1e-5"); - assertEquals(TextUtil.doubleToString(p * 1e-4), "3.1e-4"); - assertEquals(TextUtil.doubleToString(p * 1e-3), "0.003"); - assertEquals(TextUtil.doubleToString(p * 1e-2), "0.031"); - assertEquals(TextUtil.doubleToString(p * 1e-1), "0.31"); + assertEquals(TextUtil.doubleToString(p * 1.0e-5), "3.1e-5"); + assertEquals(TextUtil.doubleToString(p * 1.0e-4), "3.1e-4"); + assertEquals(TextUtil.doubleToString(p * 1.0e-3), "0.003"); + assertEquals(TextUtil.doubleToString(p * 1.0e-2), "0.031"); + assertEquals(TextUtil.doubleToString(p * 1.0e-1), "0.31"); assertEquals(TextUtil.doubleToString(p), "3.1"); - assertEquals(TextUtil.doubleToString(p * 1e1), "31"); - assertEquals(TextUtil.doubleToString(p * 1e2), "310"); - assertEquals(TextUtil.doubleToString(p * 1e3), "3100"); - assertEquals(TextUtil.doubleToString(p * 1e4), "3.1e4"); - assertEquals(TextUtil.doubleToString(p * 1e5), "3.1e5"); - assertEquals(TextUtil.doubleToString(p * 1e6), "3.1e6"); - assertEquals(TextUtil.doubleToString(p * 1e7), "3.1e7"); - assertEquals(TextUtil.doubleToString(p * 1e8), "3.1e8"); - assertEquals(TextUtil.doubleToString(p * 1e9), "3.1e9"); - assertEquals(TextUtil.doubleToString(p * 1e10), "3.1e10"); + assertEquals(TextUtil.doubleToString(p * 1.0e1), "31"); + assertEquals(TextUtil.doubleToString(p * 1.0e2), "310"); + assertEquals(TextUtil.doubleToString(p * 1.0e3), "3100"); + assertEquals(TextUtil.doubleToString(p * 1.0e4), "3.1e4"); + assertEquals(TextUtil.doubleToString(p * 1.0e5), "3.1e5"); + assertEquals(TextUtil.doubleToString(p * 1.0e6), "3.1e6"); + assertEquals(TextUtil.doubleToString(p * 1.0e7), "3.1e7"); + assertEquals(TextUtil.doubleToString(p * 1.0e8), "3.1e8"); + assertEquals(TextUtil.doubleToString(p * 1.0e9), "3.1e9"); + assertEquals(TextUtil.doubleToString(p * 1.0e10), "3.1e10"); - assertEquals(TextUtil.doubleToString(-p * 1e-5), "-3.1e-5"); - assertEquals(TextUtil.doubleToString(-p * 1e-4), "-3.1e-4"); - assertEquals(TextUtil.doubleToString(-p * 1e-3), "-0.003"); - assertEquals(TextUtil.doubleToString(-p * 1e-2), "-0.031"); - assertEquals(TextUtil.doubleToString(-p * 1e-1), "-0.31"); + assertEquals(TextUtil.doubleToString(-p * 1.0e-5), "-3.1e-5"); + assertEquals(TextUtil.doubleToString(-p * 1.0e-4), "-3.1e-4"); + assertEquals(TextUtil.doubleToString(-p * 1.0e-3), "-0.003"); + assertEquals(TextUtil.doubleToString(-p * 1.0e-2), "-0.031"); + assertEquals(TextUtil.doubleToString(-p * 1.0e-1), "-0.31"); assertEquals(TextUtil.doubleToString(-p), "-3.1"); - assertEquals(TextUtil.doubleToString(-p * 1e1), "-31"); - assertEquals(TextUtil.doubleToString(-p * 1e2), "-310"); - assertEquals(TextUtil.doubleToString(-p * 1e3), "-3100"); - assertEquals(TextUtil.doubleToString(-p * 1e4), "-3.1e4"); - assertEquals(TextUtil.doubleToString(-p * 1e5), "-3.1e5"); - assertEquals(TextUtil.doubleToString(-p * 1e6), "-3.1e6"); - assertEquals(TextUtil.doubleToString(-p * 1e7), "-3.1e7"); - assertEquals(TextUtil.doubleToString(-p * 1e8), "-3.1e8"); - assertEquals(TextUtil.doubleToString(-p * 1e9), "-3.1e9"); - assertEquals(TextUtil.doubleToString(-p * 1e10), "-3.1e10"); + assertEquals(TextUtil.doubleToString(-p * 1.0e1), "-31"); + assertEquals(TextUtil.doubleToString(-p * 1.0e2), "-310"); + assertEquals(TextUtil.doubleToString(-p * 1.0e3), "-3100"); + assertEquals(TextUtil.doubleToString(-p * 1.0e4), "-3.1e4"); + assertEquals(TextUtil.doubleToString(-p * 1.0e5), "-3.1e5"); + assertEquals(TextUtil.doubleToString(-p * 1.0e6), "-3.1e6"); + assertEquals(TextUtil.doubleToString(-p * 1.0e7), "-3.1e7"); + assertEquals(TextUtil.doubleToString(-p * 1.0e8), "-3.1e8"); + assertEquals(TextUtil.doubleToString(-p * 1.0e9), "-3.1e9"); + assertEquals(TextUtil.doubleToString(-p * 1.0e10), "-3.1e10"); p = 3; - assertEquals(TextUtil.doubleToString(p * 1e-5), "3e-5"); - assertEquals(TextUtil.doubleToString(p * 1e-4), "3e-4"); - assertEquals(TextUtil.doubleToString(p * 1e-3), "0.003"); - assertEquals(TextUtil.doubleToString(p * 1e-2), "0.03"); - assertEquals(TextUtil.doubleToString(p * 1e-1), "0.3"); + assertEquals(TextUtil.doubleToString(p * 1.0e-5), "3e-5"); + assertEquals(TextUtil.doubleToString(p * 1.0e-4), "3e-4"); + assertEquals(TextUtil.doubleToString(p * 1.0e-3), "0.003"); + assertEquals(TextUtil.doubleToString(p * 1.0e-2), "0.03"); + assertEquals(TextUtil.doubleToString(p * 1.0e-1), "0.3"); assertEquals(TextUtil.doubleToString(p), "3"); - assertEquals(TextUtil.doubleToString(p * 1e1), "30"); - assertEquals(TextUtil.doubleToString(p * 1e2), "300"); - assertEquals(TextUtil.doubleToString(p * 1e3), "3000"); - assertEquals(TextUtil.doubleToString(p * 1e4), "3e4"); - assertEquals(TextUtil.doubleToString(p * 1e5), "3e5"); - assertEquals(TextUtil.doubleToString(p * 1e6), "3e6"); - assertEquals(TextUtil.doubleToString(p * 1e7), "3e7"); - assertEquals(TextUtil.doubleToString(p * 1e8), "3e8"); - assertEquals(TextUtil.doubleToString(p * 1e9), "3e9"); - assertEquals(TextUtil.doubleToString(p * 1e10), "3e10"); + assertEquals(TextUtil.doubleToString(p * 1.0e1), "30"); + assertEquals(TextUtil.doubleToString(p * 1.0e2), "300"); + assertEquals(TextUtil.doubleToString(p * 1.0e3), "3000"); + assertEquals(TextUtil.doubleToString(p * 1.0e4), "3e4"); + assertEquals(TextUtil.doubleToString(p * 1.0e5), "3e5"); + assertEquals(TextUtil.doubleToString(p * 1.0e6), "3e6"); + assertEquals(TextUtil.doubleToString(p * 1.0e7), "3e7"); + assertEquals(TextUtil.doubleToString(p * 1.0e8), "3e8"); + assertEquals(TextUtil.doubleToString(p * 1.0e9), "3e9"); + assertEquals(TextUtil.doubleToString(p * 1.0e10), "3e10"); - assertEquals(TextUtil.doubleToString(-p * 1e-5), "-3e-5"); - assertEquals(TextUtil.doubleToString(-p * 1e-4), "-3e-4"); - assertEquals(TextUtil.doubleToString(-p * 1e-3), "-0.003"); - assertEquals(TextUtil.doubleToString(-p * 1e-2), "-0.03"); - assertEquals(TextUtil.doubleToString(-p * 1e-1), "-0.3"); + assertEquals(TextUtil.doubleToString(-p * 1.0e-5), "-3e-5"); + assertEquals(TextUtil.doubleToString(-p * 1.0e-4), "-3e-4"); + assertEquals(TextUtil.doubleToString(-p * 1.0e-3), "-0.003"); + assertEquals(TextUtil.doubleToString(-p * 1.0e-2), "-0.03"); + assertEquals(TextUtil.doubleToString(-p * 1.0e-1), "-0.3"); assertEquals(TextUtil.doubleToString(-p), "-3"); - assertEquals(TextUtil.doubleToString(-p * 1e1), "-30"); - assertEquals(TextUtil.doubleToString(-p * 1e2), "-300"); - assertEquals(TextUtil.doubleToString(-p * 1e3), "-3000"); - assertEquals(TextUtil.doubleToString(-p * 1e4), "-3e4"); - assertEquals(TextUtil.doubleToString(-p * 1e5), "-3e5"); - assertEquals(TextUtil.doubleToString(-p * 1e6), "-3e6"); - assertEquals(TextUtil.doubleToString(-p * 1e7), "-3e7"); - assertEquals(TextUtil.doubleToString(-p * 1e8), "-3e8"); - assertEquals(TextUtil.doubleToString(-p * 1e9), "-3e9"); - assertEquals(TextUtil.doubleToString(-p * 1e10), "-3e10"); + assertEquals(TextUtil.doubleToString(-p * 1.0e1), "-30"); + assertEquals(TextUtil.doubleToString(-p * 1.0e2), "-300"); + assertEquals(TextUtil.doubleToString(-p * 1.0e3), "-3000"); + assertEquals(TextUtil.doubleToString(-p * 1.0e4), "-3e4"); + assertEquals(TextUtil.doubleToString(-p * 1.0e5), "-3e5"); + assertEquals(TextUtil.doubleToString(-p * 1.0e6), "-3e6"); + assertEquals(TextUtil.doubleToString(-p * 1.0e7), "-3e7"); + assertEquals(TextUtil.doubleToString(-p * 1.0e8), "-3e8"); + assertEquals(TextUtil.doubleToString(-p * 1.0e9), "-3e9"); + assertEquals(TextUtil.doubleToString(-p * 1.0e10), "-3e10"); } diff --git a/core/src/test/java/info/openrocket/core/util/WorldCoordinateTest.java b/core/src/test/java/info/openrocket/core/util/WorldCoordinateTest.java index 6cb959313..a5c66df6e 100644 --- a/core/src/test/java/info/openrocket/core/util/WorldCoordinateTest.java +++ b/core/src/test/java/info/openrocket/core/util/WorldCoordinateTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; public class WorldCoordinateTest { - private static final double EPS = 1e-10; + private static final double EPS = 1.0e-10; @Test public void testConstructor() { diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/StyledLabel.java b/swing/src/main/java/info/openrocket/swing/gui/components/StyledLabel.java index c3ad7100d..72a5da414 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/StyledLabel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/StyledLabel.java @@ -40,11 +40,11 @@ public class StyledLabel extends JLabel { public StyledLabel() { - this("", SwingConstants.LEADING, 0f); + this("", SwingConstants.LEADING, 0.0f); } public StyledLabel(String text) { - this(text, SwingConstants.LEADING, 0f); + this(text, SwingConstants.LEADING, 0.0f); } public StyledLabel(float size) { @@ -68,11 +68,11 @@ public class StyledLabel extends JLabel { public StyledLabel(Style style) { - this("", SwingConstants.LEADING, 0f, style); + this("", SwingConstants.LEADING, 0.0f, style); } public StyledLabel(String text, Style style) { - this(text, SwingConstants.LEADING, 0f, style); + this(text, SwingConstants.LEADING, 0.0f, style); } public StyledLabel(float size, Style style) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/compass/CompassSelector.java b/swing/src/main/java/info/openrocket/swing/gui/components/compass/CompassSelector.java index 00cb6abbf..61a15502d 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/compass/CompassSelector.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/compass/CompassSelector.java @@ -62,7 +62,7 @@ public class CompassSelector extends CompassPointer { int y = e.getY() - mid; double distance = Math.hypot(x, y); - return distance < width / 2; + return distance < (double) width / 2; } private void clicked(MouseEvent e) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java index 9f6b12736..46c5b328f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java @@ -104,12 +104,12 @@ public class AppearancePanel extends JPanel implements Invalidatable, Invalidati Unit no_unit = new GeneralUnit(1, "", 2) { @Override public double getNextValue(double value) { - return value + .1; + return value + 0.1; } @Override public double getPreviousValue(double value) { - return value - .1; + return value - 0.1; } }; diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java index 94709ce45..35ab09b0a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java @@ -405,7 +405,7 @@ public abstract class FinSetConfig extends RocketComponentConfig { rings.sort(new Comparator<>() { @Override public int compare(CenteringRing centeringRing, CenteringRing centeringRing1) { - return (int) (1000d * (centeringRing.getAxialOffset(AxialMethod.TOP) - + return (int) (1000.0d * (centeringRing.getAxialOffset(AxialMethod.TOP) - centeringRing1.getAxialOffset(AxialMethod.TOP))); } }); @@ -431,7 +431,7 @@ public abstract class FinSetConfig extends RocketComponentConfig { } else if (top.bottomSidePositionFromTop() <= finPositionFromTop) { if (bottom == null) { //If the current ring is in the upper half of the root chord, make it the top ring - if (sortableRing.bottomSidePositionFromTop() < finPositionFromTop + finLength / 2d) { + if (sortableRing.bottomSidePositionFromTop() < finPositionFromTop + finLength / 2.0d) { top = sortableRing; } else { bottom = sortableRing; @@ -451,7 +451,7 @@ public abstract class FinSetConfig extends RocketComponentConfig { } } - double resultFinTabLength = 0d; + double resultFinTabLength = 0.0d; // Edge case where there are no centering rings or for some odd reason top and bottom are identical. if (top == null || top == bottom) { @@ -504,7 +504,7 @@ public abstract class FinSetConfig extends RocketComponentConfig { } } if (resultFinTabLength < 0) { - resultFinTabLength = 0d; + resultFinTabLength = 0.0d; } return resultFinTabLength; } diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/InnerTubeConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/InnerTubeConfig.java index b63e969bf..924de98d4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/InnerTubeConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/InnerTubeConfig.java @@ -573,9 +573,9 @@ class ClusterSelectionPanel extends JPanel { double x = points.get(i * 2); double y = points.get(i * 2 + 1); - double px = BUTTON_SIZE / 2 + x * MOTOR_DIAMETER; - double py = BUTTON_SIZE / 2 - y * MOTOR_DIAMETER; - circle.setFrameFromCenter(px, py, px + MOTOR_DIAMETER / 2, py + MOTOR_DIAMETER / 2); + double px = (double) (double) BUTTON_SIZE / 2 + x * MOTOR_DIAMETER; + double py = (double) BUTTON_SIZE / 2 - y * MOTOR_DIAMETER; + circle.setFrameFromCenter(px, py, px + (double) MOTOR_DIAMETER / 2, py + (double) MOTOR_DIAMETER / 2); g2.setColor(MOTOR_FILL_COLOR); g2.fill(circle); diff --git a/swing/src/main/java/info/openrocket/swing/gui/customexpression/OperatorSelector.java b/swing/src/main/java/info/openrocket/swing/gui/customexpression/OperatorSelector.java index e047686aa..73f41846a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/customexpression/OperatorSelector.java +++ b/swing/src/main/java/info/openrocket/swing/gui/customexpression/OperatorSelector.java @@ -60,8 +60,8 @@ public class OperatorSelector extends JDialog { table.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); int width = table.getColumnModel().getTotalColumnWidth(); - table.getColumnModel().getColumn(0).setPreferredWidth((int) (.1 * width)); - table.getColumnModel().getColumn(1).setPreferredWidth((int) (.9 * width)); + table.getColumnModel().getColumn(0).setPreferredWidth((int) (0.1 * width)); + table.getColumnModel().getColumn(1).setPreferredWidth((int) (0.9 * width)); table.setAutoCreateRowSorter(true); table.addMouseMotionListener(new MouseMotionAdapter() { diff --git a/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableSelector.java b/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableSelector.java index 3cf214d3a..6c12585ee 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableSelector.java +++ b/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableSelector.java @@ -63,9 +63,9 @@ public class VariableSelector extends JDialog { table.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); table.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); int width = table.getColumnModel().getTotalColumnWidth(); - table.getColumnModel().getColumn(0).setPreferredWidth( (int) (.7 * width)); - table.getColumnModel().getColumn(1).setPreferredWidth( (int) (.15 * width)); - table.getColumnModel().getColumn(2).setPreferredWidth( (int) (.15 * width)); + table.getColumnModel().getColumn(0).setPreferredWidth( (int) (0.7 * width)); + table.getColumnModel().getColumn(1).setPreferredWidth( (int) (0.15 * width)); + table.getColumnModel().getColumn(2).setPreferredWidth( (int) (0.15 * width)); table.setAutoCreateRowSorter(true); table.addMouseListener(new MouseListener(){ diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintDialog.java index ca7be9ee6..7986b6800 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintDialog.java @@ -71,7 +71,7 @@ public class PrintDialog extends JDialog implements TreeSelectionListener { private JButton saveAsPDF; private JButton cancel; - private double rotation = 0d; + private double rotation = 0.0d; private boolean updateSimulations = true; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index aad2657b8..e44baea03 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -340,7 +340,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec // Number of motors { - nrOfMotorsLabel = new StyledLabel(-2f, StyledLabel.Style.ITALIC); + nrOfMotorsLabel = new StyledLabel(-2.0f, StyledLabel.Style.ITALIC); nrOfMotorsLabel.setToolTipText(trans.get("TCMotorSelPan.lbl.ttip.nrOfMotors")); updateNrOfMotors(); nrOfMotorsLabel.setForeground(dimTextColor); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java index 42f68f0aa..e0c3ae511 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java @@ -184,9 +184,9 @@ public class OptimizationPlotDialog extends JDialog { } // Add lines to show optimization limits - XYLineAnnotation line = new XYLineAnnotation(x1, -1e19, x1, 1e19); + XYLineAnnotation line = new XYLineAnnotation(x1, -1.0e19, x1, 1.0e19); chart.getXYPlot().addAnnotation(line); - line = new XYLineAnnotation(x2, -1e19, x2, 1e19); + line = new XYLineAnnotation(x2, -1.0e19, x2, 1.0e19); chart.getXYPlot().addAnnotation(line); // Mark the optimum point diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java index c68009299..00cd43921 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java @@ -148,9 +148,9 @@ public class FigureRenderer extends RocketRenderer { out[1] = 1; out[2] = 0; } else { - out[0] = Math.max(0.2f, (float) color.getRed() / 255f) * 2; - out[1] = Math.max(0.2f, (float) color.getGreen() / 255f) * 2; - out[2] = Math.max(0.2f, (float) color.getBlue() / 255f) * 2; + out[0] = Math.max(0.2f, (float) color.getRed() / 255.0f) * 2; + out[1] = Math.max(0.2f, (float) color.getGreen() / 255.0f) * 2; + out[2] = Math.max(0.2f, (float) color.getBlue() / 255.0f) * 2; } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java index d68212e44..0ced6be7b 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RealisticRenderer.java @@ -237,10 +237,10 @@ public class RealisticRenderer extends RocketRenderer { out[2] = 0; out[3] = 1; } else { - out[0] = (float) color.getRed() / 255f; - out[1] = (float) color.getGreen() / 255f; - out[2] = (float) color.getBlue() / 255f; - out[3] = (float) color.getAlpha() / 255f; + out[0] = (float) color.getRed() / 255.0f; + out[1] = (float) color.getGreen() / 255.0f; + out[2] = (float) color.getBlue() / 255.0f; + out[3] = (float) color.getAlpha() / 255.0f; } } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java index c5e4fe2c0..731c68976 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java @@ -232,7 +232,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { g2d.setBackground(new Color(0, 0, 0, 0)); g2d.clearRect(0, 0, CARET_SIZE, CARET_SIZE); - new CGCaret(CARET_SIZE / 2, CARET_SIZE / 2).paint(g2d, 1.0); + new CGCaret((double) CARET_SIZE / 2, (double) CARET_SIZE / 2).paint(g2d, 1.0); g2d.dispose(); @@ -244,7 +244,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { g2d.setBackground(new Color(0, 0, 0, 0)); g2d.clearRect(0, 0, CARET_SIZE, CARET_SIZE); - new CPCaret(CARET_SIZE / 2, CARET_SIZE / 2).paint(g2d, 1.0); + new CPCaret((double) CARET_SIZE / 2, (double) CARET_SIZE / 2).paint(g2d, 1.0); g2d.dispose(); @@ -307,8 +307,8 @@ public class RocketFigure3d extends JPanel implements GLEventListener { GL2 gl = drawable.getGL().getGL2(); GLU glu = new GLU(); - gl.glClearColor(backgroundColor.getRed()/255f, backgroundColor.getGreen()/255f, - backgroundColor.getBlue()/255f, backgroundColor.getAlpha()/255f); + gl.glClearColor(backgroundColor.getRed()/ 255.0f, backgroundColor.getGreen()/ 255.0f, + backgroundColor.getBlue()/ 255.0f, backgroundColor.getAlpha()/ 255.0f); gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); setupView(gl, glu); @@ -336,8 +336,8 @@ public class RocketFigure3d extends JPanel implements GLEventListener { } pickPoint = null; - gl.glClearColor(backgroundColor.getRed()/255f, backgroundColor.getGreen()/255f, - backgroundColor.getBlue()/255f, backgroundColor.getAlpha()/255f); + gl.glClearColor(backgroundColor.getRed()/ 255.0f, backgroundColor.getGreen()/ 255.0f, + backgroundColor.getBlue()/ 255.0f, backgroundColor.getAlpha()/ 255.0f); gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); gl.glEnable(GL.GL_MULTISAMPLE); @@ -505,7 +505,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { gl.glViewport(0, 0, w, h); gl.glMatrixMode(GLMatrixFunc.GL_PROJECTION); gl.glLoadIdentity(); - glu.gluPerspective(fovY, ratio, 0.1f, 50f); + glu.gluPerspective(fovY, ratio, 0.1f, 50.0f); gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); redrawExtras = true; diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/ComponentRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/ComponentRenderer.java index b04a76396..e49cf4d3c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/ComponentRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/ComponentRenderer.java @@ -370,8 +370,8 @@ public class ComponentRenderer { gl.glMatrixMode(GL.GL_TEXTURE); gl.glPushMatrix(); - gl.glTranslated(0, .125, 0); - gl.glScaled(1, .75, 0); + gl.glTranslated(0, 0.125, 0); + gl.glScaled(1, 0.75, 0); glu.gluCylinder(q, r, r, l, LOD, 1); @@ -384,7 +384,7 @@ public class ComponentRenderer { gl.glBegin(GL.GL_TRIANGLE_STRIP); gl.glNormal3d(0, 0, 1); for (int i = 0; i < LOD + 1; i++) { - gl.glTexCoord2d(i * dt, .125); + gl.glTexCoord2d(i * dt, 0.125); gl.glVertex3d(r * Math.cos(da * i), r * Math.sin(da * i), 0); gl.glTexCoord2d(i * dt, 0); gl.glVertex3d(0, 0, 0); @@ -402,20 +402,20 @@ public class ComponentRenderer { gl.glBegin(GL.GL_TRIANGLE_STRIP); gl.glNormal3d(0, 0, -1); for (int i = 0; i < LOD + 1; i++) { - gl.glTexCoord2d(i * dt, .875); + gl.glTexCoord2d(i * dt, 0.875); gl.glVertex3d(r * Math.cos(da * i), r * Math.sin(da * i), 0); - gl.glTexCoord2d(i * dt, .9); - gl.glVertex3d(.8 * r * Math.cos(da * i), .8 * r * Math.sin(da * i), 0); + gl.glTexCoord2d(i * dt, 0.9); + gl.glVertex3d(0.8 * r * Math.cos(da * i), 0.8 * r * Math.sin(da * i), 0); } gl.glEnd(); gl.glBegin(GL.GL_TRIANGLE_STRIP); for (int i = 0; i < LOD + 1; i++) { gl.glNormal3d(-Math.cos(da * i), -Math.sin(da * i), -1); - gl.glTexCoord2d(i * dt, .9); - gl.glVertex3d(.8 * r * Math.cos(da * i), .8 * r * Math.sin(da * i), 0); + gl.glTexCoord2d(i * dt, 0.9); + gl.glVertex3d(0.8 * r * Math.cos(da * i), 0.8 * r * Math.sin(da * i), 0); gl.glTexCoord2d(i * dt, 1); - gl.glVertex3d(0, 0, l * .05); + gl.glVertex3d(0, 0, l * 0.05); } gl.glEnd(); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/TransitionRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/TransitionRenderer.java index da63bc1e7..6f883e352 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/TransitionRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/TransitionRenderer.java @@ -155,8 +155,8 @@ final class TransitionRenderer { gl.glBegin(GL2.GL_QUAD_STRIP); for (i = 0; i <= slices; i++) { if (i == slices) { - x = Math.sin(0.0f); - y = Math.cos(0.0f); + x = 0.0; + y = 1.0; } else { x = Math.sin((i * da)); y = Math.cos((i * da)); 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 0811beb3c..9aae351e6 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 @@ -267,7 +267,7 @@ public class PhotoPanel extends JPanel implements GLEventListener { if (p.isMotionBlurred()) { Bounds b = calculateBounds(); - float m = .6f; + float m = 0.6f; int c = 10; float d = (float) b.xSize / 25.0f; @@ -383,10 +383,10 @@ public class PhotoPanel extends JPanel implements GLEventListener { out[2] = 0; out[3] = 1; } else { - out[0] = (float) color.getRed() / 255f; - out[1] = (float) color.getGreen() / 255f; - out[2] = (float) color.getBlue() / 255f; - out[3] = (float) color.getAlpha() / 255f; + out[0] = (float) color.getRed() / 255.0f; + out[1] = (float) color.getGreen() / 255.0f; + out[2] = (float) color.getBlue() / 255.0f; + out[3] = (float) color.getAlpha() / 255.0f; } } @@ -454,7 +454,7 @@ public class PhotoPanel extends JPanel implements GLEventListener { gl.glMatrixMode(GLMatrixFunc.GL_PROJECTION); gl.glLoadIdentity(); - glu.gluPerspective(p.getFov() * (180.0 / Math.PI), ratio, 0.1f, 50f); + glu.gluPerspective(p.getFov() * (180.0 / Math.PI), ratio, 0.1f, 50.0f); gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); // Flip textures for LEFT handed coords @@ -521,9 +521,9 @@ public class PhotoPanel extends JPanel implements GLEventListener { Bounds b = calculateBounds(); gl.glLightf(GLLightingFunc.GL_LIGHT2, - GLLightingFunc.GL_QUADRATIC_ATTENUATION, 20f); + GLLightingFunc.GL_QUADRATIC_ATTENUATION, 20.0f); gl.glLightfv(GLLightingFunc.GL_LIGHT2, GLLightingFunc.GL_POSITION, - new float[] { (float) (b.xMax + .1f), 0, 0, 1 }, 0); + new float[] { (float) (b.xMax + 0.1f), 0, 0, 1 }, 0); gl.glEnable(GLLightingFunc.GL_LIGHT2); } else { gl.glDisable(GLLightingFunc.GL_LIGHT2); diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettings.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettings.java index d721debe8..32e54a4e5 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettings.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettings.java @@ -15,13 +15,13 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings private double viewAlt = -0.23; private double viewAz = 2.08; - private double viewDistance = .44; + private double viewDistance = 0.44; private double fov = 1.4; - private double lightAlt = .35; + private double lightAlt = 0.35; private double lightAz = -1; private ORColor sunlight = new ORColor(255, 255, 255); - private double ambiance = .3f; + private double ambiance = 0.3f; private ORColor skyColor = new ORColor(55, 95, 155); private double skyColorOpacity = 1.0; @@ -187,7 +187,7 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings public void setSkyColor(ORColor skyColor) { this.skyColor = skyColor; - this.skyColorOpacity = skyColor.getAlpha() / 255f; + this.skyColorOpacity = skyColor.getAlpha() / 255.0f; fireChangeEvent(); } @@ -226,7 +226,7 @@ public class PhotoSettings extends AbstractChangeSource implements FlameSettings } public double getSmokeOpacity() { - return smokeColor.getAlpha() / 255f; + return smokeColor.getAlpha() / 255.0f; } public void setSmokeOpacity(double smokeOpacity) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/exhaust/FlameRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/exhaust/FlameRenderer.java index 12c439054..ad4d91616 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/exhaust/FlameRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/exhaust/FlameRenderer.java @@ -167,7 +167,7 @@ public final class FlameRenderer { } public static void drawExhaust(GL2 gl, FlameSettings fs, Motor motor) { - final float s = (float) Math.max(.5, Math.sqrt(motor.getAverageThrustEstimate()) / 4.0) + final float s = (float) Math.max(0.5, Math.sqrt(motor.getAverageThrustEstimate()) / 4.0) * (float) fs.getExhaustScale(); gl.glScalef(s, s, s); @@ -187,7 +187,7 @@ public final class FlameRenderer { if (fs.isSmoke()) { final float LEN = 10; - final float MAX_R = .15f; + final float MAX_R = 0.15f; final int P = 5; final Func radius = new Func() { @@ -218,7 +218,7 @@ public final class FlameRenderer { setUniform1i(gl, shaderprogram, "uNormal", 1); trail(gl, radius, dZ, // - new Const(0.025f * (fs.getSmokeColor().getAlpha() / 255f)), // + new Const(0.025f * (fs.getSmokeColor().getAlpha() / 255.0f)), // LEN, P, fs.getSmokeColor(), s); gl.glUseProgram(0); @@ -241,7 +241,7 @@ public final class FlameRenderer { public float f(double z) { z = z / FLEN; z = 1 - z; - return (float) (z * z - z * z * z) * .06f; + return (float) (z * z - z * z * z) * 0.06f; } }; @@ -276,9 +276,9 @@ public final class FlameRenderer { out[1] = 1; out[2] = 0; } else { - out[0] = (float) color.getRed() / 255f; - out[1] = (float) color.getGreen() / 255f; - out[2] = (float) color.getBlue() / 255f; + out[0] = (float) color.getRed() / 255.0f; + out[1] = (float) color.getGreen() / 255.0f; + out[2] = (float) color.getBlue() / 255.0f; } } @@ -446,7 +446,7 @@ public final class FlameRenderer { gl.glLoadMatrixd(mvmatrix, 0); // Add a random rotation to prevent artifacts from texture. - gl.glRotatef(r.nextFloat() * 45f, 0, 0, 1); + gl.glRotatef(r.nextFloat() * 45.0f, 0, 0, 1); gl.glBegin(GL.GL_TRIANGLE_FAN); float d = radius.f(z) * scale * 2; @@ -493,7 +493,7 @@ public final class FlameRenderer { float[] c2 = new float[4]; convertColor(fs.getFlameColor(), c); for (int i = 0; i < 3; i++) { - c[i] = c2[i] = c[i] * .2f + .8f; + c[i] = c2[i] = c[i] * 0.2f + 0.8f; } c[3] = 1; c2[3] = 1; diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/sky/SkySphere.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/sky/SkySphere.java index 2dc0b064d..65fbb0cf5 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/sky/SkySphere.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/sky/SkySphere.java @@ -32,7 +32,7 @@ public class SkySphere extends Sky { GLUquadric q = glu.gluNewQuadric(); glu.gluQuadricTexture(q, true); glu.gluQuadricOrientation(q, GLU.GLU_OUTSIDE); - glu.gluSphere(q, 1f, 20, 20); + glu.gluSphere(q, 1.0f, 20, 20); sky.disable(gl); gl.glPopMatrix(); gl.glCullFace(GL.GL_BACK); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/SimulationPanel.java b/swing/src/main/java/info/openrocket/swing/gui/main/SimulationPanel.java index 6686b1eb6..7a802870f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/SimulationPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/SimulationPanel.java @@ -1365,7 +1365,7 @@ public class SimulationPanel extends JPanel { // Initialize the label if (label == null) { - label = new StatusLabel(simulation, 2f); + label = new StatusLabel(simulation, 2.0f); label.setIconTextGap(1); // label.setFont(label.getFont().deriveFont(Font.BOLD)); } else { 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 d01ce94ff..10d49c71d 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 @@ -115,7 +115,7 @@ public class DesignReport { /** * The figure rotation. */ - private double rotation = 0d; + private double rotation = 0.0d; /** * Determines whether or not to run out of date simulations. @@ -490,7 +490,7 @@ public class DesignReport { PdfPCell c = new PdfPCell(motorTable); c.setBorder(PdfPCell.LEFT); - c.setBorderWidthTop(0f); + c.setBorderWidthTop(0.0f); parent.addCell(c); } @@ -522,13 +522,13 @@ public class DesignReport { final Paragraph chunk = ITextHelper.createParagraph(stripBrackets( descriptor.format(theRocket, motorId)), PrintUtilities.BOLD); chunk.setLeading(leading); - chunk.setSpacingAfter(3f); + chunk.setSpacingAfter(3.0f); document.add(chunk); final PdfPCell cell = ITextHelper.createCell(ALTITUDE, 2, 2); cell.setUseBorderPadding(false); - cell.setBorderWidthTop(0f); + cell.setBorderWidthTop(0.0f); labelTable.addCell(cell); labelTable.addCell(ITextHelper.createCell(distanceUnit.toStringUnit(flight.getMaxAltitude()), 2, 2)); diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java b/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java index 9adccf7aa..f837b801b 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java @@ -63,7 +63,7 @@ public class FinMarkingGuide extends JPanel { /** * The default guide width in inches. */ - public final static double DEFAULT_GUIDE_WIDTH = 3d; + public final static double DEFAULT_GUIDE_WIDTH = 3.0d; /** * 2 PI radians (represents a circle). diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableTransition.java b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableTransition.java index 7d60ab0ac..fcd3b1677 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableTransition.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableTransition.java @@ -95,7 +95,7 @@ public class PrintableTransition extends AbstractPrintable { double tmp = Math.sqrt(v * v + len * len); double factor = tmp / v; - theta = (float) (360d * v / tmp); + theta = (float) (360.0d * v / tmp); int r1InPoints = (int) PrintUnit.METERS.toPoints(r1 * factor); int r2InPoints = (int) PrintUnit.METERS.toPoints(r2 * factor); diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/components/Rule.java b/swing/src/main/java/info/openrocket/swing/gui/print/components/Rule.java index c07409871..5aca3d943 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/components/Rule.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/components/Rule.java @@ -57,7 +57,7 @@ public class Rule extends PrintableComponent { if (orientation == Orientation.TOP) { Font f = g.getFont(); - g.setFont(f.deriveFont(f.getSize() - 2f)); + g.setFont(f.deriveFont(f.getSize() - 2.0f)); g.drawString("in cm", x - MAJOR_TICK_LENGTH, y + width + 20); g.drawString("in", x + width + 4, y + 4); g.drawString("cm", x + width + 4, y + 18); @@ -71,7 +71,7 @@ public class Rule extends PrintableComponent { } else { Font f = g.getFont(); - g.setFont(f.deriveFont(f.getSize() - 2f)); + g.setFont(f.deriveFont(f.getSize() - 2.0f)); g.drawString("in cm", x - MAJOR_TICK_LENGTH, y); g.drawString("cm", x + width + 6, y + width + 4); g.drawString("in", x + width + 6, y + width + 18); diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/Dimension.java b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/Dimension.java index 3dc05e483..4aac58f8c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/Dimension.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/Dimension.java @@ -15,7 +15,7 @@ public class Dimension { /** * Breadth, in points. */ - public float breadth = 0f; + public float breadth = 0.0f; /** * Constructor. 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 6125ecccc..c8b2b39ba 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 @@ -288,7 +288,7 @@ public class PartsDetailVisitorStrategy { ShockCord ring = (ShockCord) component; PdfPCell cell = ITextHelper.createCell(); cell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE); - cell.setPaddingBottom(12f); + cell.setPaddingBottom(12.0f); grid.addCell(iconToImage(component)); grid.addCell(createNameCell(component.getName(), true, component.getPresetComponent())); grid.addCell(createMaterialCell(ring.getMaterial())); @@ -300,7 +300,7 @@ public class PartsDetailVisitorStrategy { Parachute chute = (Parachute) component; PdfPCell cell = ITextHelper.createCell(); cell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE); - cell.setPaddingBottom(12f); + cell.setPaddingBottom(12.0f); grid.addCell(iconToImage(component)); grid.addCell(createNameCell(component.getName(), true, component.getPresetComponent())); grid.addCell(createMaterialCell(chute.getMaterial())); @@ -324,7 +324,7 @@ public class PartsDetailVisitorStrategy { Streamer ring = (Streamer) component; PdfPCell cell = ITextHelper.createCell(); cell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE); - cell.setPaddingBottom(12f); + cell.setPaddingBottom(12.0f); grid.addCell(iconToImage(component)); grid.addCell(createNameCell(component.getName(), true, component.getPresetComponent())); grid.addCell(createMaterialCell(ring.getMaterial())); @@ -336,7 +336,7 @@ public class PartsDetailVisitorStrategy { RecoveryDevice device = (RecoveryDevice) component; PdfPCell cell = ITextHelper.createCell(); cell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE); - cell.setPaddingBottom(12f); + cell.setPaddingBottom(12.0f); grid.addCell(iconToImage(component)); grid.addCell(createNameCell(component.getName(), true, component.getPresetComponent())); grid.addCell(createMaterialCell(device.getMaterial())); @@ -347,12 +347,12 @@ public class PartsDetailVisitorStrategy { else if (component instanceof MassObject) { PdfPCell cell = ITextHelper.createCell(); cell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE); - cell.setPaddingBottom(12f); + cell.setPaddingBottom(12.0f); grid.addCell(iconToImage(component)); final PdfPCell nameCell = createNameCell(component.getName(), true, component.getPresetComponent()); nameCell.setVerticalAlignment(PdfPCell.ALIGN_MIDDLE); - nameCell.setPaddingBottom(12f); + nameCell.setPaddingBottom(12.0f); grid.addCell(nameCell); grid.addCell(cell); grid.addCell(createDiaCell(((MassObject) component).getRadius() * 2)); @@ -386,7 +386,7 @@ public class PartsDetailVisitorStrategy { private PdfPCell createDiaCell (final double diameter) { PdfPCell result = new PdfPCell(); Phrase p = new Phrase(); - p.setLeading(12f); + p.setLeading(12.0f); result.setVerticalAlignment(Element.ALIGN_TOP); result.setBorder(Rectangle.BOTTOM); Chunk c = new Chunk(); @@ -416,7 +416,7 @@ public class PartsDetailVisitorStrategy { private PdfPCell createStrip (final Streamer component) { PdfPCell result = new PdfPCell(); Phrase p = new Phrase(); - p.setLeading(12f); + p.setLeading(12.0f); result.setVerticalAlignment(Element.ALIGN_TOP); result.setBorder(Rectangle.BOTTOM); Chunk c = new Chunk(); @@ -431,7 +431,7 @@ public class PartsDetailVisitorStrategy { result.addElement(p); Phrase pw = new Phrase(); - pw.setLeading(14f); + pw.setLeading(14.0f); c = new Chunk(); c.setFont(PrintUtilities.NORMAL); c.append(WIDTH); @@ -482,7 +482,7 @@ public class PartsDetailVisitorStrategy { PdfPCell result = new PdfPCell(); Phrase p = new Phrase(); - p.setLeading(12f); + p.setLeading(12.0f); result.setVerticalAlignment(Element.ALIGN_TOP); result.setBorder(Rectangle.BOTTOM); Chunk c = new Chunk(); @@ -513,7 +513,7 @@ public class PartsDetailVisitorStrategy { */ private void createInnerDiaCell (final double innerRadius, PdfPCell cell, final String innerLabel) { Phrase p = new Phrase(); - p.setLeading(14f); + p.setLeading(14.0f); Chunk c = new Chunk(); c.setFont(PrintUtilities.NORMAL); c.append(DIAMETER); @@ -622,7 +622,7 @@ public class PartsDetailVisitorStrategy { result.setColspan(2); result.setBorder(Rectangle.BOTTOM); Paragraph para = new Paragraph(); - para.setLeading(12f, 0); + para.setLeading(12.0f, 0); Chunk c = new Chunk(); c.setFont(PrintUtilities.NORMAL); Chunk tab1 = @@ -660,7 +660,7 @@ public class PartsDetailVisitorStrategy { */ protected PdfPCell createMaterialCell (Material material) { PdfPCell cell = ITextHelper.createCell(); - cell.setLeading(13f, 0); + cell.setLeading(13.0f, 0); Chunk c = new Chunk(); c.setFont(PrintUtilities.NORMAL); 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 2e3563ac7..abb69aa34 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 @@ -212,7 +212,7 @@ public class SimulationPlotPanel extends JPanel { this.add(domainUnitSelector, "width 40lp, gapright para"); //// The data will be plotted in time order even if the X axis type is not time. - simPlotPanelDesc = new DescriptionArea("", 2, -2f, false); + simPlotPanelDesc = new DescriptionArea("", 2, -2.0f, false); simPlotPanelDesc.setVisible(false); simPlotPanelDesc.setForeground(darkErrorColor); simPlotPanelDesc.setViewportBorder(BorderFactory.createEmptyBorder()); diff --git a/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java b/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java index 5be4f6a45..e94ba1e35 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java +++ b/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java @@ -456,14 +456,14 @@ public class UITheme { @Override public Border getUnitSelectorBorder() { return new CompoundBorder( - new LineBorder(new Color(0f, 0f, 0f, 0.08f), 1), + new LineBorder(new Color(0.0f, 0.0f, 0.0f, 0.08f), 1), new EmptyBorder(1, 1, 1, 1)); } @Override public Border getUnitSelectorFocusBorder() { return new CompoundBorder( - new LineBorder(new Color(0f, 0f, 0f, 0.6f)), + new LineBorder(new Color(0.0f, 0.0f, 0.0f, 0.6f)), new EmptyBorder(1, 1, 1, 1)); } @@ -857,14 +857,14 @@ public class UITheme { @Override public Border getUnitSelectorBorder() { return new CompoundBorder( - new LineBorder(new Color(1f, 1f, 1f, 0.08f), 1), + new LineBorder(new Color(1.0f, 1.0f, 1.0f, 0.08f), 1), new EmptyBorder(1, 1, 1, 1)); } @Override public Border getUnitSelectorFocusBorder() { return new CompoundBorder( - new LineBorder(new Color(1f, 1f, 1f, 0.6f)), + new LineBorder(new Color(1.0f, 1.0f, 1.0f, 0.6f)), new EmptyBorder(1, 1, 1, 1)); } @@ -1258,7 +1258,7 @@ public class UITheme { @Override public Border getUnitSelectorBorder() { return new CompoundBorder( - new LineBorder(new Color(.9f, 0.9f, 0.9f, 0.15f), 1), + new LineBorder(new Color(0.9f, 0.9f, 0.9f, 0.15f), 1), new EmptyBorder(1, 1, 1, 1)); } @@ -1851,35 +1851,35 @@ public class UITheme { private static void setGlobalFontSize(int size) { // Some fonts have different sizes for different components, so we need to adjust them final Map fontOffsets = new HashMap<>(); - fontOffsets.put("MenuBar.font", 1f); - fontOffsets.put("Tree.font", -1f); - fontOffsets.put("Slider.font", -2f); - fontOffsets.put("TableHeader.font", -1f); - fontOffsets.put("ColorChooser.font", -1f); - fontOffsets.put("Menu.acceleratorFont", 1f); - fontOffsets.put("InternalFrame.optionDialogTitleFont", 1f); - fontOffsets.put("InternalFrame.paletteTitleFont", 1f); - fontOffsets.put("MenuItem.font", 1f); - fontOffsets.put("PopupMenu.font", 1f); - fontOffsets.put("MenuItem.acceleratorFont", 1f); - fontOffsets.put("RadioButtonMenuItem.font", 1f); - fontOffsets.put("Table.font", -1f); + fontOffsets.put("MenuBar.font", 1.0f); + fontOffsets.put("Tree.font", -1.0f); + fontOffsets.put("Slider.font", -2.0f); + fontOffsets.put("TableHeader.font", -1.0f); + fontOffsets.put("ColorChooser.font", -1.0f); + fontOffsets.put("Menu.acceleratorFont", 1.0f); + fontOffsets.put("InternalFrame.optionDialogTitleFont", 1.0f); + fontOffsets.put("InternalFrame.paletteTitleFont", 1.0f); + fontOffsets.put("MenuItem.font", 1.0f); + fontOffsets.put("PopupMenu.font", 1.0f); + fontOffsets.put("MenuItem.acceleratorFont", 1.0f); + fontOffsets.put("RadioButtonMenuItem.font", 1.0f); + fontOffsets.put("Table.font", -1.0f); //fontOffsets.put("IconButton.font", -2f); // The default doesn't really look nice, we want the normal font size instead - fontOffsets.put("InternalFrame.titleFont", 1f); - fontOffsets.put("List.font", -1f); - fontOffsets.put("RadioButtonMenuItem.acceleratorFont", 1f); - fontOffsets.put("CheckBoxMenuItem.acceleratorFont", 1f); - fontOffsets.put("Menu.font", 1f); - fontOffsets.put("TabbedPane.smallFont", -2f); - fontOffsets.put("CheckBoxMenuItem.font", 1f); - fontOffsets.put("ToolTip.font", -2f); + fontOffsets.put("InternalFrame.titleFont", 1.0f); + fontOffsets.put("List.font", -1.0f); + fontOffsets.put("RadioButtonMenuItem.acceleratorFont", 1.0f); + fontOffsets.put("CheckBoxMenuItem.acceleratorFont", 1.0f); + fontOffsets.put("Menu.font", 1.0f); + fontOffsets.put("TabbedPane.smallFont", -2.0f); + fontOffsets.put("CheckBoxMenuItem.font", 1.0f); + fontOffsets.put("ToolTip.font", -2.0f); // Iterate over all keys in the UIManager defaults and set the font for (Enumeration keys = UIManager.getDefaults().keys(); keys.hasMoreElements();) { Object key = keys.nextElement(); Object value = UIManager.get(key); if (value instanceof Font newFont) { - float offset = fontOffsets.getOrDefault(key.toString(), 0f); + float offset = fontOffsets.getOrDefault(key.toString(), 0.0f); newFont = newFont.deriveFont(Integer.valueOf(size).floatValue() + offset); UIManager.put(key, newFont); } diff --git a/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java b/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java index d98cf7cc9..31164804d 100644 --- a/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java +++ b/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java @@ -41,15 +41,15 @@ public class FinSetConfigTest extends BaseTestCase { */ @Test public void testComputeFinTabLength() throws Exception { - DoubleModel dm = new DoubleModel(1d); + DoubleModel dm = new DoubleModel(1.0d); List rings = new ArrayList<>(); RocketComponent parent = new BodyTube(); - Double result = (Double)method.invoke(null, rings, 10d, 11d, dm, parent); - Assertions.assertEquals(0.0001, 11d, result.doubleValue()); - result = (Double)method.invoke(null, null, 10d, 11d, dm, parent); - Assertions.assertEquals(11d, result.doubleValue(), 0.0001); + Double result = (Double)method.invoke(null, rings, 10.0d, 11.0d, dm, parent); + Assertions.assertEquals(0.0001, 11.0d, result.doubleValue()); + result = (Double)method.invoke(null, null, 10.0d, 11.0d, dm, parent); + Assertions.assertEquals(11.0d, result.doubleValue(), 0.0001); } /** @@ -57,7 +57,7 @@ public class FinSetConfigTest extends BaseTestCase { */ @Test public void testCompute2LeadingRings() throws Exception { - DoubleModel dm = new DoubleModel(1d); + DoubleModel dm = new DoubleModel(1.0d); List rings = new ArrayList<>(); RocketComponent parent = new BodyTube(); @@ -84,7 +84,7 @@ public class FinSetConfigTest extends BaseTestCase { */ @Test public void testCompute1Ring() throws Exception { - DoubleModel dm = new DoubleModel(1d); + DoubleModel dm = new DoubleModel(1.0d); List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); @@ -105,7 +105,7 @@ public class FinSetConfigTest extends BaseTestCase { */ @Test public void testComputeOneLeadingOneRingWithinRoot() throws Exception { - DoubleModel dm = new DoubleModel(1d); + DoubleModel dm = new DoubleModel(1.0d); List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); @@ -119,7 +119,7 @@ public class FinSetConfigTest extends BaseTestCase { rings.add(ring1); rings.add(ring2); - RocketComponent parent = new BodyTube(1d, 0.01); + RocketComponent parent = new BodyTube(1.0d, 0.01); parent.addChild(ring1); parent.addChild(ring2); @@ -132,7 +132,7 @@ public class FinSetConfigTest extends BaseTestCase { */ @Test public void testComputeOneLeadingOneTrailingRing() throws Exception { - DoubleModel dm = new DoubleModel(1d); + DoubleModel dm = new DoubleModel(1.0d); List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); @@ -157,7 +157,7 @@ public class FinSetConfigTest extends BaseTestCase { */ @Test public void testComputeOneWithinRootOneTrailingRing() throws Exception { - DoubleModel dm = new DoubleModel(1d); + DoubleModel dm = new DoubleModel(1.0d); List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); @@ -182,7 +182,7 @@ public class FinSetConfigTest extends BaseTestCase { */ @Test public void testBothRingsWithinRootChord() throws Exception { - DoubleModel dm = new DoubleModel(1d); + DoubleModel dm = new DoubleModel(1.0d); List rings = new ArrayList<>(); RocketComponent parent = new BodyTube(1.0000d, 0.1d); @@ -209,7 +209,7 @@ public class FinSetConfigTest extends BaseTestCase { */ @Test public void testBothRingsBeyondRootChord() throws Exception { - DoubleModel dm = new DoubleModel(1d); + DoubleModel dm = new DoubleModel(1.0d); List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); @@ -235,7 +235,7 @@ public class FinSetConfigTest extends BaseTestCase { */ @Test public void test3RingsWithinRootChord() throws Exception { - DoubleModel dm = new DoubleModel(1d); + DoubleModel dm = new DoubleModel(1.0d); List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); From 7d2c3c06767ec55968b105b82eaa149a00f6e36f Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:44:46 +0200 Subject: [PATCH 21/25] Use String equals --- .../core/database/motor/ThrustCurveMotorSetDatabase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java b/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java index 427cd3825..5dd9618d4 100644 --- a/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java +++ b/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java @@ -39,7 +39,7 @@ public class ThrustCurveMotorSetDatabase implements MotorDatabase { // unlike the description, digest must be present in search criteria to get a // match - if (digest == null || digest != m.getDigest()) + if (digest == null || !digest.equals(m.getDigest())) matchDigest = false; // match description From b5d9343ff0540c3c18103c3899c82044130653cb Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:47:07 +0200 Subject: [PATCH 22/25] Add missing Test annotations --- .../test/java/info/openrocket/core/motor/ManufacturerTest.java | 1 + .../rocketoptimization/modifiers/TestGenericModifier.java | 1 + core/src/test/java/info/openrocket/core/util/TestMutex.java | 1 + 3 files changed, 3 insertions(+) diff --git a/core/src/test/java/info/openrocket/core/motor/ManufacturerTest.java b/core/src/test/java/info/openrocket/core/motor/ManufacturerTest.java index 956f98676..89df74542 100644 --- a/core/src/test/java/info/openrocket/core/motor/ManufacturerTest.java +++ b/core/src/test/java/info/openrocket/core/motor/ManufacturerTest.java @@ -24,6 +24,7 @@ public class ManufacturerTest { } + @Test public void testContrail() { Manufacturer c1, c2; diff --git a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java index 3c8a951d2..e0b14faa7 100644 --- a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java +++ b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java @@ -78,6 +78,7 @@ public class TestGenericModifier extends BaseTestCase { assertEquals(4.0, value.d, EPSILON); } + @Test public void testSingularRange() throws OptimizationException { gm.setMinValue(1.0); gm.setMaxValue(1.0); diff --git a/core/src/test/java/info/openrocket/core/util/TestMutex.java b/core/src/test/java/info/openrocket/core/util/TestMutex.java index ba1a16eb2..924a433b1 100644 --- a/core/src/test/java/info/openrocket/core/util/TestMutex.java +++ b/core/src/test/java/info/openrocket/core/util/TestMutex.java @@ -207,6 +207,7 @@ public class TestMutex { } } + @Test public void testBogusMutex() { SafetyMutex m = new SafetyMutex.BogusSafetyMutex(); m.lock("foo"); From d311ee6cc05c8460303ec26ef9d884fb2e416e35 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:48:06 +0200 Subject: [PATCH 23/25] Use assertSame --- .../rocksim/importt/RockSimLoaderTest.java | 50 +++++++++---------- .../FlightConfigurationTest.java | 22 ++++---- 2 files changed, 36 insertions(+), 36 deletions(-) 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 ebc0defad..27240f5a0 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 @@ -99,8 +99,8 @@ public class RockSimLoaderTest extends BaseTestCase { RocketComponent transition1 = stage1.getChild(0); RocketComponent transition2 = stage1.getChild(1); - assertEquals(Transition.class, transition1.getClass(), " Component should have been transition"); - assertEquals(Transition.class, transition2.getClass(), " Component should have been transition"); + assertSame(Transition.class, transition1.getClass(), " Component should have been transition"); + assertSame(Transition.class, transition2.getClass(), " Component should have been transition"); assertEquals(transition1.getName(), "Transition 1"); assertEquals(transition2.getName(), "Transition 2"); assertEquals(1, transition1.getChildCount()); @@ -124,8 +124,8 @@ public class RockSimLoaderTest extends BaseTestCase { RocketComponent finSet1 = transition1.getChild(0); RocketComponent finSet2 = transition2.getChild(0); - assertEquals(FreeformFinSet.class, finSet1.getClass(), " Component should have been free form fin set"); - assertEquals(FreeformFinSet.class, finSet2.getClass(), " Component should have been free form fin set"); + assertSame(FreeformFinSet.class, finSet1.getClass(), " Component should have been free form fin set"); + assertSame(FreeformFinSet.class, finSet2.getClass(), " Component should have been free form fin set"); assertEquals(finSet1.getName(), "Fin set 1"); assertEquals(finSet2.getName(), "Fin set 2"); @@ -247,18 +247,18 @@ public class RockSimLoaderTest extends BaseTestCase { assertEquals(2, nc.getChildCount()); assertEquals(nc.getChild(0).getName(), "Clay"); RocketComponent it = nc.getChild(1); - assertEquals(InnerTube.class, it.getClass()); + assertSame(InnerTube.class, it.getClass()); assertEquals(it.getName(), "Attachment Rod"); assertEquals(3, it.getChildCount()); RocketComponent c = it.getChild(0); - assertEquals(CenteringRing.class, c.getClass()); + assertSame(CenteringRing.class, c.getClass()); assertEquals(c.getName(), "Plate"); c = it.getChild(1); - assertEquals(CenteringRing.class, c.getClass()); + assertSame(CenteringRing.class, c.getClass()); assertEquals(c.getName(), "Sleeve "); c = it.getChild(2); - assertEquals(Parachute.class, c.getClass()); + assertSame(Parachute.class, c.getClass()); assertEquals(c.getName(), "Nose Cone Parachute"); BodyTube bt1 = (BodyTube) stage1.getChild(1); @@ -266,7 +266,7 @@ public class RockSimLoaderTest extends BaseTestCase { assertEquals(bt1.getChild(0).getName(), "Centering ring"); assertEquals(bt1.getChild(1).getName(), "Centering ring"); c = bt1.getChild(2); - assertEquals(InnerTube.class, c.getClass()); + assertSame(InnerTube.class, c.getClass()); assertEquals(c.getName(), "Body tube"); assertEquals(bt1.getChild(3).getName(), "Launch lug"); assertEquals(bt1.getChild(4).getName(), "Pod"); @@ -274,7 +274,7 @@ public class RockSimLoaderTest extends BaseTestCase { ParallelStage pod = (ParallelStage) bt1.getChild(4); assertEquals(1, pod.getChildCount()); c = pod.getChild(0); - assertEquals(BodyTube.class, c.getClass()); + assertSame(BodyTube.class, c.getClass()); assertEquals(pod.getChild(0).getName(), "Body tube"); assertEquals(1, stage2.getChildCount()); @@ -436,56 +436,56 @@ public class RockSimLoaderTest extends BaseTestCase { RocketComponent noseCone1 = stage1.getChild(0); RocketComponent bodyTube1 = stage1.getChild(1); RocketComponent transition1 = stage1.getChild(2); - assertEquals(NoseCone.class, noseCone1.getClass()); - assertEquals(BodyTube.class, bodyTube1.getClass()); - assertEquals(Transition.class, transition1.getClass()); + assertSame(NoseCone.class, noseCone1.getClass()); + assertSame(BodyTube.class, bodyTube1.getClass()); + assertSame(Transition.class, transition1.getClass()); assertEquals("Nose cone 1", noseCone1.getName()); assertEquals("Body tube 1", bodyTube1.getName()); assertEquals("Transition 1", transition1.getName()); assertEquals(1, noseCone1.getChildCount()); RocketComponent component = noseCone1.getChild(0); - assertEquals(MassComponent.class, component.getClass()); + assertSame(MassComponent.class, component.getClass()); assertEquals("Mass object 1", component.getName()); assertEquals(2, bodyTube1.getChildCount()); RocketComponent pod2 = bodyTube1.getChild(0); - assertEquals(ParallelStage.class, pod2.getClass()); + assertSame(ParallelStage.class, pod2.getClass()); assertEquals("Pod 2", pod2.getName()); component = bodyTube1.getChild(1); - assertEquals(Bulkhead.class, component.getClass()); + assertSame(Bulkhead.class, component.getClass()); assertEquals("Bulkhead 1", component.getName()); assertEquals(3, pod2.getChildCount()); RocketComponent noseCone2 = pod2.getChild(0); - assertEquals(NoseCone.class, noseCone2.getClass()); + assertSame(NoseCone.class, noseCone2.getClass()); assertEquals("Nose cone 2", noseCone2.getName()); RocketComponent bodyTube2 = pod2.getChild(1); - assertEquals(BodyTube.class, bodyTube2.getClass()); + assertSame(BodyTube.class, bodyTube2.getClass()); assertEquals("Body tube 2", bodyTube2.getName()); component = pod2.getChild(2); - assertEquals(Transition.class, component.getClass()); + assertSame(Transition.class, component.getClass()); assertEquals("Transition 2", component.getName()); assertEquals(1, noseCone2.getChildCount()); component = noseCone2.getChild(0); - assertEquals(MassComponent.class, component.getClass()); + assertSame(MassComponent.class, component.getClass()); assertEquals("Mass object 2", component.getName()); assertEquals(3, bodyTube2.getChildCount()); component = bodyTube2.getChild(0); - assertEquals(TrapezoidFinSet.class, component.getClass()); + assertSame(TrapezoidFinSet.class, component.getClass()); assertEquals("Fin set 2", component.getName()); RocketComponent pod3 = bodyTube2.getChild(1); - assertEquals(ParallelStage.class, pod3.getClass()); + assertSame(ParallelStage.class, pod3.getClass()); assertEquals("Pod 3", pod3.getName()); component = bodyTube2.getChild(2); - assertEquals(LaunchLug.class, component.getClass()); + assertSame(LaunchLug.class, component.getClass()); assertEquals("Launch lug 1", component.getName()); assertEquals(1, pod3.getChildCount()); component = pod3.getChild(0); - assertEquals(BodyTube.class, component.getClass()); + assertSame(BodyTube.class, component.getClass()); assertEquals("Body tube 3", component.getName()); assertEquals(0.04, pod3.getAxialOffset(), MathUtil.EPSILON); assertEquals(1.76043, pod3.getAngleOffset(), 0.0001); @@ -493,7 +493,7 @@ public class RockSimLoaderTest extends BaseTestCase { assertEquals(1, transition1.getChildCount()); component = transition1.getChild(0); - assertEquals(MassComponent.class, component.getClass()); + assertSame(MassComponent.class, component.getClass()); assertEquals("Mass object 3", component.getName()); } diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/FlightConfigurationTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/FlightConfigurationTest.java index a7ae74c83..24613d647 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/FlightConfigurationTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/FlightConfigurationTest.java @@ -379,7 +379,7 @@ public class FlightConfigurationTest extends BaseTestCase { { // Core Stage final List coreStageContextList = instances.getInstanceContexts(coreStage); final InstanceContext coreStageContext = coreStageContextList.get(0); - assertEquals(coreStageContext.component.getClass(), AxialStage.class); + assertSame(coreStageContext.component.getClass(), AxialStage.class); assertEquals(coreStageContext.component.getID(), rocket.getChild(1).getID()); assertEquals(coreStageContext.component.getInstanceCount(), 1); @@ -396,7 +396,7 @@ public class FlightConfigurationTest extends BaseTestCase { final ParallelStage boosterStage = (ParallelStage) coreStage.getChild(0).getChild(0); final List boosterStageContextList = instances.getInstanceContexts(boosterStage); final InstanceContext boosterStage0Context = boosterStageContextList.get(0); - assertEquals(boosterStage0Context.component.getClass(), ParallelStage.class); + assertSame(boosterStage0Context.component.getClass(), ParallelStage.class); assertEquals(boosterStage0Context.component.getID(), boosterStage.getID()); assertEquals(boosterStage0Context.instanceNumber, 0); { @@ -407,7 +407,7 @@ public class FlightConfigurationTest extends BaseTestCase { } final InstanceContext boosterStage1Context = boosterStageContextList.get(1); - assertEquals(boosterStage1Context.component.getClass(), ParallelStage.class); + assertSame(boosterStage1Context.component.getClass(), ParallelStage.class); assertEquals(boosterStage1Context.component.getID(), boosterStage.getID()); assertEquals(boosterStage1Context.instanceNumber, 1); { @@ -427,7 +427,7 @@ public class FlightConfigurationTest extends BaseTestCase { // this is the instance number per-parent assertEquals(boosterBodyContext.instanceNumber, 0); - assertEquals(boosterBodyContext.component.getClass(), BodyTube.class); + assertSame(boosterBodyContext.component.getClass(), BodyTube.class); final Coordinate bodyTubeLocation = boosterBodyContext.getLocation(); assertEquals(bodyTubeLocation.x, 0.564, EPSILON); @@ -440,7 +440,7 @@ public class FlightConfigurationTest extends BaseTestCase { assertEquals(8, mmtContextList.size()); final InstanceContext motorTubeContext0 = mmtContextList.get(4); - assertEquals(motorTubeContext0.component.getClass(), InnerTube.class); + assertSame(motorTubeContext0.component.getClass(), InnerTube.class); assertEquals(motorTubeContext0.instanceNumber, 0); final Coordinate motorTube0Location = motorTubeContext0.getLocation(); assertEquals(motorTube0Location.x, 1.214, EPSILON); @@ -448,7 +448,7 @@ public class FlightConfigurationTest extends BaseTestCase { assertEquals(motorTube0Location.z, -0.015, EPSILON); final InstanceContext motorTubeContext1 = mmtContextList.get(5); - assertEquals(motorTubeContext1.component.getClass(), InnerTube.class); + assertSame(motorTubeContext1.component.getClass(), InnerTube.class); assertEquals(motorTubeContext1.instanceNumber, 1); final Coordinate motorTube1Location = motorTubeContext1.getLocation(); assertEquals(motorTube1Location.x, 1.214, EPSILON); @@ -456,7 +456,7 @@ public class FlightConfigurationTest extends BaseTestCase { assertEquals(motorTube1Location.z, -0.015, EPSILON); final InstanceContext motorTubeContext2 = mmtContextList.get(6); - assertEquals(motorTubeContext2.component.getClass(), InnerTube.class); + assertSame(motorTubeContext2.component.getClass(), InnerTube.class); assertEquals(motorTubeContext2.instanceNumber, 2); final Coordinate motorTube2Location = motorTubeContext2.getLocation(); assertEquals(motorTube2Location.x, 1.214, EPSILON); @@ -464,7 +464,7 @@ public class FlightConfigurationTest extends BaseTestCase { assertEquals(motorTube2Location.z, 0.015, EPSILON); final InstanceContext motorTubeContext3 = mmtContextList.get(7); - assertEquals(motorTubeContext3.component.getClass(), InnerTube.class); + assertSame(motorTubeContext3.component.getClass(), InnerTube.class); assertEquals(motorTubeContext3.instanceNumber, 3); final Coordinate motorTube3Location = motorTubeContext3.getLocation(); assertEquals(motorTube3Location.x, 1.214, EPSILON); @@ -478,7 +478,7 @@ public class FlightConfigurationTest extends BaseTestCase { assertEquals(6, finContextList.size()); final InstanceContext boosterFinContext0 = finContextList.get(3); - assertEquals(boosterFinContext0.component.getClass(), TrapezoidFinSet.class); + assertSame(boosterFinContext0.component.getClass(), TrapezoidFinSet.class); assertEquals(boosterFinContext0.instanceNumber, 0); final Coordinate boosterFin0Location = boosterFinContext0.getLocation(); assertEquals(1.044, boosterFin0Location.x, EPSILON); @@ -486,7 +486,7 @@ public class FlightConfigurationTest extends BaseTestCase { assertEquals(0.0, boosterFin0Location.z, EPSILON); final InstanceContext boosterFinContext1 = finContextList.get(4); - assertEquals(boosterFinContext1.component.getClass(), TrapezoidFinSet.class); + assertSame(boosterFinContext1.component.getClass(), TrapezoidFinSet.class); assertEquals(boosterFinContext1.instanceNumber, 1); final Coordinate boosterFin1Location = boosterFinContext1.getLocation(); assertEquals(1.044, boosterFin1Location.x, EPSILON); @@ -494,7 +494,7 @@ public class FlightConfigurationTest extends BaseTestCase { assertEquals(-0.033341978, boosterFin1Location.z, EPSILON); final InstanceContext boosterFinContext2 = finContextList.get(5); - assertEquals(boosterFinContext2.component.getClass(), TrapezoidFinSet.class); + assertSame(boosterFinContext2.component.getClass(), TrapezoidFinSet.class); assertEquals(boosterFinContext2.instanceNumber, 2); final Coordinate boosterFin2Location = boosterFinContext2.getLocation(); assertEquals(1.044, boosterFin2Location.x, EPSILON); From bf0e5eaeafd7bd98ad01d5773b0dd2be830e5bbd Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 06:02:52 +0200 Subject: [PATCH 24/25] Forgot assertsame import --- .../openrocket/core/file/rocksim/importt/RockSimLoaderTest.java | 1 + 1 file changed, 1 insertion(+) 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 27240f5a0..6f11b7990 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 @@ -23,6 +23,7 @@ import info.openrocket.core.util.Coordinate; import info.openrocket.core.util.MathUtil; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; From 5e77e3670a6357bd2264d073c962219dc02fdd98 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 06:03:06 +0200 Subject: [PATCH 25/25] Fix range because of GM scale 2 --- .../rocketoptimization/modifiers/TestGenericModifier.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java index e0b14faa7..93c4b39a1 100644 --- a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java +++ b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java @@ -82,11 +82,11 @@ public class TestGenericModifier extends BaseTestCase { public void testSingularRange() throws OptimizationException { gm.setMinValue(1.0); gm.setMaxValue(1.0); - value.d = 0.5; + value.d = 0.25; assertEquals(0.0, gm.getCurrentScaledValue(sim), EPSILON); - value.d = 1.0; + value.d = 0.5; assertEquals(0.5, gm.getCurrentScaledValue(sim), EPSILON); - value.d = 1.00001; + value.d = 0.50001; assertEquals(1.0, gm.getCurrentScaledValue(sim), EPSILON); }