Skip to content

Implement overrides make overload resolution more explicit #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bjornharrtell wants to merge 1 commit into from
Closed

Implement overrides make overload resolution more explicit #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/core/src/main/java/org/locationtech/jts/index/strtree/AbstractSTRtree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ protected void query(Object searchBounds, ItemVisitor visitor) {
*/
protected abstract IntersectsOp getIntersectsOp();

private void query(Object searchBounds, AbstractNode node, List matches) {
protected void query(Object searchBounds, AbstractNode node, List matches) {
List childBoundables = node.getChildBoundables();
for (int i = 0; i < childBoundables.size(); i++) {
Boundable childBoundable = (Boundable) childBoundables.get(i);
Expand All @@ -293,7 +293,7 @@ else if (childBoundable instanceof ItemBoundable) {
}
}

private void query(Object searchBounds, AbstractNode node, ItemVisitor visitor) {
protected void query(Object searchBounds, AbstractNode node, ItemVisitor visitor) {
List childBoundables = node.getChildBoundables();
for (int i = 0; i < childBoundables.size(); i++) {
Boundable childBoundable = (Boundable) childBoundables.get(i);
Expand Down
12 changes: 12 additions & 0 deletions modules/core/src/main/java/org/locationtech/jts/index/strtree/SIRtree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import java.util.Iterator;
import java.util.List;

import org.locationtech.jts.index.ItemVisitor;

/**
* One-dimensional version of an STR-packed R-tree. SIR stands for
* "Sort-Interval-Recursive". STR-packed R-trees are described in:
Expand Down Expand Up @@ -83,6 +85,16 @@ public void insert(double x1, double x2, Object item) {
super.insert(new Interval(Math.min(x1, x2), Math.max(x1, x2)), item);
}

@Override
protected void query(Object searchBounds, AbstractNode node, List matches) {
super.query(searchBounds, node, matches);
}

@Override
protected void query(Object searchBounds, AbstractNode node, ItemVisitor visitor) {
super.query(searchBounds, node, visitor);
}

/**
* Returns items whose bounds intersect the given value.
*/
Expand Down
10 changes: 10 additions & 0 deletions modules/core/src/main/java/org/locationtech/jts/index/strtree/STRtree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,16 @@ public void insert(Envelope itemEnv, Object item) {
super.insert(itemEnv, item);
}

@Override
protected void query(Object searchBounds, AbstractNode node, List matches) {
super.query(searchBounds, node, matches);
}

@Override
protected void query(Object searchBounds, AbstractNode node, ItemVisitor visitor) {
super.query(searchBounds, node, visitor);
}

/**
* Returns items whose bounds intersect the given envelope.
*/
Expand Down