Skip to content

Commit 477d4c5

Browse files
author
vcucchie
committed
Fixed issues found during 12.2-RC1 review
1 parent 6ebafab commit 477d4c5

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

spotbugs-exclude-filter.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@
197197
<Class name="~.*\.Units$"/>
198198
<Bug pattern="CNT_ROUGH_CONSTANT_VALUE" />
199199
</Match>
200+
<Match>
201+
<Class name="~.*\.IonosphereKlobucharMessage$"/>
202+
<Bug pattern="CNT_ROUGH_CONSTANT_VALUE" />
203+
</Match>
200204

201205
<!-- The following is a false positive from SpotBugs -->
202206
<Match>

src/main/java/org/orekit/control/indirect/shooting/AbstractIndirectShooting.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ public ShootingPropagationSettings getPropagationSettings() {
8080
*/
8181
protected NumericalPropagator buildPropagator(final SpacecraftState initialState) {
8282
final ODEIntegrator integrator = buildIntegrator(initialState);
83-
final NumericalPropagator propagator = new NumericalPropagator(integrator);
83+
final NumericalPropagator propagator =
84+
new NumericalPropagator(integrator, propagationSettings.getAttitudeProvider());
8485
propagator.setIgnoreCentralAttraction(true);
8586
propagator.setInitialState(initialState);
8687
propagator.setIgnoreCentralAttraction(false);
@@ -93,7 +94,6 @@ protected NumericalPropagator buildPropagator(final SpacecraftState initialState
9394
}
9495
propagator.setOrbitType(null);
9596
}
96-
propagator.setAttitudeProvider(propagationSettings.getAttitudeProvider());
9797
for (final ForceModel forceModel: propagationSettings.getForceModels()) {
9898
propagator.addForceModel(forceModel);
9999
}
@@ -126,7 +126,8 @@ private ODEIntegrator buildIntegrator(final SpacecraftState initialState) {
126126
protected FieldNumericalPropagator<Gradient> buildFieldPropagator(final FieldSpacecraftState<Gradient> initialState) {
127127
final Field<Gradient> field = initialState.getDate().getField();
128128
final FieldODEIntegrator<Gradient> integrator = buildFieldIntegrator(initialState);
129-
final FieldNumericalPropagator<Gradient> propagator = new FieldNumericalPropagator<>(field, integrator);
129+
final FieldNumericalPropagator<Gradient> propagator =
130+
new FieldNumericalPropagator<>(field, integrator, propagationSettings.getAttitudeProvider());
130131
propagator.setIgnoreCentralAttraction(true);
131132
propagator.removeForceModels();
132133
propagator.setInitialState(initialState);
@@ -139,7 +140,6 @@ protected FieldNumericalPropagator<Gradient> buildFieldPropagator(final FieldSpa
139140
propagator.setIgnoreCentralAttraction(true);
140141
}
141142
}
142-
propagator.setAttitudeProvider(propagationSettings.getAttitudeProvider());
143143
for (final ForceModel forceModel: propagationSettings.getForceModels()) {
144144
propagator.addForceModel(forceModel);
145145
}

src/main/java/org/orekit/files/ccsds/definitions/CenterName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public enum CenterName {
8888
/** Celestial body getter.
8989
* @return getter for celestial body
9090
*/
91-
private final Function<CelestialBodies, CelestialBody> celestialBodyGetter;
91+
private final transient Function<CelestialBodies, CelestialBody> celestialBodyGetter;
9292

9393
/** Simple constructor.
9494
* @param celestialBodyGetter getter for celestial body

src/main/java/org/orekit/propagation/events/FieldBooleanDetector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.orekit.propagation.events;
1818

1919

20+
import java.io.Serializable;
2021
import java.util.ArrayList;
2122
import java.util.Arrays;
2223
import java.util.Collection;
@@ -316,7 +317,7 @@ public <T extends CalculusFieldElement<T>> T combine(final T g1, final T g2) {
316317
/** Comparator for field elements.
317318
* @param <T> type of the field elements
318319
*/
319-
private static class FieldComparator<T extends CalculusFieldElement<T>> implements Comparator<T> {
320+
private static class FieldComparator<T extends CalculusFieldElement<T>> implements Comparator<T>, Serializable {
320321
public int compare(final T t1, final T t2) {
321322
return Double.compare(t1.getReal(), t2.getReal());
322323
}

src/main/java/org/orekit/propagation/events/FieldEventSlopeFilter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,15 @@ public T g(final FieldSpacecraftState<T> s) {
250250
private static class LocalHandler<D extends FieldEventDetector<T>, T extends CalculusFieldElement<T>> implements FieldEventHandler<T> {
251251

252252
/** {@inheritDoc} */
253+
@SuppressWarnings("unchecked")
253254
public Action eventOccurred(final FieldSpacecraftState<T> s, final FieldEventDetector<T> detector, final boolean increasing) {
254255
final FieldEventSlopeFilter<D, T> esf = (FieldEventSlopeFilter<D, T>) detector;
255256
return esf.rawDetector.getHandler().eventOccurred(s, esf.rawDetector, esf.filter.getTriggeredIncreasing());
256257
}
257258

258259
/** {@inheritDoc} */
259260
@Override
261+
@SuppressWarnings("unchecked")
260262
public FieldSpacecraftState<T> resetState(final FieldEventDetector<T> detector, final FieldSpacecraftState<T> oldState) {
261263
final FieldEventSlopeFilter<D, T> esf = (FieldEventSlopeFilter<D, T>) detector;
262264
return esf.rawDetector.getHandler().resetState(esf.rawDetector, oldState);

0 commit comments

Comments
 (0)