You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ju...@apache.org on 2010/01/15 21:38:13 UTC

svn commit: r899802 - /pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSNumber.java

Author: jukka
Date: Fri Jan 15 20:38:12 2010
New Revision: 899802

URL: http://svn.apache.org/viewvc?rev=899802&view=rev
Log:
PDFBOX-604: Various text extraction performance improvements

Use a direct table lookup instead of a hash map to speed up COSNumber.get()

Modified:
    pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSNumber.java

Modified: pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSNumber.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSNumber.java?rev=899802&r1=899801&r2=899802&view=diff
==============================================================================
--- pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSNumber.java (original)
+++ pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSNumber.java Fri Jan 15 20:38:12 2010
@@ -18,9 +18,6 @@
 
 import java.io.IOException;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * This class represents an abstract number in a PDF document.
  *
@@ -29,21 +26,32 @@
  */
 public abstract class COSNumber extends COSBase
 {
+    
     /**
      * ZERO.
     */
     public static final COSInteger ZERO = new COSInteger( 0 );
+
     /**
      * ONE.
     */
     public static final COSInteger ONE = new COSInteger( 1 );
-    private static final Map COMMON_NUMBERS = new HashMap();
 
-    static
-    {
-        COMMON_NUMBERS.put( "0", ZERO );
-        COMMON_NUMBERS.put( "1", ONE );
-    }
+    /**
+     * Efficient lookup table for the ten decimal digits.
+     */
+    private static final COSInteger[] DIGITS = new COSInteger[] {
+        ZERO,
+        ONE,
+        new COSInteger(2),
+        new COSInteger(3),
+        new COSInteger(4),
+        new COSInteger(5),
+        new COSInteger(6),
+        new COSInteger(7),
+        new COSInteger(8),
+        new COSInteger(9),
+    };
 
     /**
      * This will get the float value of this number.
@@ -84,18 +92,17 @@
      */
     public static COSNumber get( String number ) throws IOException
     {
-        COSNumber result = (COSNumber)COMMON_NUMBERS.get( number );
-        if( result == null )
-        {
-            if (number.indexOf('.') >= 0)
-            {
-                result = new COSFloat( number );
-            }
-            else
-            {
-                result = new COSInteger( number );
+        if (number.length() == 1) {
+            char digit = number.charAt(0);
+            if ('0' <= digit && digit <= '9') {
+                return DIGITS[digit - '0'];
+            } else {
+                throw new IOException("Not a number: " + number);
             }
+        } else if (number.indexOf('.') == -1) {
+            return new COSInteger(number);
+        } else {
+            return new COSFloat(number);
         }
-        return result;
     }
 }