Merge branch 'develop' into layoutsharp2

 Conflicts:
	layout/src/main/java/com/itextpdf/layout/ElementPropertyContainer.java
	layout/src/main/java/com/itextpdf/layout/renderer/AbstractRenderer.java

Author: pavel-alay

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

@@ -885,7 +885,7 @@ private void defineWidgetPageAndAddToIt(PdfPage currentPage, PdfDictionary merge
                 throw new PdfException(PdfException.PageWasAlreadyFlushedUseAddFieldAppearanceToPageMethodBeforePageFlushing);
             }
             PdfDocument doc = pageDic.getIndirectReference().getDocument();
-            PdfPage widgetPage = doc.getCatalog().getPage(pageDic);
+            PdfPage widgetPage = doc.getPage(pageDic);
             addWidgetAnnotationToPage(widgetPage, annot);
         } else {
             addWidgetAnnotationToPage(currentPage, annot);
@@ -1027,7 +1027,7 @@ private static PdfDictionary createAcroFormDictionaryByFields(PdfArray fields) {
     private PdfPage getFieldPage(PdfDictionary annotDic) {
         PdfDictionary pageDic = annotDic.getAsDictionary(PdfName.P);
         if (pageDic != null) {
-            return document.getCatalog().getPage(pageDic);
+            return document.getPage(pageDic);
         }
         for (int i = 1; i <= document.getNumberOfPages(); i++) {
             PdfPage page = document.getPage(i);

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

@@ -61,7 +61,7 @@ public class PdfCatalog extends PdfObjectWrapper<PdfDictionary> {
 
     private static final long serialVersionUID = -1354567597112193418L;
 
-    final PdfPagesTree pageTree;
+    final private PdfPagesTree pageTree;
     protected Map<PdfName, PdfNameTree> nameTrees = new HashMap<>();
     protected PdfNumTree pageLabels;
     protected PdfOCProperties ocProperties;
@@ -88,42 +88,6 @@ protected PdfCatalog(PdfDocument pdfDocument) {
         this(new PdfDictionary().makeIndirect(pdfDocument));
     }
 
-    public void addPage(PdfPage page) {
-        if (page.isFlushed())
-            throw new PdfException(PdfException.FlushedPageCannotBeAddedOrInserted, page);
-        if (page.getDocument() != null && page.getDocument() != getDocument())
-            throw new PdfException(PdfException.Page1CannotBeAddedToDocument2BecauseItBelongsToDocument3).setMessageParams(page, getDocument(), page.getDocument());
-        pageTree.addPage(page);
-    }
-
-    public void addPage(int index, PdfPage page) {
-        if (page.isFlushed())
-            throw new PdfException(PdfException.FlushedPageCannotBeAddedOrInserted, page);
-        if (page.getDocument() != null && page.getDocument() != getDocument())
-            throw new PdfException(PdfException.Page1CannotBeAddedToDocument2BecauseItBelongsToDocument3).setMessageParams(page, getDocument(), page.getDocument());
-        pageTree.addPage(index, page);
-    }
-
-    public PdfPage getPage(int pageNum) {
-        return pageTree.getPage(pageNum);
-    }
-
-    public PdfPage getPage(PdfDictionary pageDictionary) {
-        return pageTree.getPage(pageDictionary);
-    }
-
-    public int getNumberOfPages() {
-        return pageTree.getNumberOfPages();
-    }
-
-    public int getPageNumber(PdfPage page) {
-        return pageTree.getPageNumber(page);
-    }
-
-    public int getPageNumber(PdfDictionary pageDictionary) {
-        return pageTree.getPageNumber(pageDictionary);
-    }
-
     /**
      * Use this method to get the <B>Optional Content Properties Dictionary</B>.
      * Note that if you call this method, then the PdfDictionary with OCProperties will be
@@ -188,25 +152,28 @@ public PdfCatalog setAdditionalAction(PdfName key, PdfAction action) {
     /**
      * This flag determines if Outline tree of the document has been built via calling getOutlines method. If this flag is false all outline operations will be ignored
      *
-     * @return
+     * @return state of outline mode.
      */
     public boolean isOutlineMode() {
         return outlineMode;
     }
 
     /**
-     * This method sets a page mode of the document
+     * This method sets a page mode of the document.
+     * </p>
+     * Valid values are: {@code PdfName.UseNone}, {@code PdfName.UseOutlines}, {@code PdfName.UseThumbs},
+     * {@code PdfName.FullScreen},  {@code PdfName.UseOC}, {@code PdfName.UseAttachments}.
      *
-     * @param pageMode
-     * @return
+     * @param pageMode page mode.
+     * @return current instance of PdfCatalog
      */
     public PdfCatalog setPageMode(PdfName pageMode) {
-        if (!pageMode.equals(PdfName.UseNone) && !pageMode.equals(PdfName.UseOutlines) &&
-                !pageMode.equals(PdfName.UseThumbs) && !pageMode.equals(PdfName.FullScreen) &&
-                !pageMode.equals(PdfName.UseOC) && !pageMode.equals(PdfName.UseAttachments)) {
-            return this;
+        if (pageMode.equals(PdfName.UseNone) || pageMode.equals(PdfName.UseOutlines) ||
+                pageMode.equals(PdfName.UseThumbs) || pageMode.equals(PdfName.FullScreen) ||
+                pageMode.equals(PdfName.UseOC) || pageMode.equals(PdfName.UseAttachments)) {
+            return put(PdfName.PageMode, pageMode);
         }
-        return put(PdfName.PageMode, pageMode);
+        return this;
     }
 
     public PdfName getPageMode() {
@@ -219,12 +186,12 @@ public PdfName getPageMode() {
      * @return
      */
     public PdfCatalog setPageLayout (PdfName pageLayout) {
-        if (!pageLayout.equals(PdfName.SinglePage) && !pageLayout.equals(PdfName.OneColumn) &&
-                !pageLayout.equals(PdfName.TwoColumnLeft) && !pageLayout.equals(PdfName.TwoColumnRight) &&
-                !pageLayout.equals(PdfName.TwoPageLeft) && !pageLayout.equals(PdfName.TwoPageRight)) {
-            return this;
+        if (pageLayout.equals(PdfName.SinglePage) || pageLayout.equals(PdfName.OneColumn) ||
+                pageLayout.equals(PdfName.TwoColumnLeft) || pageLayout.equals(PdfName.TwoColumnRight) ||
+                pageLayout.equals(PdfName.TwoPageLeft) || pageLayout.equals(PdfName.TwoPageRight)) {
+            return put(PdfName.PageLayout, pageLayout);
         }
-        return put(PdfName.PageLayout, pageLayout);
+        return this;
     }
 
     public PdfName getPageLayout(){
@@ -253,7 +220,7 @@ public PdfViewerPreferences getViewerPreferences() {
     /**
      * This method gets Names tree from the catalog.
      * @param treeType type of the tree (Dests, AP, EmbeddedFiles etc).
-     * @return
+     * @return returns {@link PdfNameTree}
      */
     public PdfNameTree getNameTree(PdfName treeType) {
         PdfNameTree tree = nameTrees.get(treeType);
@@ -267,7 +234,7 @@ public PdfNameTree getNameTree(PdfName treeType) {
 
     /**
      * This method returns the NumberTree of Page Labels
-     * @return
+     * @return returns {@link PdfNumTree}
      */
     public PdfNumTree getPageLabelsTree(boolean createIfNotExists) {
         if (pageLabels == null && (getPdfObject().containsKey(PdfName.PageLabels) || createIfNotExists)) {
@@ -343,9 +310,10 @@ protected boolean isOCPropertiesMayHaveChanged() {
         return ocProperties != null;
     }
 
-    PdfPage removePage(int pageNum) {
-        return pageTree.removePage(pageNum);
+    PdfPagesTree getPageTree() {
+        return pageTree;
     }
+
     /**
      * this method return map containing all pages of the document with associated outlines.
      *
@@ -476,7 +444,7 @@ PdfDestination copyDestination(PdfObject dest, Map<PdfPage, PdfPage> page2page,
                     if (oldPage.getPdfObject() == pageObject) {
                         array.set(0, page2page.get(oldPage).getPdfObject());
                         d = new PdfStringDestination(name);
-                        toDocument.addNameDestination(name,array);
+                        toDocument.addNamedDestination(name,array);
                     }
                 }
             }