Author: jahewson
Date: Wed Sep 3 17:05:24 2014
New Revision: 1622299
URL: http://svn.apache.org/r1622299
Log:
PDFBOX-2310: Removed redundant clear() methods
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java?rev=1622299&r1=1622298&r2=1622299&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
Wed Sep 3 17:05:24 2014
@@ -105,59 +105,15 @@ public class PDResources implements COSO
*/
public void clearCache()
{
- if (fonts != null)
- {
- for(PDFont font : fonts.values())
- {
- font.clear();
- }
- fonts.clear();
- fonts = null;
- }
- if (fontMappings != null)
- {
- fontMappings.clear();
- fontMappings = null;
- }
- if (colorspaces != null)
- {
- colorspaces.clear();
- colorspaces = null;
- }
- if (xobjects != null)
- {
- for(PDXObject xobject : xobjects.values())
- {
- xobject.clearCache();
- }
- xobjects.clear();
- xobjects = null;
- }
- if (xobjectMappings != null)
- {
- xobjectMappings.clear();
- xobjectMappings = null;
- }
- if (images != null)
- {
- images.clear();
- images = null;
- }
- if (graphicsStates != null)
- {
- graphicsStates.clear();
- graphicsStates = null;
- }
- if (patterns != null)
- {
- patterns.clear();
- patterns = null;
- }
- if (shadings != null)
- {
- shadings.clear();
- shadings = null;
- }
+ fonts = null;
+ fontMappings = null;
+ colorspaces = null;
+ xobjects = null;
+ xobjectMappings = null;
+ images = null;
+ graphicsStates = null;
+ patterns = null;
+ shadings = null;
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1622299&r1=1622298&r2=1622299&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
Wed Sep 3 17:05:24 2014
@@ -499,13 +499,6 @@ public abstract class PDFont implements
*/
public abstract boolean isVertical();
- /**
- * Calling this will release all cached information.
- */
- public void clear()
- {
- }
-
@Override
public boolean equals(Object other)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=1622299&r1=1622298&r2=1622299&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
Wed Sep 3 17:05:24 2014
@@ -335,14 +335,4 @@ public class PDTrueTypeFont extends PDSi
}
cmapInitialized = true;
}
-
- @Override
- public void clear()
- {
- super.clear();
- cmapWinUnicode = null;
- cmapWinSymbol = null;
- cmapMacRoman = null;
- cmapInitialized = false;
- }
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=1622299&r1=1622298&r2=1622299&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
Wed Sep 3 17:05:24 2014
@@ -41,8 +41,7 @@ public class PDType0Font extends PDFont
{
private static final Log LOG = LogFactory.getLog(PDType0Font.class);
- private PDCIDFont descendantFont;
- private COSDictionary descendantFontDictionary;
+ private final PDCIDFont descendantFont;
private CMap cMap, cMapUCS2;
private boolean isCMapPredefined;
@@ -55,7 +54,7 @@ public class PDType0Font extends PDFont
{
super(fontDictionary);
COSArray descendantFonts =
(COSArray)dict.getDictionaryObject(COSName.DESCENDANT_FONTS);
- descendantFontDictionary = (COSDictionary)descendantFonts.getObject(0);
+ COSDictionary descendantFontDictionary = (COSDictionary)
descendantFonts.getObject(0);
if (descendantFontDictionary == null)
{
@@ -307,18 +306,6 @@ public class PDType0Font extends PDFont
}
@Override
- public void clear()
- {
- super.clear();
- if (descendantFont != null)
- {
- descendantFont.clear();
- descendantFont = null;
- }
- descendantFontDictionary = null;
- }
-
- @Override
public String toString()
{
String descendant = null;
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java?rev=1622299&r1=1622298&r2=1622299&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
Wed Sep 3 17:05:24 2014
@@ -51,11 +51,11 @@ public class PDType1CFont extends PDSimp
{
private static final Log LOG = LogFactory.getLog(PDType1CFont.class);
- private Map<String, Float> glyphHeights = new HashMap<String, Float>();
+ private final Map<String, Float> glyphHeights = new HashMap<String,
Float>();
private Float avgWidth = null;
- private PDRectangle fontBBox = null;
+ private final PDRectangle fontBBox = null;
private Matrix fontMatrix;
- private AffineTransform fontMatrixTransform;
+ private final AffineTransform fontMatrixTransform;
private final CFFType1Font cffFont; // embedded font
private final Type1Equivalent type1Equivalent; // embedded or system font
for rendering
@@ -250,16 +250,4 @@ public class PDType1CFont extends PDSimp
// todo: not implemented, highly suspect
return 500;
}
-
- @Override
- public void clear()
- {
- super.clear();
- fontBBox = null;
- if (glyphHeights != null)
- {
- glyphHeights.clear();
- glyphHeights = null;
- }
- }
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java?rev=1622299&r1=1622298&r2=1622299&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java
Wed Sep 3 17:05:24 2014
@@ -251,16 +251,4 @@ public class PDType3Font extends PDSimpl
}
return stream;
}
-
- @Override
- public void clear()
- {
- super.clear();
- charProcs = null;
- if (type3Resources != null)
- {
- type3Resources.clearCache();
- type3Resources = null;
- }
- }
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java?rev=1622299&r1=1622298&r2=1622299&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDXObject.java
Wed Sep 3 17:05:24 2014
@@ -128,11 +128,4 @@ public class PDXObject implements COSObj
{
return stream;
}
-
- /**
- * Calling this will release all cached information.
- */
- public void clearCache()
- {
- }
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java?rev=1622299&r1=1622298&r2=1622299&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
Wed Sep 3 17:05:24 2014
@@ -500,11 +500,4 @@ public final class PDImageXObject extend
return null;
}
}
-
- @Override
- public void clearCache()
- {
- super.clearCache();
- cachedImage = null;
- }
}
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java?rev=1622299&r1=1622298&r2=1622299&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
(original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
Wed Sep 3 17:05:24 2014
@@ -242,7 +242,6 @@ public class ExtractImages
System.out.println( "Writing image:" + name );
write2file( image, name, directJPEG );
- image.clearCache();
}
// maybe there are more images embedded in a form object
else if (xobject instanceof PDFormXObject)
