You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2021/11/14 10:43:25 UTC
svn commit: r1895018 - in /pdfbox/branches/2.0/pdfbox/src: main/java/org/apache/pdfbox/text/ main/java/org/apache/pdfbox/util/ test/java/org/apache/pdfbox/util/
Author: tilman
Date: Sun Nov 14 10:43:24 2021
New Revision: 1895018
URL: http://svn.apache.org/viewvc?rev=1895018&view=rev
Log:
PDFBOX-5308: use MergeSort instead of QuickSort, as suggested by Alistair Oldfield
Added:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/IterativeMergeSort.java
- copied unchanged from r1895014, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/IterativeMergeSort.java
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestSort.java
- copied, changed from r1894921, pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestQuickSort.java
Removed:
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestQuickSort.java
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java?rev=1895018&r1=1895017&r2=1895018&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java Sun Nov 14 10:43:24 2021
@@ -47,7 +47,7 @@ import org.apache.pdfbox.pdmodel.PDPageT
import org.apache.pdfbox.pdmodel.common.PDRectangle;
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
import org.apache.pdfbox.pdmodel.interactive.pagenavigation.PDThreadBead;
-import org.apache.pdfbox.util.QuickSort;
+import org.apache.pdfbox.util.IterativeMergeSort;
/**
* This class will take a pdf document and strip out all of the text and ignore the formatting and such. Please note; it
@@ -507,7 +507,7 @@ public class PDFTextStripper extends Leg
}
catch (IllegalArgumentException e)
{
- QuickSort.sort(textList, comparator);
+ IterativeMergeSort.sort(textList, comparator);
}
}
Copied: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestSort.java (from r1894921, pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestQuickSort.java)
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestSort.java?p2=pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestSort.java&p1=pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestQuickSort.java&r1=1894921&r2=1895018&rev=1895018&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestQuickSort.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/util/TestSort.java Sun Nov 14 10:43:24 2021
@@ -17,6 +17,7 @@
package org.apache.pdfbox.util;
import java.util.Arrays;
+import java.util.Comparator;
import java.util.List;
import java.util.Random;
import junit.framework.TestCase;
@@ -25,17 +26,25 @@ import junit.framework.TestCase;
*
* @author Uwe Pachler
*/
-public class TestQuickSort extends TestCase
+public class TestSort extends TestCase
{
<T extends Comparable<T>> void doTest(T[] input, T[] expected)
{
- List<T> list = Arrays.asList(input);
+ List<T> list = Arrays.asList(input.clone());
QuickSort.sort(list);
+ assertTrue(Arrays.equals(list.toArray(new Object[input.length]), expected));
- boolean equal = Arrays.equals(list.toArray(new Object[input.length]), expected);
-
- assertTrue(equal);
+ list = Arrays.asList(input.clone());
+ IterativeMergeSort.sort(list, new Comparator<T>()
+ {
+ @Override
+ public int compare(T comparable, T o)
+ {
+ return comparable.compareTo(o);
+ }
+ });
+ assertTrue(Arrays.equals(list.toArray(new Object[input.length]), expected));
}
/**