Merged pdfjet

Author: soster

src/main/java/com/pdfjet/A3.java

@@ -23,7 +23,6 @@ of this software and associated documentation files (the "Software"), to deal
 */
 package com.pdfjet;
 
-
 /**
  *  Used to specify PDF page with size <strong>A3</strong>.
  *  For more information about the page size classes - A3, A4, A5, B5, Executive, Letter, Legal and Tabloid - see the Page class.

src/main/java/com/pdfjet/A4.java

@@ -23,7 +23,6 @@ of this software and associated documentation files (the "Software"), to deal
 */
 package com.pdfjet;
 
-
 /**
  *  Used to specify PDF page with size <strong>A4</strong>.
  *  For more information about the page size classes - A3, A4, A5, B5, Executive, Letter, Legal and Tabloid - see the Page class.

src/main/java/com/pdfjet/A5.java

@@ -23,7 +23,6 @@ of this software and associated documentation files (the "Software"), to deal
 */
 package com.pdfjet;
 
-
 /**
  *  Used to specify PDF page with size <strong>A5</strong>.
  *  For more information about the page size classes - A3, A4, A5, B5, Executive, Letter, Legal and Tabloid - see the Page class.
@@ -33,4 +32,3 @@ public class A5 {
     public static final float[] PORTRAIT = new float[] {420.0f, 595.0f};
     public static final float[] LANDSCAPE = new float[] {595.0f, 420.0f};
 }
-

src/main/java/com/pdfjet/Align.java

@@ -23,11 +23,9 @@ of this software and associated documentation files (the "Software"), to deal
 */
 package com.pdfjet;
 
-
 /**
  *  Used to specify the text alignment in paragraphs.
  *  See the Paragraph class for more details.
- *
  */
  public class Align {
     public static final int LEFT    = 0x00000000;

src/main/java/com/pdfjet/Annotation.java

@@ -23,29 +23,24 @@ of this software and associated documentation files (the "Software"), to deal
 */
 package com.pdfjet;
 
-
 /**
  *  Used to create PDF annotation objects.
  *
- *
  */
 class Annotation {
-
     protected int objNumber;
     protected String uri;
     protected String key;
     protected float x1;
     protected float y1;
     protected float x2;
     protected float y2;
-
     protected String language = null;
     protected String actualText = null;
     protected String altDescription = null;
-
+    protected String contents = "TODO";
     protected FileAttachment fileAttachment = null;
 
-
     /**
      *  This class is used to create annotation objects.
      *
@@ -77,5 +72,4 @@ protected Annotation(
         this.actualText = (actualText == null) ? uri : actualText;
         this.altDescription = (altDescription == null) ? uri : altDescription;
     }
-
 }

src/main/java/com/pdfjet/B5.java

@@ -23,7 +23,6 @@ of this software and associated documentation files (the "Software"), to deal
 */
 package com.pdfjet;
 
-
 /**
  *  Used to specify PDF page with size <strong>B5</strong>.
  *  For more information about the page size classes - A3, A4, A5, B5, Executive, Letter, Legal and Tabloid - see the Page class.

src/main/java/com/pdfjet/BMPImage.java

@@ -23,13 +23,11 @@ of this software and associated documentation files (the "Software"), to deal
 */
 package com.pdfjet;
 
-
 import java.io.ByteArrayOutputStream;
 import java.util.zip.Deflater;
 import java.util.zip.DeflaterOutputStream;
 
 class BMPImage {
-
     int w = 0;              // Image width in pixels
     int h = 0;              // Image height in pixels
 
@@ -76,8 +74,7 @@ public BMPImage(java.io.InputStream is) throws Exception {
                 if (offset > 54) {
                     skipNBytes(is, offset-54);
                 }
-            }
-            else {
+            } else {
                 skipNBytes(is, 12);
                 int numpalcol = readSignedInt(is);
                 if (numpalcol == 0) {
@@ -87,8 +84,7 @@ public BMPImage(java.io.InputStream is) throws Exception {
                 parsePalette(is, numpalcol);
             }
             parseData(is);
-        }
-        else {
+        } else {
             throw new Exception("BMP data could not be parsed!");
         }
 
@@ -109,10 +105,11 @@ private void parseData(java.io.InputStream is) throws Exception {
                 case  4: row = bit4to8(row, w); break;  // opslag i palette
                 case  8: break;                         // opslag i palette
                 case 16:
-                    if (r5g6b5)
+                    if (r5g6b5) {
                         row = bit16to24(row, w);        // 5,6,5 bit
-                    else
+                    } else {
                         row = bit16to24b(row, w);
+                    }
                     break;
                 case 24: break;                         // bytes are correct
                 case 32: row = bit32to24(row, w); break;
@@ -188,8 +185,7 @@ private static byte[] bit4to8(byte[] row, int width) {
         for(int i = 0; i < width; i++) {
             if (i % 2 == 0) {
                 ret[i] =(byte) ((row[i/2] & m11110000)>>4);
-            }
-            else {
+            } else {
                 ret[i] =(byte) ((row[i/2] & m00001111));
             }
         }
@@ -268,5 +264,4 @@ public int getHeight() {
     public byte[] getData() {
         return this.deflated;
     }
-
 }