Remove return value, rename

dr-jts · Jan 22, 2024 · c6931a2 · c6931a2
1 parent 1a3d87a
commit c6931a2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relateng/IMPredicate.java b/modules/core/src/main/java/org/locationtech/jts/operation/relateng/IMPredicate.java
@@ -64,7 +64,7 @@ protected int valuePartial() {
     return TopologyPredicateValue.UNKNOWN;
   }
 
-  protected void requireCovers(Envelope a, Envelope b) {
+  protected void setRequireCovers(Envelope a, Envelope b) {
     setRequire(a.covers(b));
   }
 

diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/relateng/TopologyBuilder.java b/modules/core/src/main/java/org/locationtech/jts/operation/relateng/TopologyBuilder.java
@@ -132,17 +132,18 @@ public boolean isSelfNodingRequired() {
    * @param dimension
    * @return true if the value of the predicate changed
    */
-  private boolean updateDim(int locA, int locB, int dimension) {
+  private void updateDim(int locA, int locB, int dimension) {
     predicate.updateDim(locA, locB, dimension);
-    return true;
   }
 
-  private boolean updateDim(boolean isAB, int loc1, int loc2, int dimension) {
+  private void updateDim(boolean isAB, int loc1, int loc2, int dimension) {
     if (isAB) {
-      return updateDim(loc1, loc2, dimension);
+      updateDim(loc1, loc2, dimension);
+    }
+    else {
+      // is ordered BA
+      updateDim(loc2, loc1, dimension);
     }
-    // is ordered BA
-    return updateDim(loc2, loc1, dimension);
   }
 
   public boolean isResultKnown() {

diff --git a/.../core/src/main/java/org/locationtech/jts/operation/relateng/TopologyPredicateFactory.java b/.../core/src/main/java/org/locationtech/jts/operation/relateng/TopologyPredicateFactory.java
@@ -78,7 +78,7 @@ public void init(int dimA, int dimB) {
 
     @Override
     public void init(Envelope envA, Envelope envB) {
-      requireCovers(envA, envB);
+      setRequireCovers(envA, envB);
     }
 
     @Override
@@ -106,7 +106,7 @@ public void init(int dimA, int dimB) {
 
       @Override
       public void init(Envelope envA, Envelope envB) {
-        requireCovers(envA, envB);
+        setRequireCovers(envA, envB);
       }
 
       @Override
@@ -134,7 +134,7 @@ public void init(int dimA, int dimB) {
 
     @Override
     public void init(Envelope envA, Envelope envB) {
-      requireCovers(envB, envA);
+      setRequireCovers(envB, envA);
     }
 
     @Override
@@ -160,7 +160,7 @@ public void init(int dimA, int dimB) {
 
       @Override
       public void init(Envelope envA, Envelope envB) {
-        requireCovers(envB, envA);
+        setRequireCovers(envB, envA);
       }
 
       @Override