svn commit: r1584205 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java

[ti...@apache.org]

Author: tilman
Date: Wed Apr  2 22:13:18 2014
New Revision: 1584205

URL: http://svn.apache.org/r1584205
Log:
PDFBOX-2002: delete deprecated methods

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.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=1584205&r1=1584204&r2=1584205&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 Wed Apr  2 22:13:18 2014
@@ -17,11 +17,9 @@
 package org.apache.pdfbox.cos;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -147,31 +145,6 @@ public class COSDictionary extends COSBa
 	 * @param secondKey The second key to try.
 	 *
 	 * @return The object that matches the key.
-	 * 
-	 * @deprecated  use {@link #getDictionaryObject(COSName, COSName)} using COSName constants instead
-	 */
-	public COSBase getDictionaryObject( String firstKey, String secondKey )
-	{
-		COSBase retval = getDictionaryObject( COSName.getPDFName( firstKey ) );
-		if( retval == null )
-		{
-			retval = getDictionaryObject( COSName.getPDFName( secondKey ) );
-		}
-		return retval;
-	}
-
-	/**
-	 * This is a special case of getDictionaryObject that takes multiple keys, it will handle
-	 * the situation where multiple keys could get the same value, ie if either CS or ColorSpace
-	 * is used to get the colorspace.
-	 * This will get an object from this dictionary.  If the object is a reference then it will
-	 * dereference it and get it from the document.  If the object is COSNull then
-	 * null will be returned.
-	 *
-	 * @param firstKey The first key to try.
-	 * @param secondKey The second key to try.
-	 *
-	 * @return The object that matches the key.
 	 */
 	public COSBase getDictionaryObject( COSName firstKey, COSName secondKey )
 	{
@@ -1360,18 +1333,6 @@ public class COSDictionary extends COSBa
 	}
 
 	/**
-	 * This will get the keys for all objects in the dictionary in the sequence that
-	 * they were added.
-	 *
-	 * @deprecated Use the {@link #entrySet()} method instead.
-	 * @return a list of the keys in the sequence of insertion
-	 */
-	public List<COSName> keyList()
-	{
-		return new ArrayList<COSName>(items.keySet());
-	}
-
-	/**
 	 * Returns the names of the entries in this dictionary. The returned
 	 * set is in the order the entries were added to the dictionary.
 	 *