From ca55eb54e1d4559e2ccb53681322e688fb08cadc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Harrtell?= Date: Mon, 13 Nov 2017 19:30:36 +0100 Subject: [PATCH] Make internal query methods explicitly named internal to avoid complex overload resolution MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Harrtell --- .../jts/index/strtree/AbstractSTRtree.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractSTRtree.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractSTRtree.java index 07898782b0..b65203f3e0 100644 --- a/modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractSTRtree.java +++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractSTRtree.java @@ -247,7 +247,7 @@ protected List query(Object searchBounds) { return matches; } if (getIntersectsOp().intersects(root.getBounds(), searchBounds)) { - query(searchBounds, root, matches); + queryInternal(searchBounds, root, matches); } return matches; } @@ -263,7 +263,7 @@ protected void query(Object searchBounds, ItemVisitor visitor) { return; } if (getIntersectsOp().intersects(root.getBounds(), searchBounds)) { - query(searchBounds, root, visitor); + queryInternal(searchBounds, root, visitor); } } @@ -274,7 +274,7 @@ protected void query(Object searchBounds, ItemVisitor visitor) { */ protected abstract IntersectsOp getIntersectsOp(); - private void query(Object searchBounds, AbstractNode node, List matches) { + private void queryInternal(Object searchBounds, AbstractNode node, List matches) { List childBoundables = node.getChildBoundables(); for (int i = 0; i < childBoundables.size(); i++) { Boundable childBoundable = (Boundable) childBoundables.get(i); @@ -282,7 +282,7 @@ private void query(Object searchBounds, AbstractNode node, List matches) { continue; } if (childBoundable instanceof AbstractNode) { - query(searchBounds, (AbstractNode) childBoundable, matches); + queryInternal(searchBounds, (AbstractNode) childBoundable, matches); } else if (childBoundable instanceof ItemBoundable) { matches.add(((ItemBoundable)childBoundable).getItem()); @@ -293,7 +293,7 @@ else if (childBoundable instanceof ItemBoundable) { } } - private void query(Object searchBounds, AbstractNode node, ItemVisitor visitor) { + private void queryInternal(Object searchBounds, AbstractNode node, ItemVisitor visitor) { List childBoundables = node.getChildBoundables(); for (int i = 0; i < childBoundables.size(); i++) { Boundable childBoundable = (Boundable) childBoundables.get(i); @@ -301,7 +301,7 @@ private void query(Object searchBounds, AbstractNode node, ItemVisitor visitor) continue; } if (childBoundable instanceof AbstractNode) { - query(searchBounds, (AbstractNode) childBoundable, visitor); + queryInternal(searchBounds, (AbstractNode) childBoundable, visitor); } else if (childBoundable instanceof ItemBoundable) { visitor.visitItem(((ItemBoundable)childBoundable).getItem());