svn commit: r1795666 - /pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java

[ti...@apache.org]

Author: tilman
Date: Sat May 20 15:30:13 2017
New Revision: 1795666

URL: http://svn.apache.org/viewvc?rev=1795666&view=rev
Log:
PDFBOX-3795: deprecate/remove mergeInto due to problems

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=1795666&r1=1795665&r2=1795666&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 May 20 15:30:13 2017
@@ -28,6 +28,7 @@ import java.util.Set;
 import org.apache.pdfbox.exceptions.COSVisitorException;
 import org.apache.pdfbox.pdmodel.common.COSObjectable;
 import org.apache.pdfbox.util.DateConverter;
+import sun.swing.SwingUtilities2;
 
 /**
  * This class represents a dictionary where name/value pairs reside.
@@ -1503,7 +1504,11 @@ public class COSDictionary extends COSBa
      *
      * @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.
      */
+    @Deprecated
     public void mergeInto(COSDictionary dic)
     {
         for (Map.Entry<COSName, COSBase> entry : dic.entrySet())