refactored xref offset. RES-713

Author: michaeldemey

src/main/java/com/itextpdf/rups/view/itext/ObjectStreamParser.java

@@ -15,7 +15,6 @@
  * Utility class to parse ObjectStreams to extract the offset of a given object id within the stream.
  */
 public class ObjectStreamParser {
-
     /**
      * Parses an ObjectStream to find the offset to the passed parameter, compressedObjectNumber. This offset is
      * relative to the ObjectStream and not to the complete file, as described in the specification.
@@ -26,7 +25,7 @@ public class ObjectStreamParser {
      * @param compressedObjectNumber the ID of the object of which you want the offset
      * @return the offset of the object or -1 if the object is not found
      */
-    public int parseObjectStream(PdfStream objStm, int compressedObjectNumber) {
+    public static int parseObjectStream(PdfStream objStm, int compressedObjectNumber) {
         byte[] objStmBytes = objStm.getBytes(true);
         int byteOffsetOfFirst = objStm.getAsInt(PdfName.First);
 

src/main/java/com/itextpdf/rups/view/itext/XRefTable.java

@@ -42,9 +42,6 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.rups.view.itext;
 
-import com.itextpdf.io.source.PdfTokenizer;
-import com.itextpdf.io.source.RandomAccessFileOrArray;
-import com.itextpdf.io.source.RandomAccessSourceFactory;
 import com.itextpdf.kernel.pdf.*;
 import com.itextpdf.rups.controller.PdfReaderController;
 import com.itextpdf.rups.event.RupsEvent;
@@ -58,8 +55,6 @@ This file is part of the iText (R) project.
 import javax.swing.JTable;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.table.TableColumn;
-import java.io.IOException;
-import java.util.Arrays;
 import java.util.Observable;
 import java.util.Observer;
 
@@ -182,28 +177,34 @@ private String getByteOffSetByRow(int rowIndex) {
         final PdfObject object = objects.getObjectByIndex(rowIndex);
         PdfIndirectReference indirectReference = object.getIndirectReference();
         if ( indirectReference != null ) {
-            long offset = indirectReference.getOffset();
-
-            if ( offset == -1 ) {
-                int objStreamNumber = indirectReference.getObjStreamNumber();
-                PdfObject refersTo = indirectReference.getRefersTo();
-                int compressedObjectNumber = refersTo.getIndirectReference().getObjNumber();
-                PdfObject objectByIndex = objects.loadObjectByReference(objStreamNumber);
-
-                PdfStream objStm = (PdfStream) objectByIndex;
-                int internalCompressedObjectOffset = new ObjectStreamParser().parseObjectStream(objStm, compressedObjectNumber);
+            if (isObjectStream(indirectReference)) {
+                int compressedObjectNumber = indirectReference.getObjNumber();
+                PdfStream objStm = getObjectStream(indirectReference);
+                int internalCompressedObjectOffset
+                        = ObjectStreamParser.parseObjectStream(objStm, compressedObjectNumber);
 
                 return String.format(
                         Language.XREF_BYTE_OFFSET_OBJECT_STREAM.getString(),
-                        objStreamNumber, internalCompressedObjectOffset
+                        objStm.getIndirectReference().getObjNumber(), internalCompressedObjectOffset
                 );
             }
 
-            return String.valueOf(offset);
+            return String.valueOf(indirectReference.getOffset());
         }
         return Language.XREF_NOT_LOADED_YET.getString();
     }
 
+    private PdfStream getObjectStream(PdfIndirectReference indirectReference) {
+        int objStreamNumber = indirectReference.getObjStreamNumber();
+        PdfObject objectByIndex = objects.loadObjectByReference(objStreamNumber);
+
+        return (PdfStream) objectByIndex;
+    }
+
+    private boolean isObjectStream(PdfIndirectReference indirectReference) {
+        return indirectReference.getOffset() == -1;
+    }
+
 
     /**
      * @see javax.swing.JTable#getColumnName(int)