You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2018/08/04 13:19:43 UTC
svn commit: r1837418 -
/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
Author: tilman
Date: Sat Aug 4 13:19:43 2018
New Revision: 1837418
URL: http://svn.apache.org/viewvc?rev=1837418&view=rev
Log:
PDFBOX-4071: correct typo in javadoc + reformat javadoc
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1837418&r1=1837417&r2=1837418&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java Sat Aug 4 13:19:43 2018
@@ -1448,11 +1448,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)
{
@@ -1494,14 +1493,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)