(no commit message)

diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index 9c3a896760b74e25d91a7b03eda483b08b024ef5..2bb20f19cead100858b11c6d2a32efc408c09766 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -32,7 +32,6 @@ file.reference.bcprov-jdk16-146.jar=H:\\Works\\Java\\jar\\bcprov-jdk16-146.jar
 file.reference.commons-logging-1.1.1.jar=H:\\Works\\Java\\jar\\commons-logging-1.1.1.jar\r
 file.reference.fontbox-1.6.0.jar=H:\\Works\\Java\\jar\\fontbox-1.6.0.jar\r
 file.reference.FWSTK_Resources.jar=..\\FWSTK_Resources\\dist\\FWSTK_Resources.jar\r
-file.reference.icu4j-4_6_1.jar=H:\\Works\\Java\\jar\\icu4j-4_6_1.jar\r
 file.reference.Java-resources=../../../../Java/resources\r
 file.reference.jempbox-1.6.0.jar=H:\\Works\\Java\\jar\\jempbox-1.6.0.jar\r
 file.reference.pdfbox-1.6.0.jar=H:\\Works\\Java\\jar\\pdfbox-1.6.0.jar\r
@@ -43,14 +42,13 @@ jar.compress=false
 jar.index=${jnlp.enabled}\r
 javac.classpath=\\r
     ${file.reference.avalon-framework-4.1.4.jar}:\\r
-    ${file.reference.icu4j-4_6_1.jar}:\\r
     ${file.reference.bcprov-jdk16-146.jar}:\\r
     ${file.reference.bcmail-jdk16-146.jar}:\\r
     ${file.reference.commons-logging-1.1.1.jar}:\\r
-    ${file.reference.jempbox-1.6.0.jar}:\\r
+    ${file.reference.FWSTK_Resources.jar}:\\r
     ${file.reference.fontbox-1.6.0.jar}:\\r
-    ${file.reference.pdfbox-1.6.0.jar}:\\r
-    ${file.reference.FWSTK_Resources.jar}\r
+    ${file.reference.jempbox-1.6.0.jar}:\\r
+    ${file.reference.pdfbox-1.6.0.jar}\r
 # Space-separated list of extra javac options\r
 javac.compilerargs=\r
 javac.deprecation=false\r

diff --git a/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java b/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
index 30c61bfe5154283f521788f3f7e1df97381a2644..2759a8332afbaac18f2a617969fbe6d5dbf9cf0d 100644 (file)
--- a/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
+++ b/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
@@ -199,6 +199,8 @@ public class PDFStreamEngine {
         * @throws IOException if there is an error accessing the stream.
         */
        public void processStream(PDPage aPage, PDResources resources, COSStream cosStream) throws IOException {
+               System.out.println("blabla");
+               
                graphicsState = new PDGraphicsState(aPage.findCropBox());
                textMatrix = null;
                textLineMatrix = null;
@@ -382,7 +384,8 @@ public class PDFStreamEngine {
                                                c = c.toLowerCase();
                                        }
                                }
-                       } catch (NullPointerException | StringIndexOutOfBoundsException e) {
+                       } catch (NullPointerException e) {
+                       } catch (StringIndexOutOfBoundsException e1) {
                        }
 
 
@@ -399,13 +402,13 @@ public class PDFStreamEngine {
                                ef = this.getExternalFont(font.getBaseFont());
 
                                if (ef != null) {
-                                       characterHorizontalDisplacementText = Math.max(ef.getFontWidth(string, i, codeLength),ef.getStringWidth(c));
+                                       characterHorizontalDisplacementText = Math.max(ef.getFontWidth(string, i, codeLength), ef.getStringWidth(c));
                                        characterVerticalDisplacementText = ef.getFontHeight(string, i, codeLength);
                                }
                        }
 
                        if (characterHorizontalDisplacementText == 0.0f && ef != null) {
-                               System.out.println(c+":"+ef.getStringWidth(c));
+                               System.out.println(c + ":" + ef.getStringWidth(c));
                        }
 
                        // multiply the width/height with the scaling factor