From 7bb133a441b58b8f6ce9c7c63ac6200eff0da272 Mon Sep 17 00:00:00 2001
From: Luc Maisonobe <luc@orekit.org>
Date: Tue, 20 May 2014 15:17:30 +0200
Subject: [PATCH] renamed core package into intersection.
---
src/main/java/org/orekit/rugged/api/Rugged.java | 8 ++++----
.../rugged/{core => intersection}/BasicScanAlgorithm.java | 3 +--
.../rugged/{core => intersection}/IgnoreDEMAlgorithm.java | 3 +--
.../{raster => intersection}/IntersectionAlgorithm.java | 3 ++-
.../duvenhage/DuvenhageAlgorithm.java | 4 ++--
.../{core => intersection}/duvenhage/MinMaxTreeTile.java | 2 +-
.../duvenhage/MinMaxTreeTileFactory.java | 2 +-
.../{core => intersection}/AbstractAlgorithmTest.java | 8 ++++----
.../{core => intersection}/BasicScanAlgorithmTest.java | 5 +++--
.../duvenhage/DuvenhageAlgorithmTest.java | 7 ++++---
.../duvenhage/MinMaxTreeTileTest.java | 4 +++-
11 files changed, 26 insertions(+), 23 deletions(-)
rename src/main/java/org/orekit/rugged/{core => intersection}/BasicScanAlgorithm.java (99%)
rename src/main/java/org/orekit/rugged/{core => intersection}/IgnoreDEMAlgorithm.java (96%)
rename src/main/java/org/orekit/rugged/{raster => intersection}/IntersectionAlgorithm.java (97%)
rename src/main/java/org/orekit/rugged/{core => intersection}/duvenhage/DuvenhageAlgorithm.java (99%)
rename src/main/java/org/orekit/rugged/{core => intersection}/duvenhage/MinMaxTreeTile.java (99%)
rename src/main/java/org/orekit/rugged/{core => intersection}/duvenhage/MinMaxTreeTileFactory.java (95%)
rename src/test/java/org/orekit/rugged/{core => intersection}/AbstractAlgorithmTest.java (98%)
rename src/test/java/org/orekit/rugged/{core => intersection}/BasicScanAlgorithmTest.java (87%)
rename src/test/java/org/orekit/rugged/{core => intersection}/duvenhage/DuvenhageAlgorithmTest.java (91%)
rename src/test/java/org/orekit/rugged/{core => intersection}/duvenhage/MinMaxTreeTileTest.java (98%)
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index 9c4c5d83..86b9a2a1 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -39,10 +39,10 @@ import org.orekit.frames.Transform;
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.IgnoreDEMAlgorithm;
-import org.orekit.rugged.core.duvenhage.DuvenhageAlgorithm;
-import org.orekit.rugged.raster.IntersectionAlgorithm;
+import org.orekit.rugged.intersection.BasicScanAlgorithm;
+import org.orekit.rugged.intersection.IgnoreDEMAlgorithm;
+import org.orekit.rugged.intersection.IntersectionAlgorithm;
+import org.orekit.rugged.intersection.duvenhage.DuvenhageAlgorithm;
import org.orekit.rugged.utils.ExtendedEllipsoid;
import org.orekit.rugged.utils.SpacecraftToObservedBody;
import org.orekit.time.AbsoluteDate;
diff --git a/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
rename to src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.java
index 94acd062..dd6b6a76 100644
--- a/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/BasicScanAlgorithm.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.intersection;
import java.util.ArrayList;
import java.util.List;
@@ -25,7 +25,6 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.RuggedException;
import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.raster.IntersectionAlgorithm;
import org.orekit.rugged.raster.SimpleTile;
import org.orekit.rugged.raster.SimpleTileFactory;
import org.orekit.rugged.raster.Tile;
diff --git a/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
similarity index 96%
rename from src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
rename to src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
index 2c4a564d..06a6d3b3 100644
--- a/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/IgnoreDEMAlgorithm.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.core;
+package org.orekit.rugged.intersection;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
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.
diff --git a/src/main/java/org/orekit/rugged/raster/IntersectionAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
similarity index 97%
rename from src/main/java/org/orekit/rugged/raster/IntersectionAlgorithm.java
rename to src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
index 9b22bb24..6a4b4db6 100644
--- a/src/main/java/org/orekit/rugged/raster/IntersectionAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/IntersectionAlgorithm.java
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.raster;
+package org.orekit.rugged.intersection;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
import org.orekit.bodies.GeodeticPoint;
import org.orekit.rugged.api.RuggedException;
+import org.orekit.rugged.raster.Tile;
import org.orekit.rugged.utils.ExtendedEllipsoid;
/** Interface for Digital Elevation Model intersection algorithm.
diff --git a/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
rename to src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
index 4df38def..f406aef4 100644
--- a/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.core.duvenhage;
+package org.orekit.rugged.intersection.duvenhage;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
import org.apache.commons.math3.util.FastMath;
@@ -23,7 +23,7 @@ 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.raster.IntersectionAlgorithm;
+import org.orekit.rugged.intersection.IntersectionAlgorithm;
import org.orekit.rugged.raster.Tile;
import org.orekit.rugged.raster.TilesCache;
import org.orekit.rugged.utils.ExtendedEllipsoid;
diff --git a/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java
rename to src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
index f5e7c81d..5c2ea740 100644
--- a/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTile.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.core.duvenhage;
+package org.orekit.rugged.intersection.duvenhage;
import org.apache.commons.math3.analysis.BivariateFunction;
import org.apache.commons.math3.analysis.function.Max;
diff --git a/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
similarity index 95%
rename from src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java
rename to src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
index 716b4f7f..ede1085c 100644
--- a/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.core.duvenhage;
+package org.orekit.rugged.intersection.duvenhage;
import org.orekit.rugged.raster.TileFactory;
diff --git a/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
similarity index 98%
rename from src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
rename to src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.java
index 74637287..eb0b0ecd 100644
--- a/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/AbstractAlgorithmTest.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.intersection;
import java.io.File;
@@ -39,11 +39,11 @@ import org.orekit.orbits.CartesianOrbit;
import org.orekit.propagation.SpacecraftState;
import org.orekit.rugged.api.RuggedException;
import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.core.duvenhage.MinMaxTreeTile;
-import org.orekit.rugged.core.duvenhage.MinMaxTreeTileFactory;
+import org.orekit.rugged.intersection.IntersectionAlgorithm;
+import org.orekit.rugged.intersection.duvenhage.MinMaxTreeTile;
+import org.orekit.rugged.intersection.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;
diff --git a/src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
similarity index 87%
rename from src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java
rename to src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
index 1830feda..f67a9372 100644
--- a/src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/BasicScanAlgorithmTest.java
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.core;
+package org.orekit.rugged.intersection;
import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.raster.IntersectionAlgorithm;
+import org.orekit.rugged.intersection.BasicScanAlgorithm;
+import org.orekit.rugged.intersection.IntersectionAlgorithm;
public class BasicScanAlgorithmTest extends AbstractAlgorithmTest {
diff --git a/src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java b/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
similarity index 91%
rename from src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java
rename to src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
index f202ddff..e2f8871a 100644
--- a/src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithmTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.core.duvenhage;
+package org.orekit.rugged.intersection.duvenhage;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
@@ -23,8 +23,9 @@ import org.orekit.bodies.GeodeticPoint;
import org.orekit.errors.OrekitException;
import org.orekit.rugged.api.RuggedException;
import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.core.AbstractAlgorithmTest;
-import org.orekit.rugged.raster.IntersectionAlgorithm;
+import org.orekit.rugged.intersection.AbstractAlgorithmTest;
+import org.orekit.rugged.intersection.IntersectionAlgorithm;
+import org.orekit.rugged.intersection.duvenhage.DuvenhageAlgorithm;
public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
diff --git a/src/test/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileTest.java b/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
similarity index 98%
rename from src/test/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileTest.java
rename to src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
index 6eb06c36..7a6c4883 100644
--- a/src/test/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileTest.java
+++ b/src/test/java/org/orekit/rugged/intersection/duvenhage/MinMaxTreeTileTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.orekit.rugged.core.duvenhage;
+package org.orekit.rugged.intersection.duvenhage;
import java.lang.reflect.Field;
@@ -22,6 +22,8 @@ import org.apache.commons.math3.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
import org.orekit.rugged.api.RuggedException;
+import org.orekit.rugged.intersection.duvenhage.MinMaxTreeTile;
+import org.orekit.rugged.intersection.duvenhage.MinMaxTreeTileFactory;
public class MinMaxTreeTileTest {
--
GitLab