Get rid of some redundant checks, minor fixes

DEVSIX-608

Author: yulian-gaponenko

forms/src/main/java/com/itextpdf/forms/PdfAcroForm.java

@@ -707,18 +707,18 @@ public void flattenFields() {
             }
 
             PdfArray fFields = getFields();
-            removeObjectFromArray(fFields, fieldObject);
+            fFields.remove(fieldObject);
             if (annotation != null) {
                 page.removeAnnotation(annotation);
             }
             PdfDictionary parent = fieldObject.getAsDictionary(PdfName.Parent);
             if (parent != null) {
                 PdfArray kids = parent.getAsArray(PdfName.Kids);
-                removeObjectFromArray(kids, fieldObject);
+                kids.remove(fieldObject);
                 // TODO what if parent was in it's turn the only child of it's parent (parent of parent)?
                 // shouldn't we remove them recursively? check it
                 if (kids.isEmpty()) {
-                    removeObjectFromArray(fFields, parent);
+                    fFields.remove(parent);
                 }
             }
         }
@@ -755,13 +755,15 @@ public boolean removeField(String fieldName) {
 
         PdfDictionary parent = field.getParent();
         if (parent != null) {
-            removeObjectFromArray(parent.getAsArray(PdfName.Kids), fieldObject);
+            parent.getAsArray(PdfName.Kids).remove(fieldObject);
             fields.remove(fieldName);
             return true;
         }
 
-        if (removeObjectFromArray(getFields(), fieldObject)) {
-            fields.remove(fieldName);
+        PdfArray fieldsPdfArray = getFields();
+        if (fieldsPdfArray.contains(fieldObject)) {
+            fieldsPdfArray.remove(fieldObject);
+            this.fields.remove(fieldName);
             return true;
         }
         return false;
@@ -904,9 +906,6 @@ private PdfDictionary processKids(PdfArray kids, PdfDictionary parent, PdfPage p
         } else {
             for (int i = 0; i < kids.size(); i++) {
                 PdfObject kid = kids.get(i);
-                if (kid.isIndirectReference()) {
-                    kid = ((PdfIndirectReference) kid).getRefersTo();
-                }
                 PdfArray otherKids = ((PdfDictionary) kid).getAsArray(PdfName.Kids);
                 if (otherKids != null) {
                     processKids(otherKids, (PdfDictionary) kid, page);
@@ -1100,15 +1099,4 @@ private Set<PdfFormField> prepareFieldsForFlattening(PdfFormField field) {
         }
         return preparedFields;
     }
-
-    private boolean removeObjectFromArray(PdfArray array, PdfObject toRemove) {
-        if (array.contains(toRemove)) {
-            array.remove(toRemove);
-            return true;
-        } else if (array.contains(toRemove.getIndirectReference())) {
-            array.remove(toRemove.getIndirectReference());
-            return true;
-        }
-        return false;
-    }
 }

forms/src/main/java/com/itextpdf/forms/fields/PdfFormField.java

@@ -990,9 +990,6 @@ public PdfFormField setValue(String value) {
             if (kids != null) {
                 for (int i = 0; i < kids.size(); i++) {
                     PdfObject kid = kids.get(i);
-                    if (kid.isIndirectReference()) {
-                        kid = ((PdfIndirectReference) kid).getRefersTo();
-                    }
                     PdfFormField field = new PdfFormField((PdfDictionary) kid);
                     field.font = font;
                     field.fontSize = fontSize;
@@ -1472,9 +1469,6 @@ public List<PdfWidgetAnnotation> getWidgets() {
         if (kids != null) {
             for (int i = 0; i < kids.size(); i++) {
                 PdfObject kid = kids.get(i);
-                if (kid.isIndirectReference()) {
-                    kid = ((PdfIndirectReference) kid).getRefersTo();
-                }
                 subType = ((PdfDictionary) kid).getAsName(PdfName.Subtype);
                 if (subType != null && subType.equals(PdfName.Widget)) {
                     widgets.add((PdfWidgetAnnotation) PdfAnnotation.makeAnnotation(kid));
@@ -1965,9 +1959,6 @@ public boolean regenerateField() {
                 if (null != kids) {
                     for (int i = 0; i < kids.size(); i++) {
                         PdfObject kid = kids.get(i);
-                        if (kid.isIndirectReference()) {
-                            kid = ((PdfIndirectReference) kid).getRefersTo();
-                        }
                         PdfFormField field = new PdfFormField((PdfDictionary) kid);
                         PdfWidgetAnnotation widget = field.getWidgets().get(0);
                         PdfDictionary buttonValues = field.getPdfObject().getAsDictionary(PdfName.AP).getAsDictionary(PdfName.N);

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfDocument.java

@@ -552,8 +552,8 @@ public PdfPage removePage(int pageNum) {
 
             if (!removedPage.getPdfObject().isFlushed()) {
                 removedPage.getPdfObject().remove(PdfName.Parent);
+                removedPage.getPdfObject().getIndirectReference().setFree();
             }
-            removedPage.getPdfObject().getIndirectReference().setFree();
 
             dispatchEvent(new PdfDocumentEvent(PdfDocumentEvent.REMOVE_PAGE, removedPage));
         }
@@ -1619,7 +1619,7 @@ protected void checkIsoConformance() {
      * @param pdfObject an object to mark.
      */
     protected void markObjectAsMustBeFlushed(PdfObject pdfObject) {
-        if (pdfObject.isIndirect()) {
+        if (pdfObject.getIndirectReference() != null) {
             pdfObject.getIndirectReference().setState(PdfObject.MUST_BE_FLUSHED);
         }
     }

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfObject.java

@@ -158,8 +158,7 @@ public final void flush() {
      */
     public final void flush(boolean canBeInObjStm) {
         if (isFlushed() || getIndirectReference() == null) {
-            // TODO here we should take into account and log the case when object is MustBeIndirect, but has no indirect reference
-            // TODO DEVSIX-744
+            // TODO DEVSIX-744: here we should take into account and log the case when object is MustBeIndirect, but has no indirect reference
 //            Logger logger = LoggerFactory.getLogger(PdfObject.class);
 //            if (isFlushed()) {
 //                logger.warn("Meaningless call, the object has already flushed");

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfPage.java

@@ -836,11 +836,7 @@ public PdfPage addAnnotation(int index, PdfAnnotation annotation, boolean tagAnn
     public PdfPage removeAnnotation(PdfAnnotation annotation) {
         PdfArray annots = getAnnots(false);
         if (annots != null) {
-            if (annots.contains(annotation.getPdfObject())) {
-                annots.remove(annotation.getPdfObject());
-            } else {
-                annots.remove(annotation.getPdfObject().getIndirectReference());
-            }
+            annots.remove(annotation.getPdfObject());
 
             if (annots.isEmpty()) {
                 getPdfObject().remove(PdfName.Annots);

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfPages.java

@@ -44,7 +44,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.kernel.pdf;
 
 class PdfPages extends PdfObjectWrapper<PdfDictionary> {
-    
+
 	private static final long serialVersionUID = 404629033132277362L;
 	private int from;
     private PdfNumber count;
@@ -121,11 +121,7 @@ public void addPages(PdfPages pdfPages) {
     public void removeFromParent() {
         if (parent != null) {
             assert getCount() == 0;
-            if (parent.kids.contains(getPdfObject().getIndirectReference())) {
-                parent.kids.remove(getPdfObject().getIndirectReference());
-            } else {
-                parent.kids.remove(getPdfObject());
-            }
+            parent.kids.remove(getPdfObject().getIndirectReference());
             if (parent.getCount() == 0) {
                 parent.removeFromParent();
             }

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfWriter.java

@@ -409,7 +409,7 @@ protected void flushWaitingObjects() {
             needFlush = false;
             for (int i = 1; i < xref.size(); i++) {
                 PdfIndirectReference indirectReference = xref.get(i);
-                if (indirectReference != null
+                if (indirectReference != null && !indirectReference.isFree()
                         && indirectReference.checkState(PdfObject.MUST_BE_FLUSHED)) {
                     PdfObject obj = indirectReference.getRefersTo(false);
                     if (obj != null) {
@@ -432,7 +432,7 @@ protected void flushModifiedWaitingObjects() {
         PdfXrefTable xref = document.getXref();
         for (int i = 1; i < xref.size(); i++) {
             PdfIndirectReference indirectReference = xref.get(i);
-            if (null != indirectReference) {
+            if (null != indirectReference && !indirectReference.isFree()) {
                 boolean isModified = indirectReference.checkState(PdfObject.MODIFIED);
                 if (isModified) {
                     PdfObject obj = indirectReference.getRefersTo(false);

kernel/src/main/java/com/itextpdf/kernel/pdf/annot/PdfWidgetAnnotation.java

@@ -136,7 +136,7 @@ public void releaseFormFieldFromWidgetAnnotation(){
         PdfDictionary parent = annotDict.getAsDictionary(PdfName.Parent);
         if (parent != null && annotDict.size() == 1) {
             PdfArray kids = parent.getAsArray(PdfName.Kids);
-            kids.remove(annotDict.getIndirectReference());
+            kids.remove(annotDict);
             if (kids.size() == 0) {
                 parent.remove(PdfName.Kids);
             }

kernel/src/main/java/com/itextpdf/kernel/pdf/layer/PdfLayer.java

@@ -404,12 +404,10 @@ public void setPageElement(String pe) {
     }
 
     /**
-     * Gets the indirect reference to the current layer object,
-     * making it indirect first if necessary.
+     * Gets the indirect reference to the current layer object.
      * @return the indirect reference to the object representing the layer
      */
     public PdfIndirectReference getIndirectReference() {
-        getPdfObject().makeIndirect(getDocument());
         return getPdfObject().getIndirectReference();
     }
 

kernel/src/main/java/com/itextpdf/kernel/pdf/layer/PdfLayerMembership.java

@@ -179,7 +179,6 @@ public PdfVisibilityExpression getVisibilityExpression() {
 
     @Override
     public PdfIndirectReference getIndirectReference() {
-        getPdfObject().makeIndirect(getDocument());
         return getPdfObject().getIndirectReference();
     }