From 8ce61d6c30d21b624bded47b9a83b0103e670e86 Mon Sep 17 00:00:00 2001
From: Luc Maisonobe <luc@orekit.org>
Date: Tue, 20 May 2014 15:13:38 +0200
Subject: [PATCH] Created a utils package.
---
src/main/java/org/orekit/rugged/api/Rugged.java | 4 ++--
.../java/org/orekit/rugged/api/SensorMeanPlaneCrossing.java | 2 +-
src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java | 1 +
src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java | 1 +
.../org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java | 2 +-
.../java/org/orekit/rugged/raster/IntersectionAlgorithm.java | 2 +-
.../org/orekit/rugged/{core => utils}/ExtendedEllipsoid.java | 2 +-
.../rugged/{core => utils}/SpacecraftToObservedBody.java | 2 +-
.../java/org/orekit/rugged/core/AbstractAlgorithmTest.java | 1 +
.../orekit/rugged/{core => utils}/ExtendedEllipsoidTest.java | 4 ++--
10 files changed, 12 insertions(+), 9 deletions(-)
rename src/main/java/org/orekit/rugged/{core => utils}/ExtendedEllipsoid.java (99%)
rename src/main/java/org/orekit/rugged/{core => utils}/SpacecraftToObservedBody.java (99%)
rename src/test/java/org/orekit/rugged/{core => utils}/ExtendedEllipsoidTest.java (99%)
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index 0ea78984..9c4c5d83 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -40,11 +40,11 @@ import org.orekit.orbits.CartesianOrbit;
import org.orekit.orbits.Orbit;
import org.orekit.propagation.Propagator;
import org.orekit.rugged.core.BasicScanAlgorithm;
-import org.orekit.rugged.core.ExtendedEllipsoid;
import org.orekit.rugged.core.IgnoreDEMAlgorithm;
-import org.orekit.rugged.core.SpacecraftToObservedBody;
import org.orekit.rugged.core.duvenhage.DuvenhageAlgorithm;
import org.orekit.rugged.raster.IntersectionAlgorithm;
+import org.orekit.rugged.utils.ExtendedEllipsoid;
+import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.Constants;
import org.orekit.utils.IERSConventions;
diff --git a/src/main/java/org/orekit/rugged/api/SensorMeanPlaneCrossing.java b/src/main/java/org/orekit/rugged/api/SensorMeanPlaneCrossing.java
index ebe5fd36..7af3c9a4 100644
--- a/src/main/java/org/orekit/rugged/api/SensorMeanPlaneCrossing.java
+++ b/src/main/java/org/orekit/rugged/api/SensorMeanPlaneCrossing.java
@@ -25,7 +25,7 @@ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
import org.apache.commons.math3.util.FastMath;
import org.orekit.errors.OrekitException;
import org.orekit.frames.Transform;
-import org.orekit.rugged.core.SpacecraftToObservedBody;
+import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
import org.orekit.utils.Constants;
import org.orekit.utils.PVCoordinates;
diff --git a/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java b/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
index 2a62c35a..94acd062 100644
--- a/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
@@ -30,6 +30,7 @@ import org.orekit.rugged.raster.SimpleTile;
import org.orekit.rugged.raster.SimpleTileFactory;
import org.orekit.rugged.raster.Tile;
import org.orekit.rugged.raster.TilesCache;
+import org.orekit.rugged.utils.ExtendedEllipsoid;
/** Intersection computation using a basic algorithm based on exhaustive scan.
* <p>
diff --git a/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java b/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
index fe9b98e5..2c4a564d 100644
--- a/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
@@ -21,6 +21,7 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.RuggedException;
import org.orekit.rugged.raster.IntersectionAlgorithm;
+import org.orekit.rugged.utils.ExtendedEllipsoid;
/** Intersection ignoring Digital Elevation Model.
* <p>
diff --git a/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java b/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
index 0c844d8d..4df38def 100644
--- a/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
@@ -23,10 +23,10 @@ import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.RuggedException;
import org.orekit.rugged.api.RuggedMessages;
import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.core.ExtendedEllipsoid;
import org.orekit.rugged.raster.IntersectionAlgorithm;
import org.orekit.rugged.raster.Tile;
import org.orekit.rugged.raster.TilesCache;
+import org.orekit.rugged.utils.ExtendedEllipsoid;
/** Digital Elevation Model intersection using Bernardt Duvenhage's algorithm.
* <p>
diff --git a/src/main/java/org/orekit/rugged/raster/IntersectionAlgorithm.java b/src/main/java/org/orekit/rugged/raster/IntersectionAlgorithm.java
index 8e8f6b52..9b22bb24 100644
--- a/src/main/java/org/orekit/rugged/raster/IntersectionAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/raster/IntersectionAlgorithm.java
@@ -19,7 +19,7 @@ package org.orekit.rugged.raster;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.core.ExtendedEllipsoid;
+import org.orekit.rugged.utils.ExtendedEllipsoid;
/** Interface for Digital Elevation Model intersection algorithm.
* @author Luc Maisonobe
diff --git a/src/main/java/org/orekit/rugged/core/ExtendedEllipsoid.java b/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/core/ExtendedEllipsoid.java
rename to src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
index a6c7dcfb..2218efb3 100644
--- a/src/main/java/org/orekit/rugged/core/ExtendedEllipsoid.java
+++ b/src/main/java/org/orekit/rugged/utils/ExtendedEllipsoid.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.core;
+package org.orekit.rugged.utils;
import org.apache.commons.math3.geometry.euclidean.threed.Line;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
diff --git a/src/main/java/org/orekit/rugged/core/SpacecraftToObservedBody.java b/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/core/SpacecraftToObservedBody.java
rename to src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
index d402a8b8..fe497c97 100644
--- a/src/main/java/org/orekit/rugged/core/SpacecraftToObservedBody.java
+++ b/src/main/java/org/orekit/rugged/utils/SpacecraftToObservedBody.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.core;
+package org.orekit.rugged.utils;
import org.orekit.attitudes.Attitude;
import org.orekit.attitudes.AttitudeProvider;
diff --git a/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java b/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
index c9bbe50f..74637287 100644
--- a/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
@@ -44,6 +44,7 @@ import org.orekit.rugged.core.duvenhage.MinMaxTreeTileFactory;
import org.orekit.rugged.raster.CliffsElevationUpdater;
import org.orekit.rugged.raster.VolcanicConeElevationUpdater;
import org.orekit.rugged.raster.IntersectionAlgorithm;
+import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.time.AbsoluteDate;
import org.orekit.time.TimeScalesFactory;
import org.orekit.utils.Constants;
diff --git a/src/test/java/org/orekit/rugged/core/ExtendedEllipsoidTest.java b/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
similarity index 99%
rename from src/test/java/org/orekit/rugged/core/ExtendedEllipsoidTest.java
rename to src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
index cefc05a7..7d015237 100644
--- a/src/test/java/org/orekit/rugged/core/ExtendedEllipsoidTest.java
+++ b/src/test/java/org/orekit/rugged/utils/ExtendedEllipsoidTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.core;
+package org.orekit.rugged.utils;
import java.io.File;
import java.net.URISyntaxException;
@@ -34,7 +34,7 @@ import org.orekit.frames.Frame;
import org.orekit.frames.FramesFactory;
import org.orekit.rugged.api.RuggedException;
import org.orekit.rugged.api.RuggedMessages;
-import org.orekit.rugged.core.ExtendedEllipsoid;
+import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.utils.Constants;
import org.orekit.utils.IERSConventions;
--
GitLab