svn commit: r1837419 - in /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox: cos/COSDictionary.java multipdf/PDFMergerUtility.java

[ti...@apache.org]

Author: tilman
Date: Sat Aug  4 13:19:50 2018
New Revision: 1837419

URL: http://svn.apache.org/viewvc?rev=1837419&view=rev
Log:
PDFBOX-4071: correct typo in javadoc + reformat javadoc

Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1837419&r1=1837418&r2=1837419&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java Sat Aug  4 13:19:50 2018
@@ -1358,10 +1358,10 @@ public class COSDictionary extends COSBa
     }
 
     /**
-     * This will add all of the dictionarys keys/values to this dictionary. Only called when adding keys to a trailer
-     * that already exists.
+     * This will add all of the dictionaries keys/values to this dictionary.
+     * Only called when adding keys to a trailer that already exists.
      *
-     * @param dic The dic to get the keys from.
+     * @param dic The dictionaries to get the keys from.
      */
     public void addAll(COSDictionary dic)
     {
@@ -1402,13 +1402,15 @@ public class COSDictionary extends COSBa
     }
 
     /**
-     * This will add all of the dictionarys keys/values to this dictionary, but only if they don't already exist. If a
-     * key already exists in this dictionary then nothing is changed.
+     * This will add all of the dictionaries keys/values to this dictionary, but
+     * only if they don't already exist. If a key already exists in this
+     * dictionary then nothing is changed.
      *
-     * @param dic The dic to get the keys from.
-     * 
-     * @deprecated This method should no longer be used and will be removed in 3.0 because it could
-     * also merge attributes that should not be merged (filter and length in a COSStream.
+     * @param dic The dictionaries to get the keys from.
+     *
+     * @deprecated This method should no longer be used and will be removed in
+     * 3.0 because it could also merge attributes that should not be merged
+     * (filter and length) in a COSStream.
      */
     @Deprecated
     public void mergeInto(COSDictionary dic)

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1837419&r1=1837418&r2=1837419&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java Sat Aug  4 13:19:50 2018
@@ -1049,9 +1049,10 @@ public class PDFMergerUtility
     }
 
     /**
-     * This will add all of the dictionarys keys/values to this dictionary, but only if they are not
-     * in an exclusion list and if they don't already exist. If a key already exists in this
-     * dictionary then nothing is changed.
+     * This will add all of the dictionaries keys/values to this dictionary, but
+     * only if they are not in an exclusion list and if they don't already
+     * exist. If a key already exists in this dictionary then nothing is
+     * changed.
      *
      * @param src The source dictionary to get the keys/values from.
      * @param dst The destination dictionary to merge the keys/values into.