Merged the implementations of compareTo in Rectangle and TextChunk

giorgiga · jazzido · commit 3fa8a324e420 · 2017-09-14T13:57:14.000-03:00
Since both classes implement Comparable&lt;Rectangle&gt;, their compareTo
implementations have to be compatible (previously the result of
comparing a Rectangle with an RTL TextChunk depended on which compareTo
implementation happened to be used).
diff --git a/src/main/java/technology/tabula/Rectangle.java b/src/main/java/technology/tabula/Rectangle.java
@@ -19,20 +19,30 @@ public Rectangle(float top, float left, float width, float height) {
     }
 
     @Override
+    /*
+        We're comparing based on ordering in the logical ordering of text here. 
+        Assuming identical Y-axis positions, if TextChunk A has a lower X-axis 
+        than TextChunk B, then A is "before" it -- iff this is LTR text. Otherwise, 
+        it is A is after B.
+    */
     public int compareTo(Rectangle other) {
         double thisBottom = this.getBottom();
         double otherBottom = other.getBottom();
         int rv;
 
-       if (this.equals(other)) return 0;
+        if (this.equals(other)) return 0;
 
-       if (this.verticalOverlap(other) > VERTICAL_COMPARISON_THRESHOLD) {
+        if (this.verticalOverlap(other) > VERTICAL_COMPARISON_THRESHOLD) {
             rv = java.lang.Double.compare(this.getX(), other.getX());
-       }
-       else {
-           rv = java.lang.Double.compare(thisBottom, otherBottom);
-       }
-       return rv;
+
+            // reverse the ordering if both TextChunks are RTL
+            if (this.isLtrDominant() == -1 && other.isLtrDominant() == -1) {
+                rv = -1 * rv;
+            }
+        } else {
+            rv = java.lang.Double.compare(thisBottom, otherBottom);
+        }
+        return rv;
     }
 
     // I'm bad at Java and need this for fancy sorting in technology.tabula.TextChunk.
diff --git a/src/main/java/technology/tabula/TextChunk.java b/src/main/java/technology/tabula/TextChunk.java
@@ -126,33 +126,6 @@ public TextChunk groupByDirectionality(Boolean isLtrDominant) {
         return new TextChunk(everything);
     }
 
-    @Override
-    /*
-        We're comparing based on ordering in the logical ordering of text here. 
-        Assuming identical Y-axis positions, if TextChunk A has a lower X-axis 
-        than TextChunk B, then A is "before" it -- iff this is LTR text. Otherwise, 
-        it is A is after B.
-    */
-    public int compareTo(Rectangle other) {
-        double thisBottom = this.getBottom();
-        double otherBottom = other.getBottom();
-        int rv;
-
-        if (this.equals(other)) return 0;
-
-        if (this.verticalOverlap(other) > VERTICAL_COMPARISON_THRESHOLD) {
-            rv = java.lang.Double.compare(this.getX(), other.getX());
-
-            // reverse the ordering if both TextChunks are RTL
-            if (this.isLtrDominant() == -1 && other.isLtrDominant() == -1) {
-                rv = -1 * rv;
-            }
-        } else {
-            rv = java.lang.Double.compare(thisBottom, otherBottom);
-        }
-        return rv;
-    }
-
     public int isLtrDominant() {
         int ltrCnt = 0;
         int rtlCnt = 0;
