diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3c5556b1c59a2e176010ff4999518c2ea30114f9..99dc99dbb00a1312a27a1d7645d59a0f25f313b3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,6 +21,9 @@
</properties>
<body>
<release version="10.2" date="TBD" description="TBD">
+ <action dev="maxime" type="update" issue="690">
+ Increased visibility of setters in CCSDS OEM related classes.
+ </action>
<action dev="bryan" type="update" >
Improved Orekit performance by using new Hipparchus' differentiation classes.
</action>
diff --git a/src/main/java/org/orekit/files/ccsds/NDMFile.java b/src/main/java/org/orekit/files/ccsds/NDMFile.java
index 386bb56f484f99cb4944e0139789c3f4e7ba1d1e..9eee2f8a6161268d320ec13d9dbf51ae304f97b9 100644
--- a/src/main/java/org/orekit/files/ccsds/NDMFile.java
+++ b/src/main/java/org/orekit/files/ccsds/NDMFile.java
@@ -82,7 +82,7 @@ public abstract class NDMFile {
* Set the used gravitational coefficient.
* @param mu the coefficient to set
*/
- void setMu(final double mu) {
+ public void setMu(final double mu) {
this.mu = mu;
}
@@ -98,7 +98,7 @@ public abstract class NDMFile {
* Set the CCSDS NDM (ADM or ODM) format version.
* @param formatVersion the format version to be set
*/
- void setFormatVersion(final double formatVersion) {
+ public void setFormatVersion(final double formatVersion) {
this.formatVersion = formatVersion;
}
@@ -114,7 +114,7 @@ public abstract class NDMFile {
* Set the header comment.
* @param headerComment header comment
*/
- void setHeaderComment(final List<String> headerComment) {
+ public void setHeaderComment(final List<String> headerComment) {
this.headerComment = new ArrayList<String>(headerComment);
}
@@ -130,7 +130,7 @@ public abstract class NDMFile {
* Set the file creation date and time in UTC.
* @param creationDate the creation date to be set
*/
- void setCreationDate(final AbsoluteDate creationDate) {
+ public void setCreationDate(final AbsoluteDate creationDate) {
this.creationDate = creationDate;
}
@@ -146,7 +146,7 @@ public abstract class NDMFile {
* Set the file originator.
* @param originator the originator to be set
*/
- void setOriginator(final String originator) {
+ public void setOriginator(final String originator) {
this.originator = originator;
}
@@ -166,7 +166,7 @@ public abstract class NDMFile {
* Set IERS conventions.
* @param conventions IERS conventions to be set
*/
- void setConventions(final IERSConventions conventions) {
+ public void setConventions(final IERSConventions conventions) {
this.conventions = conventions;
}
@@ -182,7 +182,7 @@ public abstract class NDMFile {
* Set reference date for Mission Elapsed Time and Mission Relative Time time systems.
* @param missionReferenceDate reference date for Mission Elapsed Time and Mission Relative Time time systems.
*/
- void setMissionReferenceDate(final AbsoluteDate missionReferenceDate) {
+ public void setMissionReferenceDate(final AbsoluteDate missionReferenceDate) {
this.missionReferenceDate = missionReferenceDate;
}
@@ -198,7 +198,7 @@ public abstract class NDMFile {
* Set the data context.
* @param dataContext used for creating frames, time scales, etc.
*/
- void setDataContext(final DataContext dataContext) {
+ public void setDataContext(final DataContext dataContext) {
this.dataContext = dataContext;
}
diff --git a/src/main/java/org/orekit/files/ccsds/ODMFile.java b/src/main/java/org/orekit/files/ccsds/ODMFile.java
index 889269cd96cd736735bc99b16567aa2aef3fbc3d..cd8cab95fffb9952c68d453539a13655288ff483 100644
--- a/src/main/java/org/orekit/files/ccsds/ODMFile.java
+++ b/src/main/java/org/orekit/files/ccsds/ODMFile.java
@@ -64,7 +64,7 @@ public abstract class ODMFile extends NDMFile {
* Set the gravitational coefficient set by the user.
* @param muSet the coefficient to be set
*/
- void setMuSet(final double muSet) {
+ public void setMuSet(final double muSet) {
this.muSet = muSet;
}
diff --git a/src/main/java/org/orekit/files/ccsds/ODMMetaData.java b/src/main/java/org/orekit/files/ccsds/ODMMetaData.java
index 35b68ba35213702ae73fcec22ce6241c468cb627..3c48a965b3ae9257e5bbb8847f6de0e4a2ae91e1 100644
--- a/src/main/java/org/orekit/files/ccsds/ODMMetaData.java
+++ b/src/main/java/org/orekit/files/ccsds/ODMMetaData.java
@@ -89,7 +89,7 @@ public class ODMMetaData {
/** Create a new meta-data.
* @param odmFile ODM file to which these meta-data belong
*/
- ODMMetaData(final ODMFile odmFile) {
+ public ODMMetaData(final ODMFile odmFile) {
this.odmFile = odmFile;
comment = new ArrayList<String>();
}
@@ -117,7 +117,7 @@ public class ODMMetaData {
* covariance data.
* @param timeSystem the time system to be set
*/
- void setTimeSystem(final CcsdsTimeScale timeSystem) {
+ public void setTimeSystem(final CcsdsTimeScale timeSystem) {
this.timeSystem = timeSystem;
}
@@ -129,7 +129,7 @@ public class ODMMetaData {
* @throws OrekitException if there is not corresponding time scale.
* @since 10.1
*/
- TimeScale getTimeScale() {
+ public TimeScale getTimeScale() {
return getTimeSystem().getTimeScale(
odmFile.getConventions(),
odmFile.getDataContext().getTimeScales());
@@ -145,7 +145,7 @@ public class ODMMetaData {
/** Set the spacecraft name for which the orbit state is provided.
* @param objectName the spacecraft name to be set
*/
- void setObjectName(final String objectName) {
+ public void setObjectName(final String objectName) {
this.objectName = objectName;
}
@@ -159,14 +159,14 @@ public class ODMMetaData {
/** Set the spacecraft ID for which the orbit state is provided.
* @param objectID the spacecraft ID to be set
*/
- void setObjectID(final String objectID) {
+ public void setObjectID(final String objectID) {
this.objectID = objectID;
}
/** Set the launch year.
* @param launchYear launch year
*/
- void setLaunchYear(final int launchYear) {
+ public void setLaunchYear(final int launchYear) {
this.launchYear = launchYear;
}
@@ -180,7 +180,7 @@ public class ODMMetaData {
/** Set the launch number.
* @param launchNumber launch number
*/
- void setLaunchNumber(final int launchNumber) {
+ public void setLaunchNumber(final int launchNumber) {
this.launchNumber = launchNumber;
}
@@ -194,7 +194,7 @@ public class ODMMetaData {
/** Set the piece of launch.
* @param launchPiece piece of launch
*/
- void setLaunchPiece(final String launchPiece) {
+ public void setLaunchPiece(final String launchPiece) {
this.launchPiece = launchPiece;
}
@@ -215,7 +215,7 @@ public class ODMMetaData {
/** Set the origin of reference frame.
* @param centerName the origin of reference frame to be set
*/
- void setCenterName(final String centerName) {
+ public void setCenterName(final String centerName) {
this.centerName = centerName;
}
@@ -229,7 +229,7 @@ public class ODMMetaData {
/** Set the {@link CelestialBody} corresponding to the center name.
* @param centerBody the {@link CelestialBody} to be set
*/
- void setCenterBody(final CelestialBody centerBody) {
+ public void setCenterBody(final CelestialBody centerBody) {
this.centerBody = centerBody;
}
@@ -246,7 +246,7 @@ public class ODMMetaData {
* attribute can be created through the {@link CelestialBodies}.
* @param hasCreatableBody the boolean to be set.
*/
- void setHasCreatableBody(final boolean hasCreatableBody) {
+ public void setHasCreatableBody(final boolean hasCreatableBody) {
this.hasCreatableBody = hasCreatableBody;
}
@@ -295,7 +295,7 @@ public class ODMMetaData {
* and Keplerian elements data (and for the covariance reference frame if none is given).
* @param refFrame the reference frame to be set
*/
- void setRefFrame(final Frame refFrame) {
+ public void setRefFrame(final Frame refFrame) {
this.refFrame = refFrame;
}
@@ -314,7 +314,7 @@ public class ODMMetaData {
*
* @param frame specifier as it appeared in the file.
*/
- void setFrameString(final String frame) {
+ public void setFrameString(final String frame) {
this.refFrameString = frame;
}
@@ -330,7 +330,7 @@ public class ODMMetaData {
* reference frame.
* @param frameEpochString the epoch of reference frame to be set
*/
- void setFrameEpochString(final String frameEpochString) {
+ public void setFrameEpochString(final String frameEpochString) {
this.frameEpochString = frameEpochString;
}
@@ -346,7 +346,7 @@ public class ODMMetaData {
* reference frame.
* @param frameEpoch the epoch of reference frame to be set
*/
- void setFrameEpoch(final AbsoluteDate frameEpoch) {
+ public void setFrameEpoch(final AbsoluteDate frameEpoch) {
this.frameEpoch = frameEpoch;
}
@@ -360,7 +360,7 @@ public class ODMMetaData {
/** Set the meta-data comment.
* @param comment comment to set
*/
- void setComment(final List<String> comment) {
+ public void setComment(final List<String> comment) {
this.comment = new ArrayList<String>(comment);
}
diff --git a/src/main/java/org/orekit/files/ccsds/OEMFile.java b/src/main/java/org/orekit/files/ccsds/OEMFile.java
index 1255f32f4d4fc7ae2b84f8aa94e8b568a9a3bbc4..a5890b5755c0b63b7c64a0ea8e302c7a88ee0960 100644
--- a/src/main/java/org/orekit/files/ccsds/OEMFile.java
+++ b/src/main/java/org/orekit/files/ccsds/OEMFile.java
@@ -54,7 +54,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
}
/** Add a block to the list of ephemeris blocks. */
- void addEphemeridesBlock() {
+ public void addEphemeridesBlock() {
ephemeridesBlocks.add(new EphemeridesBlock());
}
@@ -67,7 +67,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
/** Check that, according to the CCSDS standard, every OEMBlock has the same time system.
*/
- void checkTimeSystems() {
+ public void checkTimeSystems() {
final CcsdsTimeScale timeSystem = getEphemeridesBlocks().get(0).getMetaData().getTimeSystem();
for (final EphemeridesBlock block : ephemeridesBlocks) {
if (!timeSystem.equals(block.getMetaData().getTimeSystem())) {
@@ -153,7 +153,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
/** Get the list of Ephemerides data lines.
* @return a reference to the internal list of Ephemerides data lines
*/
- List<TimeStampedPVCoordinates> getEphemeridesDataLines() {
+ public List<TimeStampedPVCoordinates> getEphemeridesDataLines() {
return this.ephemeridesDataLines;
}
@@ -166,7 +166,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
/**
* Update the value of {@link #hasAcceleration}.
*
- * @param pointHasAcceleration true iff the current data point has acceleration
+ * @param pointHasAcceleration true if the current data point has acceleration
* data.
*/
void updateHasAcceleration(final boolean pointHasAcceleration) {
@@ -243,7 +243,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
* covariance data.
* @param startTime the time to be set
*/
- void setStartTime(final AbsoluteDate startTime) {
+ public void setStartTime(final AbsoluteDate startTime) {
this.startTime = startTime;
}
@@ -259,7 +259,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
* data.
* @param stopTime the time to be set
*/
- void setStopTime(final AbsoluteDate stopTime) {
+ public void setStopTime(final AbsoluteDate stopTime) {
this.stopTime = stopTime;
}
@@ -275,7 +275,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
* necessary to allow for proper interpolation.
* @param useableStartTime the time to be set
*/
- void setUseableStartTime(final AbsoluteDate useableStartTime) {
+ public void setUseableStartTime(final AbsoluteDate useableStartTime) {
this.useableStartTime = useableStartTime;
}
@@ -291,7 +291,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
* necessary to allow for proper interpolation.
* @param useableStopTime the time to be set
*/
- void setUseableStopTime(final AbsoluteDate useableStopTime) {
+ public void setUseableStopTime(final AbsoluteDate useableStopTime) {
this.useableStopTime = useableStopTime;
}
@@ -327,7 +327,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
/** Set the interpolation method to be used.
* @param interpolationMethod the interpolation method to be set
*/
- void setInterpolationMethod(final String interpolationMethod) {
+ public void setInterpolationMethod(final String interpolationMethod) {
this.interpolationMethod = interpolationMethod;
}
@@ -341,7 +341,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
/** Set the interpolation degree.
* @param interpolationDegree the interpolation degree to be set
*/
- void setInterpolationDegree(final int interpolationDegree) {
+ public void setInterpolationDegree(final int interpolationDegree) {
this.interpolationDegree = interpolationDegree;
}
@@ -362,7 +362,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
/** Set boolean testing whether the reference frame has an epoch associated to it.
* @param hasRefFrameEpoch the boolean to be set.
*/
- void setHasRefFrameEpoch(final boolean hasRefFrameEpoch) {
+ public void setHasRefFrameEpoch(final boolean hasRefFrameEpoch) {
this.hasRefFrameEpoch = hasRefFrameEpoch;
}
@@ -376,7 +376,7 @@ public class OEMFile extends ODMFile implements EphemerisFile {
/** Set the ephemerides data lines comment.
* @param ephemeridesDataLinesComment the comment to be set
*/
- void setEphemeridesDataLinesComment(final List<String> ephemeridesDataLinesComment) {
+ public void setEphemeridesDataLinesComment(final List<String> ephemeridesDataLinesComment) {
this.ephemeridesDataLinesComment = new ArrayList<String>(ephemeridesDataLinesComment);
}
@@ -407,9 +407,9 @@ public class OEMFile extends ODMFile implements EphemerisFile {
* @param frame coordinate system for covariance matrix, for absolute frames
* @param lastMatrix the covariance matrix
*/
- CovarianceMatrix(final AbsoluteDate epoch,
- final LOFType lofType, final Frame frame,
- final RealMatrix lastMatrix) {
+ public CovarianceMatrix(final AbsoluteDate epoch,
+ final LOFType lofType, final Frame frame,
+ final RealMatrix lastMatrix) {
this.matrix = lastMatrix;
this.epoch = epoch;
this.lofType = lofType;
@@ -477,9 +477,9 @@ public class OEMFile extends ODMFile implements EphemerisFile {
* satellite, in m^3 / s^2.
* @param blocks containing ephemeris data for the satellite.
*/
- OemSatelliteEphemeris(final String id,
- final double mu,
- final List<EphemeridesBlock> blocks) {
+ public OemSatelliteEphemeris(final String id,
+ final double mu,
+ final List<EphemeridesBlock> blocks) {
this.id = id;
this.mu = mu;
this.blocks = blocks;