pdfbox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From til...@apache.org
Subject svn commit: r1795665 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos: COSDictionary.java UnmodifiableCOSDictionary.java
Date Sat, 20 May 2017 15:30:08 GMT
Author: tilman
Date: Sat May 20 15:30:08 2017
New Revision: 1795665

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

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/UnmodifiableCOSDictionary.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1795665&r1=1795664&r2=1795665&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java Sat May 20
15:30:08 2017
@@ -1444,23 +1444,6 @@ 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.
-     *
-     * @param dic The dic to get the keys from.
-     */
-    public void mergeInto(COSDictionary dic)
-    {
-        for (Map.Entry<COSName, COSBase> entry : dic.entrySet())
-        {
-            if (getItem(entry.getKey()) == null)
-            {
-                setItem(entry.getKey(), entry.getValue());
-            }
-        }
-    }
-
-    /**
      * Nice method, gives you every object you want Arrays works properly too. Try "P/Annots/[k]/Rect"
where k means the
      * index of the Annotsarray.
      *

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/UnmodifiableCOSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/UnmodifiableCOSDictionary.java?rev=1795665&r1=1795664&r2=1795665&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/UnmodifiableCOSDictionary.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/UnmodifiableCOSDictionary.java
Sat May 20 15:30:08 2017
@@ -278,13 +278,4 @@ final class UnmodifiableCOSDictionary ex
     {
         throw new UnsupportedOperationException();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void mergeInto(COSDictionary dic)
-    {
-        throw new UnsupportedOperationException();
-    }
 }



Mime
View raw message