From eaf59aeb754237eb796e1d0a74adac68ea03affe Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 05:18:08 +0200 Subject: [PATCH] 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) {