Apache Lucene open-source search software
More tidying to make lint happy
Karl David Wright5fec8efe4edf
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePath.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePath.javaindex 30a907a71f4..524451ac68a 100644--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePath.java+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoDegeneratePath.java@@ -463,6 +463,7 @@ class GeoDegeneratePath extends GeoBasePath {* @param z is the point z.* @return true of within.*/+ @Overridepublic boolean isWithin(final double x, final double y, final double z) {return this.point.isIdentical(x, y, z);}@@ -554,10 +555,10 @@ class GeoDegeneratePath extends GeoBasePath {/*** Get the bounds for a segment endpoint.*- * @param planetModel is the planet model.* @param bounds are the bounds to be modified.*/- public void getBounds(final PlanetModel planetModel, Bounds bounds) {+ @Override+ public void getBounds(final Bounds bounds) {bounds.addPoint(point);}@@ -771,7 +772,6 @@ class GeoDegeneratePath extends GeoBasePath {/*** Compute interior path distance.*- * @param planetModel is the planet model.* @param distanceStyle is the distance style.* @param x is the point x.* @param y is the point y.@@ -831,7 +831,6 @@ class GeoDegeneratePath extends GeoBasePath {/*** Compute external distance.*- * @param planetModel is the planet model.* @param distanceStyle is the distance style.* @param x is the point x.* @param y is the point y.@@ -851,7 +850,6 @@ class GeoDegeneratePath extends GeoBasePath {/*** Determine if this endpoint intersects a specified plane.*- * @param planetModel is the planet model.* @param p is the plane.* @param notablePoints are the points associated with the plane.* @param bounds are any bounds which the intersection must lie within.@@ -883,7 +881,6 @@ class GeoDegeneratePath extends GeoBasePath {/*** Get the bounds for a segment endpoint.*- * @param planetModel is the planet model.* @param bounds are the bounds to be modified.*/@Overridediff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoStandardPath.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoStandardPath.javaindex 49080a6ce46..ea069410aa8 100755--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoStandardPath.java+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoStandardPath.java@@ -1146,20 +1146,6 @@ class GeoStandardPath extends GeoBasePath {public String toString() {return "CutoffSingleCircleSegmentEndpoint: " + super.toString();}-- @Override- public void getBounds(final Bounds bounds) {- super.getBounds(bounds);- bounds.addPlane(planetModel, circlePlane, cutoffPlane);- bounds.addPlane(planetModel, cutoffPlane, circlePlane);- bounds.addIntersection(planetModel, circlePlane, cutoffPlane);- bounds.addIntersection(planetModel, cutoffPlane, circlePlane);- }-- @Override- public String toString() {- return "CutoffSingleCircleSegmentEndpoint: " + super.toString();- }}/**diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.javaindex 06de31af10a..ccafbae3574 100755--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java@@ -415,9 +415,9 @@ public class TestGeoPath extends LuceneTestCase {// Construct a path with a widthfinal GeoPath legacyPath = GeoPathFactory.makeGeoPath(PlanetModel.SPHERE, 1e-6, pathPoints);// Compute the inside distance to the atPoint using zero-width path- final double distance = thisPath.computeNearestDistance(DistanceStyle.ARC, carPoint);+ // final double distance = thisPath.computeNearestDistance(DistanceStyle.ARC, carPoint);// Compute the inside distance using legacy path- final double legacyDistance = legacyPath.computeNearestDistance(DistanceStyle.ARC, carPoint);+ // final double legacyDistance = legacyPath.computeNearestDistance(DistanceStyle.ARC, carPoint);// Compute the inside distance using the legacy formulafinal double oldFormulaDistance = thisPath.computeDistance(DistanceStyle.ARC, carPoint);// Compute the inside distance using the legacy formula with the legacy shape