Skip to content

Commit 5fa638c

Browse files
committed
Apply intellij refactor
Signed-off-by: Mike Barry <[email protected]>
1 parent f36b892 commit 5fa638c

File tree

385 files changed

+1350
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+1350
-93
lines changed

modules/app/src/main/java/org/locationtech/jtstest/function/BufferFunctions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ public static Geometry bufferEach(Geometry g, final double distance)
181181
{
182182
return GeometryMapper.map(g, new MapOp() {
183183

184+
@Override
184185
public Geometry map(Geometry g)
185186
{
186187
return g.buffer(distance);

modules/app/src/main/java/org/locationtech/jtstest/function/GeometryFunctions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public static Geometry getPolygonHoles(Geometry geom)
8686
final List holePolys = new ArrayList();
8787
geom.apply(new GeometryFilter() {
8888

89+
@Override
8990
public void filter(Geometry geom) {
9091
if (geom instanceof Polygon) {
9192
Polygon poly = (Polygon) geom;

modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNGFunctions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public static Geometry union(Geometry a,
5050
public static Geometry unaryUnion(Geometry a) {
5151
UnionStrategy unionSRFun = new UnionStrategy() {
5252

53+
@Override
5354
public Geometry union(Geometry g0, Geometry g1) {
5455
return OverlayNG.overlay(g0, g1, UNION );
5556
}

modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNGRobustFunctions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public static Geometry symDifference(Geometry a, Geometry b) {
5555
public static Geometry unaryUnion(Geometry a) {
5656
UnionStrategy unionSRFun = new UnionStrategy() {
5757

58+
@Override
5859
public Geometry union(Geometry g0, Geometry g1) {
5960
return overlay(g0, g1, UNION );
6061
}

modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNGSnappingFunctions.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ private static Noder getNoder(double tolerance) {
4747
public static Geometry unaryUnion(Geometry a, double tolerance) {
4848
UnionStrategy unionSRFun = new UnionStrategy() {
4949

50+
@Override
5051
public Geometry union(Geometry g0, Geometry g1) {
5152
return OverlayNGSnappingFunctions.union(g0, g1, tolerance );
5253
}
@@ -69,6 +70,7 @@ private static Geometry unionNoValid(Geometry a, Geometry b, double tolerance) {
6970
public static Geometry unaryUnionNoValid(Geometry a, double tolerance) {
7071
UnionStrategy unionSRFun = new UnionStrategy() {
7172

73+
@Override
7274
public Geometry union(Geometry g0, Geometry g1) {
7375
return OverlayNGSnappingFunctions.unionNoValid(g0, g1, tolerance );
7476
}

modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNoSnapFunctions.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ public class OverlayNoSnapFunctions {
2626
public static Geometry unaryUnion(Geometry a) {
2727
UnionStrategy unionSRFun = new UnionStrategy() {
2828

29-
public Geometry union(Geometry g0, Geometry g1) {
29+
@Override
30+
public Geometry union(Geometry g0, Geometry g1) {
3031
return OverlayOp.overlayOp(g0, g1, OverlayOp.UNION );
3132
}
3233

modules/app/src/main/java/org/locationtech/jtstest/function/PolygonOverlayFunctions.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public static Geometry overlaySR(Geometry g1, Geometry g2,
3939
{
4040
PrecisionModel pm = new PrecisionModel(scale);
4141
return computeOverlay(g1, g2, new Noder() {
42+
@Override
4243
public Geometry node(Geometry inputLines) {
4344
return OverlayNG.overlay(inputLines, null, OverlayNG.UNION, pm);
4445
}
@@ -48,6 +49,7 @@ public Geometry node(Geometry inputLines) {
4849
public static Geometry overlay(Geometry g1, Geometry g2)
4950
{
5051
return computeOverlay(g1, g2, new Noder( ) {
52+
@Override
5153
public Geometry node(Geometry inputLines) {
5254
return OverlayNGRobust.overlay(inputLines, null, OverlayNG.UNION);
5355
}

modules/app/src/main/java/org/locationtech/jtstest/function/SelectionFunctions.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class SelectionFunctions
2525
public static Geometry intersects(Geometry a, final Geometry mask)
2626
{
2727
return select(a, new GeometryPredicate() {
28+
@Override
2829
public boolean isTrue(Geometry g) {
2930
return mask.intersects(g);
3031
}
@@ -34,6 +35,7 @@ public boolean isTrue(Geometry g) {
3435
public static Geometry covers(Geometry a, final Geometry mask)
3536
{
3637
return select(a, new GeometryPredicate() {
38+
@Override
3739
public boolean isTrue(Geometry g) {
3840
return g.covers(mask);
3941
}
@@ -43,6 +45,7 @@ public boolean isTrue(Geometry g) {
4345
public static Geometry coveredBy(Geometry a, final Geometry mask)
4446
{
4547
return select(a, new GeometryPredicate() {
48+
@Override
4649
public boolean isTrue(Geometry g) {
4750
return g.coveredBy(mask);
4851
}
@@ -85,6 +88,7 @@ public static Geometry invalid(Geometry a)
8588
public static Geometry lengthGreaterThan(Geometry a, final double minLen)
8689
{
8790
return select(a, new GeometryPredicate() {
91+
@Override
8892
public boolean isTrue(Geometry g) {
8993
return g.getLength() > minLen;
9094
}
@@ -93,6 +97,7 @@ public boolean isTrue(Geometry g) {
9397
public static Geometry lengthLessThan(Geometry a, final double maxLen)
9498
{
9599
return select(a, new GeometryPredicate() {
100+
@Override
96101
public boolean isTrue(Geometry g) {
97102
return g.getLength() < maxLen;
98103
}
@@ -101,6 +106,7 @@ public boolean isTrue(Geometry g) {
101106
public static Geometry lengthZero(Geometry a)
102107
{
103108
return select(a, new GeometryPredicate() {
109+
@Override
104110
public boolean isTrue(Geometry g) {
105111
return g.getLength() == 0.0;
106112
}
@@ -109,6 +115,7 @@ public boolean isTrue(Geometry g) {
109115
public static Geometry areaGreaterThan(Geometry a, final double minArea)
110116
{
111117
return select(a, new GeometryPredicate() {
118+
@Override
112119
public boolean isTrue(Geometry g) {
113120
return g.getArea() > minArea;
114121
}
@@ -117,6 +124,7 @@ public boolean isTrue(Geometry g) {
117124
public static Geometry areaLessThan(Geometry a, final double maxArea)
118125
{
119126
return select(a, new GeometryPredicate() {
127+
@Override
120128
public boolean isTrue(Geometry g) {
121129
return g.getArea() < maxArea;
122130
}
@@ -125,6 +133,7 @@ public boolean isTrue(Geometry g) {
125133
public static Geometry areaZero(Geometry a)
126134
{
127135
return select(a, new GeometryPredicate() {
136+
@Override
128137
public boolean isTrue(Geometry g) {
129138
return g.getArea() == 0.0;
130139
}
@@ -133,6 +142,7 @@ public boolean isTrue(Geometry g) {
133142
public static Geometry within(Geometry a, final Geometry mask)
134143
{
135144
return select(a, new GeometryPredicate() {
145+
@Override
136146
public boolean isTrue(Geometry g) {
137147
return g.within(mask);
138148
}
@@ -142,6 +152,7 @@ public boolean isTrue(Geometry g) {
142152
public static Geometry interiorPointWithin(Geometry a, final Geometry mask)
143153
{
144154
return select(a, new GeometryPredicate() {
155+
@Override
145156
public boolean isTrue(Geometry g) {
146157
return g.getInteriorPoint().within(mask);
147158
}
@@ -151,6 +162,7 @@ public boolean isTrue(Geometry g) {
151162
public static Geometry withinDistance(Geometry a, final Geometry mask, double maximumDistance)
152163
{
153164
return select(a, new GeometryPredicate() {
165+
@Override
154166
public boolean isTrue(Geometry g) {
155167
return mask.isWithinDistance(g, maximumDistance);
156168
}
@@ -161,6 +173,7 @@ public static Geometry withinDistanceIndexed(Geometry a, final Geometry mask, do
161173
{
162174
IndexedFacetDistance indexedDist = new IndexedFacetDistance(mask);
163175
return select(a, new GeometryPredicate() {
176+
@Override
164177
public boolean isTrue(Geometry g) {
165178
boolean isWithinDist = indexedDist.isWithinDistance(g, maximumDistance);
166179
return isWithinDist;

modules/app/src/main/java/org/locationtech/jtstest/function/SpatialIndexFunctions.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ public static Geometry hprTreeQueryCached(Geometry geoms, Geometry queryEnv)
271271
private static void loadIndex(Geometry geom, SpatialIndex index) {
272272
geom.apply(new GeometryFilter() {
273273

274+
@Override
274275
public void filter(Geometry geom) {
275276
// only insert atomic geometries
276277
if (geom instanceof GeometryCollection) return;
@@ -360,6 +361,7 @@ private static Quadtree buildQuadtree(Geometry geom) {
360361
final Quadtree index = new Quadtree();
361362
geom.apply(new GeometryFilter() {
362363

364+
@Override
363365
public void filter(Geometry geom) {
364366
// only insert atomic geometries
365367
if (geom instanceof GeometryCollection) return;

modules/app/src/main/java/org/locationtech/jtstest/function/TriangleFunctions.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public static Geometry centroid(Geometry g)
2626
{
2727
return GeometryMapper.map(g,
2828
new GeometryMapper.MapOp() {
29+
@Override
2930
public Geometry map(Geometry g) {
3031
Coordinate[] pts = trianglePts(g);
3132
Coordinate cc = Triangle.centroid(pts[0], pts[1], pts[2]);
@@ -38,6 +39,7 @@ public static Geometry circumcentre(Geometry g)
3839
{
3940
return GeometryMapper.map(g,
4041
new GeometryMapper.MapOp() {
42+
@Override
4143
public Geometry map(Geometry g) {
4244
Coordinate[] pts = trianglePts(g);
4345
Coordinate cc = Triangle.circumcentre(pts[0], pts[1], pts[2]);
@@ -65,6 +67,7 @@ public static Geometry circumcentreDD(Geometry g)
6567
{
6668
return GeometryMapper.map(g,
6769
new GeometryMapper.MapOp() {
70+
@Override
6871
public Geometry map(Geometry g) {
6972
Coordinate[] pts = trianglePts(g);
7073
Coordinate cc = Triangle.circumcentreDD(pts[0], pts[1], pts[2]);
@@ -92,6 +95,7 @@ public static Geometry incentre(Geometry g)
9295
{
9396
return GeometryMapper.map(g,
9497
new GeometryMapper.MapOp() {
98+
@Override
9599
public Geometry map(Geometry g) {
96100
Coordinate[] pts = trianglePts(g);
97101
Coordinate cc = Triangle.inCentre(pts[0], pts[1], pts[2]);

0 commit comments

Comments
 (0)