From dd7553956d5c6f6db2a675d63f6d9cb0f3fd268e Mon Sep 17 00:00:00 2001 From: Luc Maisonobe <luc@orekit.org> Date: Mon, 17 Mar 2014 17:16:57 +0100 Subject: [PATCH] Renamed package dem into raster. --- .../org/orekit/rugged/core/IgnoreDEMAlgorithm.java | 2 +- .../main/java/org/orekit/rugged/core/RuggedImpl.java | 2 +- .../rugged/core/duvenhage/DuvenhageAlgorithm.java | 6 +++--- .../orekit/rugged/core/duvenhage/MinMaxTreeTile.java | 4 ++-- .../rugged/core/duvenhage/MinMaxTreeTileFactory.java | 2 +- .../core/{dem => raster}/IntersectionAlgorithm.java | 2 +- .../orekit/rugged/core/{dem => raster}/SimpleTile.java | 2 +- .../rugged/core/{dem => raster}/SimpleTileFactory.java | 4 ++-- .../org/orekit/rugged/core/{dem => raster}/Tile.java | 2 +- .../rugged/core/{dem => raster}/TileFactory.java | 2 +- .../orekit/rugged/core/{dem => raster}/TilesCache.java | 4 ++-- .../CheckedPatternElevationUpdater.java | 2 +- .../rugged/core/{dem => raster}/CountingFactory.java | 8 ++++---- .../rugged/core/{dem => raster}/SimpleTileTest.java | 10 +++++----- .../rugged/core/{dem => raster}/TilesCacheTest.java | 6 +++--- 15 files changed, 29 insertions(+), 29 deletions(-) rename rugged-core/src/main/java/org/orekit/rugged/core/{dem => raster}/IntersectionAlgorithm.java (98%) rename rugged-core/src/main/java/org/orekit/rugged/core/{dem => raster}/SimpleTile.java (99%) rename rugged-core/src/main/java/org/orekit/rugged/core/{dem => raster}/SimpleTileFactory.java (92%) rename rugged-core/src/main/java/org/orekit/rugged/core/{dem => raster}/Tile.java (99%) rename rugged-core/src/main/java/org/orekit/rugged/core/{dem => raster}/TileFactory.java (96%) rename rugged-core/src/main/java/org/orekit/rugged/core/{dem => raster}/TilesCache.java (99%) rename rugged-core/src/test/java/org/orekit/rugged/core/{dem => raster}/CheckedPatternElevationUpdater.java (98%) rename rugged-core/src/test/java/org/orekit/rugged/core/{dem => raster}/CountingFactory.java (86%) rename rugged-core/src/test/java/org/orekit/rugged/core/{dem => raster}/SimpleTileTest.java (97%) rename rugged-core/src/test/java/org/orekit/rugged/core/{dem => raster}/TilesCacheTest.java (98%) diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java b/rugged-core/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java index a17d742b..5dfa5fd3 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java @@ -21,7 +21,7 @@ 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.dem.IntersectionAlgorithm; +import org.orekit.rugged.core.raster.IntersectionAlgorithm; /** Intersection ignoring Digital Elevation Model. * <p> diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/RuggedImpl.java b/rugged-core/src/main/java/org/orekit/rugged/core/RuggedImpl.java index 35be86d1..9a8fb8b2 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/RuggedImpl.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/RuggedImpl.java @@ -47,8 +47,8 @@ import org.orekit.rugged.api.SatellitePV; import org.orekit.rugged.api.SatelliteQ; import org.orekit.rugged.api.SensorPixel; import org.orekit.rugged.api.TileUpdater; -import org.orekit.rugged.core.dem.IntersectionAlgorithm; import org.orekit.rugged.core.duvenhage.DuvenhageAlgorithm; +import org.orekit.rugged.core.raster.IntersectionAlgorithm; import org.orekit.time.AbsoluteDate; import org.orekit.time.TimeScale; import org.orekit.time.TimeScalesFactory; diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java index 73e70f49..1cc381b4 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java @@ -26,9 +26,9 @@ 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.core.dem.IntersectionAlgorithm; -import org.orekit.rugged.core.dem.Tile; -import org.orekit.rugged.core.dem.TilesCache; +import org.orekit.rugged.core.raster.IntersectionAlgorithm; +import org.orekit.rugged.core.raster.Tile; +import org.orekit.rugged.core.raster.TilesCache; /** Digital Elevation Model intersection using Duvenhage's algorithm. * <p> diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java index 171c457e..77bc7931 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java @@ -19,8 +19,8 @@ package org.orekit.rugged.core.duvenhage; import org.apache.commons.math3.analysis.BivariateFunction; import org.apache.commons.math3.analysis.function.Max; import org.apache.commons.math3.analysis.function.Min; -import org.orekit.rugged.core.dem.SimpleTile; -import org.orekit.rugged.core.dem.Tile; +import org.orekit.rugged.core.raster.SimpleTile; +import org.orekit.rugged.core.raster.Tile; /** Simple implementation of a {@link Tile} with a min/max kd tree. * @see MinMaxTreeTileFactory diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java index 259d81ac..186e16b7 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java @@ -16,7 +16,7 @@ */ package org.orekit.rugged.core.duvenhage; -import org.orekit.rugged.core.dem.TileFactory; +import org.orekit.rugged.core.raster.TileFactory; /** Simple implementation of a {@link TileFactory} for {@link MinMaxTreeTile}. * @author Luc Maisonobe diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/IntersectionAlgorithm.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java similarity index 98% rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/IntersectionAlgorithm.java rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java index 7eed2dba..9a50e6be 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/IntersectionAlgorithm.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.core.dem; +package org.orekit.rugged.core.raster; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import org.orekit.bodies.GeodeticPoint; diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTile.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTile.java similarity index 99% rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTile.java rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTile.java index 832d8ae2..066b3fb8 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTile.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTile.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.core.dem; +package org.orekit.rugged.core.raster; import org.apache.commons.math3.util.FastMath; import org.orekit.rugged.api.RuggedException; diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTileFactory.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTileFactory.java similarity index 92% rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTileFactory.java rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTileFactory.java index ffd7a8d5..7fa78085 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/SimpleTileFactory.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/SimpleTileFactory.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.core.dem; +package org.orekit.rugged.core.raster; -import org.orekit.rugged.core.dem.TileFactory; +import org.orekit.rugged.core.raster.TileFactory; /** Simple implementation of a {@link TileFactory} for {@link SimpleTile}. * @author Luc Maisonobe diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/Tile.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/Tile.java similarity index 99% rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/Tile.java rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/Tile.java index 1e02b64f..a2c9d60d 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/Tile.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/Tile.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.core.dem; +package org.orekit.rugged.core.raster; import org.orekit.rugged.api.RuggedException; import org.orekit.rugged.api.UpdatableTile; diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/TileFactory.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/TileFactory.java similarity index 96% rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/TileFactory.java rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/TileFactory.java index 14425da6..2e5c7d1f 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/TileFactory.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/TileFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.core.dem; +package org.orekit.rugged.core.raster; /** Interface representing a factory for raster tile. diff --git a/rugged-core/src/main/java/org/orekit/rugged/core/dem/TilesCache.java b/rugged-core/src/main/java/org/orekit/rugged/core/raster/TilesCache.java similarity index 99% rename from rugged-core/src/main/java/org/orekit/rugged/core/dem/TilesCache.java rename to rugged-core/src/main/java/org/orekit/rugged/core/raster/TilesCache.java index 0d0ed1e7..4fe48a9d 100644 --- a/rugged-core/src/main/java/org/orekit/rugged/core/dem/TilesCache.java +++ b/rugged-core/src/main/java/org/orekit/rugged/core/raster/TilesCache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.core.dem; +package org.orekit.rugged.core.raster; import java.lang.reflect.Array; import java.util.ArrayList; @@ -25,7 +25,7 @@ import java.util.List; import org.orekit.rugged.api.RuggedException; import org.orekit.rugged.api.TileUpdater; -import org.orekit.rugged.core.dem.Tile.Location; +import org.orekit.rugged.core.raster.Tile.Location; /** Cache for Digital Elevation Model {@link Tile tiles}. * <p> diff --git a/rugged-core/src/test/java/org/orekit/rugged/core/dem/CheckedPatternElevationUpdater.java b/rugged-core/src/test/java/org/orekit/rugged/core/raster/CheckedPatternElevationUpdater.java similarity index 98% rename from rugged-core/src/test/java/org/orekit/rugged/core/dem/CheckedPatternElevationUpdater.java rename to rugged-core/src/test/java/org/orekit/rugged/core/raster/CheckedPatternElevationUpdater.java index 1be46f08..3ea300d7 100644 --- a/rugged-core/src/test/java/org/orekit/rugged/core/dem/CheckedPatternElevationUpdater.java +++ b/rugged-core/src/test/java/org/orekit/rugged/core/raster/CheckedPatternElevationUpdater.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.core.dem; +package org.orekit.rugged.core.raster; import org.apache.commons.math3.util.FastMath; import org.orekit.rugged.api.RuggedException; diff --git a/rugged-core/src/test/java/org/orekit/rugged/core/dem/CountingFactory.java b/rugged-core/src/test/java/org/orekit/rugged/core/raster/CountingFactory.java similarity index 86% rename from rugged-core/src/test/java/org/orekit/rugged/core/dem/CountingFactory.java rename to rugged-core/src/test/java/org/orekit/rugged/core/raster/CountingFactory.java index e48453e2..c336fa4a 100644 --- a/rugged-core/src/test/java/org/orekit/rugged/core/dem/CountingFactory.java +++ b/rugged-core/src/test/java/org/orekit/rugged/core/raster/CountingFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.core.dem; +package org.orekit.rugged.core.raster; -import org.orekit.rugged.core.dem.SimpleTile; -import org.orekit.rugged.core.dem.SimpleTileFactory; -import org.orekit.rugged.core.dem.TileFactory; +import org.orekit.rugged.core.raster.SimpleTile; +import org.orekit.rugged.core.raster.SimpleTileFactory; +import org.orekit.rugged.core.raster.TileFactory; public class CountingFactory implements TileFactory<SimpleTile> { diff --git a/rugged-core/src/test/java/org/orekit/rugged/core/dem/SimpleTileTest.java b/rugged-core/src/test/java/org/orekit/rugged/core/raster/SimpleTileTest.java similarity index 97% rename from rugged-core/src/test/java/org/orekit/rugged/core/dem/SimpleTileTest.java rename to rugged-core/src/test/java/org/orekit/rugged/core/raster/SimpleTileTest.java index bab7daf5..61e05f41 100644 --- a/rugged-core/src/test/java/org/orekit/rugged/core/dem/SimpleTileTest.java +++ b/rugged-core/src/test/java/org/orekit/rugged/core/raster/SimpleTileTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.core.dem; +package org.orekit.rugged.core.raster; 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.api.RuggedMessages; -import org.orekit.rugged.core.dem.SimpleTile; -import org.orekit.rugged.core.dem.SimpleTileFactory; -import org.orekit.rugged.core.dem.Tile; -import org.orekit.rugged.core.dem.Tile.Location; +import org.orekit.rugged.core.raster.SimpleTile; +import org.orekit.rugged.core.raster.SimpleTileFactory; +import org.orekit.rugged.core.raster.Tile; +import org.orekit.rugged.core.raster.Tile.Location; public class SimpleTileTest { diff --git a/rugged-core/src/test/java/org/orekit/rugged/core/dem/TilesCacheTest.java b/rugged-core/src/test/java/org/orekit/rugged/core/raster/TilesCacheTest.java similarity index 98% rename from rugged-core/src/test/java/org/orekit/rugged/core/dem/TilesCacheTest.java rename to rugged-core/src/test/java/org/orekit/rugged/core/raster/TilesCacheTest.java index ce18aee9..ea9102e3 100644 --- a/rugged-core/src/test/java/org/orekit/rugged/core/dem/TilesCacheTest.java +++ b/rugged-core/src/test/java/org/orekit/rugged/core/raster/TilesCacheTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.core.dem; +package org.orekit.rugged.core.raster; import org.apache.commons.math3.random.RandomGenerator; import org.apache.commons.math3.random.Well19937a; @@ -22,8 +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.core.dem.SimpleTile; -import org.orekit.rugged.core.dem.TilesCache; +import org.orekit.rugged.core.raster.SimpleTile; +import org.orekit.rugged.core.raster.TilesCache; public class TilesCacheTest { -- GitLab