You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ju...@apache.org on 2010/01/15 15:26:04 UTC
svn commit: r899642 -
/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
Author: jukka
Date: Fri Jan 15 14:26:04 2010
New Revision: 899642
URL: http://svn.apache.org/viewvc?rev=899642&view=rev
Log:
PDFBOX-572: Upgrading PDFBox (incl. JempBox and FontBox) to use Java 5 specifications
Use generics in PDFont
Modified:
pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
Modified: pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=899642&r1=899641&r2=899642&view=diff
==============================================================================
--- pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original)
+++ pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Fri Jan 15 14:26:04 2010
@@ -80,18 +80,18 @@
*/
private CMap cmap = null;
- private static Map afmResources = null;
- private static Map cmapObjects = null;
- private static Map afmObjects = null;
+ private static Map<COSName, String> afmResources = null;
+ private static Map<COSName, CMap> cmapObjects = null;
+ private static Map<COSName, FontMetric> afmObjects = null;
static
{
//these are read-only once they are created
- afmResources = new HashMap();
+ afmResources = new HashMap<COSName, String>();
//these are read-write
- cmapObjects = Collections.synchronizedMap( new HashMap() );
- afmObjects = Collections.synchronizedMap( new HashMap() );
+ cmapObjects = Collections.synchronizedMap( new HashMap<COSName, CMap>() );
+ afmObjects = Collections.synchronizedMap( new HashMap<COSName, FontMetric>() );
afmResources.put( COSName.getPDFName( "Courier-Bold" ), "Resources/afm/Courier-Bold.afm" );
@@ -307,10 +307,10 @@
}
if( name != null )
{
- afm = (FontMetric)afmObjects.get( name );
+ afm = afmObjects.get( name );
if( afm == null )
{
- String resource = (String)afmResources.get( name );
+ String resource = afmResources.get( name );
if( resource == null )
{
//ok for now
@@ -396,7 +396,7 @@
encoding instanceof COSName )
{
COSName encodingName = (COSName)encoding;
- cmap = (CMap)cmapObjects.get( encodingName );
+ cmap = cmapObjects.get( encodingName );
if( cmap == null )
{
String cmapName = encodingName.getName();