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 2009/09/14 15:00:49 UTC
svn commit: r814623 - in
/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox: cos/ exceptions/
filter/ pdfparser/ pdfviewer/ pdmodel/ pdmodel/font/
pdmodel/graphics/color/ pdmodel/graphics/xobject/ util/ util/operator/
util/operator/pagedrawer/
Author: jukka
Date: Mon Sep 14 13:00:47 2009
New Revision: 814623
URL: http://svn.apache.org/viewvc?rev=814623&view=rev
Log:
PDFBOX-524: Drop LoggingObject
Removed:
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/exceptions/LoggingObject.java
Modified:
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSBase.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSDocument.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/filter/FlateFilter.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpaceFactory.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorState.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/OperatorProcessor.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingColor.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingSeparation.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/BeginInlineImage.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipEvenOddRule.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipNonZeroRule.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClosePath.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/FillEvenOddRule.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/FillNonZeroRule.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/MoveTo.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/StrokePath.java
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSBase.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSBase.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSBase.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSBase.java Mon Sep 14 13:00:47 2009
@@ -20,7 +20,6 @@
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.exceptions.COSVisitorException;
-import org.apache.pdfbox.exceptions.LoggingObject;
/**
* The base object that all objects in the PDF document will extend.
@@ -28,7 +27,7 @@
* @author <a href="ben@benlitchfield.com">Ben Litchfield</a>
* @version $Revision: 1.14 $
*/
-public abstract class COSBase extends LoggingObject implements COSObjectable
+public abstract class COSBase implements COSObjectable
{
/**
* Constructor.
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSDocument.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSDocument.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSDocument.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSDocument.java Mon Sep 14 13:00:47 2009
@@ -25,6 +25,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.exceptions.COSVisitorException;
import org.apache.pdfbox.io.RandomAccess;
import org.apache.pdfbox.io.RandomAccessFile;
@@ -42,6 +44,12 @@
*/
public class COSDocument extends COSBase
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(COSDocument.class);
+
private float version;
/**
@@ -162,7 +170,7 @@
}
catch (ClassCastException e)
{
- logger().warn(e, e);
+ log.warn(e, e);
}
}
}
@@ -212,7 +220,7 @@
}
catch (ClassCastException e)
{
- logger().warn(e, e);
+ log.warn(e, e);
}
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/filter/FlateFilter.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/filter/FlateFilter.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/filter/FlateFilter.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/filter/FlateFilter.java Mon Sep 14 13:00:47 2009
@@ -26,6 +26,8 @@
import java.util.zip.InflaterInputStream;
import java.util.zip.ZipException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -37,8 +39,14 @@
* @author Marcel Kammer
* @version $Revision: 1.12 $
*/
-public class FlateFilter extends org.apache.pdfbox.exceptions.LoggingObject implements Filter
+public class FlateFilter implements Filter
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(FlateFilter.class);
+
private static final int BUFFER_SIZE = 2048;
/**
@@ -115,17 +123,17 @@
catch (OutOfMemoryError exception)
{
// if the stream is corrupt an OutOfMemoryError may occur
- logger().error("Stop reading corrupt stream");
+ log.error("Stop reading corrupt stream");
}
catch (ZipException exception)
{
// if the stream is corrupt an OutOfMemoryError may occur
- logger().error("Stop reading corrupt stream");
+ log.error("Stop reading corrupt stream");
}
catch (EOFException exception)
{
// if the stream is corrupt an OutOfMemoryError may occur
- logger().error("Stop reading corrupt stream");
+ log.error("Stop reading corrupt stream");
}
}
else
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java Mon Sep 14 13:00:47 2009
@@ -21,6 +21,8 @@
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.io.ByteArrayPushBackInputStream;
import org.apache.pdfbox.io.PushBackInputStream;
import org.apache.pdfbox.io.RandomAccess;
@@ -39,6 +41,7 @@
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.persistence.util.COSObjectKey;
+
/**
* This class is used to contain parsing logic that will be used by both the
* PDFParser and the COSStreamParser.
@@ -46,8 +49,14 @@
* @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
* @version $Revision: 1.61 $
*/
-public abstract class BaseParser extends org.apache.pdfbox.exceptions.LoggingObject
+public abstract class BaseParser
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(BaseParser.class);
+
/**
* This is a byte array that will be used for comparisons.
*/
@@ -187,7 +196,7 @@
{
//an invalid dictionary, we are expecting
//the key, read until we can recover
- logger().warn("Invalid dictionary, found:" + (char)c + " but expected:\''");
+ log.warn("Invalid dictionary, found:" + (char)c + " but expected:\''");
int read = pdfSource.read();
while(read != -1 && read != '/' && read != '>')
{
@@ -220,7 +229,7 @@
if( value == null )
{
- logger().warn("Bad Dictionary Declaration " + pdfSource );
+ log.warn("Bad Dictionary Declaration " + pdfSource );
}
else
{
@@ -697,7 +706,7 @@
}
else
{
- logger().warn("Corrupt object reference" );
+ log.warn("Corrupt object reference" );
//it could be a bad object in the array which is just skipped
}
skipSpaces();
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/PDFObjectStreamParser.java Mon Sep 14 13:00:47 2009
@@ -21,6 +21,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDocument;
import org.apache.pdfbox.cos.COSInteger;
@@ -35,6 +37,12 @@
*/
public class PDFObjectStreamParser extends BaseParser
{
+ /**
+ * Log instance.
+ */
+ private static final Log log =
+ LogFactory.getLog(PDFObjectStreamParser.class);
+
private List streamObjects = null;
private List objectNumbers = null;
private COSStream stream;
@@ -85,9 +93,9 @@
new COSInteger( ((Integer)objectNumbers.get( objectCounter)).intValue() );
object.setObjectNumber( objNum );
streamObjects.add( object );
- if(logger().isDebugEnabled())
+ if(log.isDebugEnabled())
{
- logger().debug( "parsed=" + object );
+ log.debug( "parsed=" + object );
}
objectCounter++;
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java Mon Sep 14 13:00:47 2009
@@ -25,6 +25,8 @@
import java.util.List;
import java.util.regex.Pattern;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSDocument;
@@ -47,6 +49,12 @@
*/
public class PDFParser extends BaseParser
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDFParser.class);
+
private static final int SPACE_BYTE = 32;
private static final String PDF_HEADER = "%PDF-";
@@ -178,7 +186,7 @@
* Warning is sent to the PDFBox.log and to the Console that
* we skipped over an object
*/
- logger().warn("Parsing Error, Skipping Object", e);
+ log.warn("Parsing Error, Skipping Object", e);
skipToNextObj();
}
else
@@ -682,7 +690,7 @@
String[] splitString = currentLine.split(" ");
if (splitString.length < 3)
{
- logger().warn("invalid xref line: " + currentLine);
+ log.warn("invalid xref line: " + currentLine);
break;
}
/* This supports the corrupt table as reported in
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java Mon Sep 14 13:00:47 2009
@@ -29,6 +29,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDResources;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
@@ -52,6 +54,11 @@
public class PageDrawer extends PDFStreamEngine
{
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PageDrawer.class);
+
private Graphics2D graphics;
private Dimension pageSize;
private PDPage page;
@@ -142,9 +149,12 @@
else
{
// TODO : need to implement....
- logger().warn("Unsupported RenderingMode "+this.getGraphicsState().getTextState().getRenderingMode()
- +" in PageDrawer.processTextPosition()"
- + "Using RenderingMode "+PDTextState.RENDERING_MODE_FILL_TEXT+" instead");
+ log.warn("Unsupported RenderingMode "
+ + this.getGraphicsState().getTextState().getRenderingMode()
+ + " in PageDrawer.processTextPosition()."
+ + " Using RenderingMode "
+ + PDTextState.RENDERING_MODE_FILL_TEXT
+ + " instead");
graphics.setColor( this.getGraphicsState().getNonStrokingColor().getJavaColor() );
}
PDFont font = text.getFont();
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java Mon Sep 14 13:00:47 2009
@@ -16,6 +16,8 @@
*/
package org.apache.pdfbox.pdmodel;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -34,8 +36,6 @@
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
import org.apache.pdfbox.pdmodel.interactive.pagenavigation.PDThreadBead;
-import org.apache.pdfbox.exceptions.LoggingObject;
-
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
@@ -59,8 +59,14 @@
* @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
* @version $Revision: 1.29 $
*/
-public class PDPage extends LoggingObject implements COSObjectable, Printable
+public class PDPage implements COSObjectable, Printable
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDPage.class);
+
private static final int DEFAULT_USER_SPACE_UNIT_DPI = 72;
private COSDictionary page;
@@ -702,7 +708,7 @@
}
catch (ImagingOpException e)
{
- logger().warn("Unable to rotate page image", e);
+ log.warn("Unable to rotate page image", e);
}
return retval;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Mon Sep 14 13:00:47 2009
@@ -39,7 +39,6 @@
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.pdmodel.common.PDMatrix;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.exceptions.LoggingObject;
import org.apache.pdfbox.util.ResourceLoader;
@@ -63,7 +62,7 @@
* @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
* @version $Revision: 1.46 $
*/
-public abstract class PDFont extends LoggingObject implements COSObjectable
+public abstract class PDFont implements COSObjectable
{
/**
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java Mon Sep 14 13:00:47 2009
@@ -16,6 +16,8 @@
*/
package org.apache.pdfbox.pdmodel.font;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.fontbox.ttf.CMAPEncodingEntry;
import org.apache.fontbox.ttf.CMAPTable;
import org.apache.fontbox.ttf.GlyphData;
@@ -64,6 +66,12 @@
*/
public class PDTrueTypeFont extends PDSimpleFont
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDTrueTypeFont.class);
+
/**
* This is the key to a property in the Resources/PDFBox_External_Fonts.properties file
* to load a Font when a mapping does not exist for the current font.
@@ -332,14 +340,14 @@
}
catch( FontFormatException f )
{
- logger().info("Can't read the embedded font " + fd.getFontName() );
+ log.info("Can't read the embedded font " + fd.getFontName() );
}
if (awtFont == null)
{
awtFont = FontManager.getAwtFont(fd.getFontName());
if (awtFont != null)
{
- logger().info("Using font "+awtFont.getName()+ " instead");
+ log.info("Using font "+awtFont.getName()+ " instead");
}
}
}
@@ -349,7 +357,7 @@
awtFont = FontManager.getAwtFont(fd.getFontName());
if (awtFont == null)
{
- logger().info("Can't find the specified font " + fd.getFontName() );
+ log.info("Can't find the specified font " + fd.getFontName() );
// check if there is a font mapping for an external font file
TrueTypeFont ttf = getExternalFontFile2( fd );
if( ttf != null )
@@ -360,7 +368,7 @@
}
catch( FontFormatException f )
{
- logger().info("Can't read the external fontfile " + fd.getFontName() );
+ log.info("Can't read the external fontfile " + fd.getFontName() );
}
}
}
@@ -369,7 +377,7 @@
{
// we can't find anything, so we have to use the standard font
awtFont = FontManager.getStandardFont();
- logger().info("Using font "+awtFont.getName()+ " instead");
+ log.info("Using font "+awtFont.getName()+ " instead");
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java Mon Sep 14 13:00:47 2009
@@ -19,6 +19,8 @@
import java.awt.Graphics;
import java.awt.geom.AffineTransform;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
@@ -35,6 +37,11 @@
public class PDType0Font extends /*PDFont following is a hack ...*/ PDType1Font
{
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDType0Font.class);
+
private PDFont descendentFont;
/**
* Constructor.
@@ -63,7 +70,7 @@
{
//throw new RuntimeException( "Not yet implemented" );
super.drawString(string, g, fontSize, at, x, y);
- logger().info("Called Type1Font.drawString since Type0 is not yet implemented");
+ log.info("Called Type1Font.drawString since Type0 is not yet implemented");
}
/**
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java Mon Sep 14 13:00:47 2009
@@ -26,6 +26,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.common.PDStream;
@@ -38,6 +40,12 @@
*/
public class PDType1Font extends PDSimpleFont
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDType1Font.class);
+
/**
* Standard Base 14 Font.
*/
@@ -195,7 +203,7 @@
if( ffStream == null && fdDictionary.getFontFile3() != null)
{
// TODO FontFile3-streams containing CIDFontType0C or OpenType fonts aren't yet supported
- logger().info("Embedded font-type is not supported " + fd.getFontName() );
+ log.info("Embedded font-type is not supported " + fd.getFontName() );
}
if( ffStream != null )
{
@@ -206,7 +214,7 @@
}
catch (FontFormatException e)
{
- logger().info("Can't read the embedded font " + fd.getFontName() );
+ log.info("Can't read the embedded font " + fd.getFontName() );
}
}
else
@@ -215,7 +223,7 @@
awtFont = FontManager.getAwtFont(fd.getFontName());
if (awtFont == null)
{
- logger().info("Can't find the specified font " + fd.getFontName() );
+ log.info("Can't find the specified font " + fd.getFontName() );
}
}
}
@@ -225,14 +233,14 @@
awtFont = FontManager.getAwtFont(baseFont);
if (awtFont == null)
{
- logger().info("Can't find the specified basefont " + baseFont );
+ log.info("Can't find the specified basefont " + baseFont );
}
}
if (awtFont == null)
{
// we can't find anything, so we have to use the standard font
awtFont = FontManager.getStandardFont();
- logger().info("Using font "+awtFont.getName()+ " instead");
+ log.info("Using font "+awtFont.getName()+ " instead");
}
}
Graphics2D g2d = (Graphics2D)g;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java Mon Sep 14 13:00:47 2009
@@ -23,7 +23,6 @@
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import java.io.IOException;
-import org.apache.pdfbox.exceptions.LoggingObject;
import java.awt.color.ColorSpace;
import java.awt.image.ColorModel;
@@ -35,7 +34,7 @@
* @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
* @version $Revision: 1.5 $
*/
-public abstract class PDColorSpace extends LoggingObject implements COSObjectable
+public abstract class PDColorSpace implements COSObjectable
{
/**
* array for the given parameters.
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpaceFactory.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpaceFactory.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpaceFactory.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpaceFactory.java Mon Sep 14 13:00:47 2009
@@ -28,7 +28,6 @@
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.common.PDStream;
-import org.apache.pdfbox.exceptions.LoggingObject;
/**
* This class represents a color space in a pdf document.
@@ -36,7 +35,7 @@
* @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
* @version $Revision: 1.11 $
*/
-public final class PDColorSpaceFactory extends LoggingObject
+public final class PDColorSpaceFactory
{
/**
* Private constructor for utility classes.
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorState.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorState.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorState.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorState.java Mon Sep 14 13:00:47 2009
@@ -20,8 +20,9 @@
import java.awt.color.ColorSpace;
import java.awt.color.ICC_ColorSpace;
import java.io.IOException;
-import org.apache.pdfbox.exceptions.LoggingObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
/**
@@ -30,10 +31,15 @@
* @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
* @version $Revision: 1.7 $
*/
-public class PDColorState extends LoggingObject implements Cloneable
+public class PDColorState implements Cloneable
{
/**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDColorState.class);
+
+ /**
* The default color that can be set to replace all colors in
* {@link ICC_ColorSpace ICC color spaces}.
*
@@ -137,7 +143,7 @@
}
else if (cs instanceof ICC_ColorSpace && override != null)
{
- logger().warn(
+ log.warn(
"Using an ICC override color to avoid a potential"
+ " JVM crash (see PDFBOX-511)");
return override;
@@ -155,17 +161,17 @@
{
values = values + components[i] + "\t";
}
- logger().error(exception + "\n" + values, exception);
+ log.error(exception + "\n" + values, exception);
throw exception;
}
catch (IOException ioexception)
{
- logger().error(ioexception, ioexception);
+ log.error(ioexception, ioexception);
throw ioexception;
}
catch (Exception e)
{
- logger().error(e, e);
+ log.error(e, e);
throw new IOException("Failed to Create Color");
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java Mon Sep 14 13:00:47 2009
@@ -21,6 +21,8 @@
import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
@@ -36,6 +38,11 @@
public class PDSeparation extends PDColorSpace
{
/**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDSeparation.class);
+
+ /**
* The name of this color space.
*/
public static final String NAME = "Separation";
@@ -106,13 +113,13 @@
}
catch (IOException ioexception)
{
- logger().error(ioexception, ioexception);
+ log.error(ioexception, ioexception);
throw ioexception;
}
catch (Exception exception)
{
- logger().error(exception, exception);
+ log.error(exception, exception);
throw new IOException("Failed to Create ColorSpace");
}
}
@@ -128,7 +135,7 @@
*/
public ColorModel createColorModel( int bpc ) throws IOException
{
- logger().info("About to create ColorModel for " + getAlternateColorSpace().toString());
+ log.info("About to create ColorModel for " + getAlternateColorSpace().toString());
return getAlternateColorSpace().createColorModel(bpc);
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java Mon Sep 14 13:00:47 2009
@@ -26,6 +26,8 @@
import javax.imageio.ImageIO;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -45,6 +47,12 @@
*/
public class PDCcitt extends PDXObjectImage
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDCcitt.class);
+
private static final List FAX_FILTERS = new ArrayList();
static
@@ -113,7 +121,7 @@
}
catch (Exception e)
{
- logger().error(e, e);
+ log.error(e, e);
}
finally
{
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java Mon Sep 14 13:00:47 2009
@@ -27,6 +27,8 @@
import javax.imageio.ImageIO;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -46,6 +48,11 @@
*/
public class PDPixelMap extends PDXObjectImage
{
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDPixelMap.class);
+
private BufferedImage image = null;
/**
@@ -133,7 +140,7 @@
PDColorSpace colorspace = getColorSpace();
if (colorspace == null)
{
- logger().error("getColorSpace() returned NULL. Predictor = " + getPredictor());
+ log.error("getColorSpace() returned NULL. Predictor = " + getPredictor());
return null;
}
@@ -147,7 +154,7 @@
cm = colorspace.createColorModel( bpc );
}
- logger().info("ColorModel: " + cm.toString());
+ log.info("ColorModel: " + cm.toString());
WritableRaster raster = cm.createCompatibleWritableRaster( width, height );
DataBufferByte buffer = (DataBufferByte)raster.getDataBuffer();
byte[] bufferData = buffer.getData();
@@ -185,7 +192,7 @@
}
catch (Exception exception)
{
- logger().error(exception, exception);
+ log.error(exception, exception);
//A NULL return is caught in pagedrawer.Invoke.process() so don't re-throw.
//Returning the NULL falls through to Phlip Koch's TODO section.
return null;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java Mon Sep 14 13:00:47 2009
@@ -28,8 +28,6 @@
import org.apache.pdfbox.pdmodel.common.PDMetadata;
import org.apache.pdfbox.pdmodel.common.PDStream;
-import org.apache.pdfbox.exceptions.LoggingObject;
-
/**
* The base class for all XObjects in the PDF document.
*
@@ -38,7 +36,7 @@
* @author Marcel Kammer
* @version $Revision: 1.14 $
*/
-public abstract class PDXObject extends LoggingObject implements COSObjectable
+public abstract class PDXObject implements COSObjectable
{
private PDStream xobject;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java Mon Sep 14 13:00:47 2009
@@ -22,6 +22,8 @@
import java.io.OutputStream;
import java.io.File;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -40,6 +42,12 @@
*/
public abstract class PDXObjectImage extends PDXObject
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDXObjectImage.class);
+
/**
* The XObject subtype.
*/
@@ -220,7 +228,7 @@
retval = PDColorSpaceFactory.createColorSpace( cs );
if (retval == null)
{
- logger().info("About to return NULL from createColorSpace branch");
+ log.info("About to return NULL from createColorSpace branch");
}
}
else
@@ -234,20 +242,21 @@
retval = new PDDeviceGray();
if (retval == null)
{
- logger().info("About to return NULL from CCITT branch");
+ log.info("About to return NULL from CCITT branch");
}
}
else if (getImageMask())
{
//Stencil Mask branch. Section 4.8.5 of the reference, page 350 in version 1.7.
retval = graphicsState.getNonStrokingColor().getColorSpace();
- logger().info("Stencil Mask branch returning " + retval.toString());
+ log.info("Stencil Mask branch returning " + retval.toString());
//throw new IOException("Trace the Stencil Mask!!!!");
}
else
{
- logger().info("About to return NULL from unhandled branch. filter = " + filter.toString());
+ log.info("About to return NULL from unhandled branch."
+ + " filter = " + filter);
}
}
return retval;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java Mon Sep 14 13:00:47 2009
@@ -27,10 +27,11 @@
import java.util.Stack;
import java.util.Vector;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.exceptions.WrappedIOException;
-import org.apache.pdfbox.exceptions.LoggingObject;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDResources;
@@ -49,9 +50,14 @@
* @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
* @version $Revision: 1.38 $
*/
-public class PDFStreamEngine extends LoggingObject
+public class PDFStreamEngine
{
-
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(PDFStreamEngine.class);
+
private Vector unsupportedOperators = new Vector();
private static final byte[] SPACE_BYTES = { (byte)32 };
@@ -227,9 +233,9 @@
{
arguments.add( next );
}
- if(logger().isDebugEnabled())
+ if(log.isDebugEnabled())
{
- logger().debug("token: " + next.toString());
+ log.debug("token: " + next);
}
}
}
@@ -486,7 +492,7 @@
}
catch (IOException e)
{
- logger().warn(e, e);
+ log.warn(e, e);
}
}
@@ -513,14 +519,14 @@
{
if (!unsupportedOperators.contains(operation))
{
- logger().info("unsupported/disabled operation: " + operation);
+ log.info("unsupported/disabled operation: " + operation);
unsupportedOperators.add(operation);
}
}
}
catch (Exception e)
{
- logger().warn(e, e);
+ log.warn(e, e);
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/OperatorProcessor.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/OperatorProcessor.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/OperatorProcessor.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/OperatorProcessor.java Mon Sep 14 13:00:47 2009
@@ -18,22 +18,20 @@
import org.apache.pdfbox.util.PDFOperator;
import org.apache.pdfbox.util.PDFStreamEngine;
-import org.apache.pdfbox.exceptions.LoggingObject;
import java.util.List;
import java.io.IOException;
/**
- *
- * <p>Titre : OperatorProcessor</p>
+ * <p>Title : OperatorProcessor</p>
* <p>Description : This class is the strategy abstract class
- * in the strategy GOF pattern. After instancated, you must ever call
-* the setContext method to initiamise OPeratorProcessor</p>
+ * in the strategy GOF pattern. After instantiated, you must ever call
+ * the setContext method to initialize OperatorProcessor</p>
* <p>Copyright : Copyright (c) 2004</p>
- * <p>Société : DBGS</p>
+ * <p>Société : DBGS</p>
* @author Huault : huault@free.fr
* @version $Revision: 1.3 $
*/
-public abstract class OperatorProcessor extends LoggingObject
+public abstract class OperatorProcessor
{
/**
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingColor.java Mon Sep 14 13:00:47 2009
@@ -18,6 +18,8 @@
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
@@ -36,6 +38,12 @@
*/
public class SetNonStrokingColor extends OperatorProcessor
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(SetNonStrokingColor.class);
+
/**
* sc,scn Set color space for non stroking operations.
* @param operator The operator that is being executed.
@@ -80,13 +88,13 @@
}
else
{
- logger().warn("Not supported colorspace "+colorSpace.getName()
+ log.warn("Not supported colorspace "+colorSpace.getName()
+ " within operator "+operator.getOperation());
}
}
else
{
- logger().warn("Colorspace not found in "+getClass().getName()+".process!!");
+ log.warn("Colorspace not found in "+getClass().getName()+".process!!");
}
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetNonStrokingSeparation.java Mon Sep 14 13:00:47 2009
@@ -19,6 +19,8 @@
import java.io.IOException;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdmodel.graphics.color.PDCalRGB;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorState;
@@ -36,6 +38,13 @@
*/
public class SetNonStrokingSeparation extends OperatorProcessor
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log =
+ LogFactory.getLog(SetNonStrokingSeparation.class);
+
/**
* scn Set color space for non stroking operations.
* @param operator The operator that is being executed.
@@ -90,7 +99,7 @@
}
else
{
- logger().warn("Not supported colorspace "+colorSpace.getName()
+ log.warn("Not supported colorspace "+colorSpace.getName()
+ " within operator "+operator.getOperation());
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingColor.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingColor.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingColor.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingColor.java Mon Sep 14 13:00:47 2009
@@ -18,6 +18,8 @@
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
@@ -36,6 +38,12 @@
*/
public class SetStrokingColor extends OperatorProcessor
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(SetStrokingColor.class);
+
/**
* SC,SCN Set color space for stroking operations.
* @param operator The operator that is being executed.
@@ -79,13 +87,13 @@
}
else
{
- logger().info("Not supported colorspace "+colorSpace.getName()
+ log.info("Not supported colorspace "+colorSpace.getName()
+ " within operator "+operator.getOperation());
}
}
else
{
- logger().warn("Colorspace not found in "+getClass().getName()+".process!!");
+ log.warn("Colorspace not found in "+getClass().getName()+".process!!");
}
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingSeparation.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingSeparation.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingSeparation.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/SetStrokingSeparation.java Mon Sep 14 13:00:47 2009
@@ -19,6 +19,8 @@
import java.io.IOException;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdmodel.graphics.color.PDCalRGB;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorState;
@@ -36,6 +38,13 @@
*/
public class SetStrokingSeparation extends OperatorProcessor
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log =
+ LogFactory.getLog(SetStrokingSeparation.class);
+
/**
* scn Set color space for non stroking operations.
* @param operator The operator that is being executed.
@@ -46,12 +55,12 @@
{
PDColorState color = context.getGraphicsState().getStrokingColor();
PDColorSpace colorSpace = color.getColorSpace();
- logger().info("handling color space " + colorSpace.toString());
+ log.info("handling color space " + colorSpace.toString());
if (colorSpace instanceof PDSeparation)
{
PDSeparation sep = (PDSeparation) colorSpace;
colorSpace = sep.getAlternateColorSpace();
- logger().info("now handling alternate color space " + colorSpace.toString());
+ log.info("now handling alternate color space " + colorSpace.toString());
if (colorSpace != null)
{
OperatorProcessor newOperator = null;
@@ -87,7 +96,7 @@
}
else
{
- logger().warn("Not supported colorspace "+colorSpace.getName()
+ log.warn("Not supported colorspace "+colorSpace.getName()
+ " within operator "+operator.getOperation());
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/BeginInlineImage.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/BeginInlineImage.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/BeginInlineImage.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/BeginInlineImage.java Mon Sep 14 13:00:47 2009
@@ -23,6 +23,8 @@
import java.io.IOException;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdfviewer.PageDrawer;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.graphics.xobject.PDInlinedImage;
@@ -40,6 +42,10 @@
public class BeginInlineImage extends OperatorProcessor
{
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(BeginInlineImage.class);
/**
* process : BI : begin inline image.
@@ -62,7 +68,7 @@
if (awtImage == null)
{
- logger().warn("BeginInlineImage.process(): createImage returned NULL");
+ log.warn("BeginInlineImage.process(): createImage returned NULL");
return;
}
int imageWidth = awtImage.getWidth();
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipEvenOddRule.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipEvenOddRule.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipEvenOddRule.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipEvenOddRule.java Mon Sep 14 13:00:47 2009
@@ -20,6 +20,8 @@
import java.io.IOException;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdfviewer.PageDrawer;
import org.apache.pdfbox.util.PDFOperator;
import org.apache.pdfbox.util.operator.OperatorProcessor;
@@ -33,6 +35,10 @@
public class ClipEvenOddRule extends OperatorProcessor
{
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(ClipEvenOddRule.class);
/**
* process : W* : set clipping path using even odd rule.
@@ -51,7 +57,7 @@
}
catch (Exception e)
{
- logger().warn(e, e);
+ log.warn(e, e);
}
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipNonZeroRule.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipNonZeroRule.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipNonZeroRule.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClipNonZeroRule.java Mon Sep 14 13:00:47 2009
@@ -20,6 +20,8 @@
import java.io.IOException;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdfviewer.PageDrawer;
import org.apache.pdfbox.util.PDFOperator;
import org.apache.pdfbox.util.operator.OperatorProcessor;
@@ -33,6 +35,10 @@
public class ClipNonZeroRule extends OperatorProcessor
{
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(ClipNonZeroRule.class);
/**
* process : W : Set the clipping path using non zero winding rule.
@@ -51,7 +57,7 @@
}
catch (Exception e)
{
- logger().warn(e, e);
+ log.warn(e, e);
}
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClosePath.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClosePath.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClosePath.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/ClosePath.java Mon Sep 14 13:00:47 2009
@@ -18,6 +18,9 @@
import java.util.List;
import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdfviewer.PageDrawer;
import org.apache.pdfbox.util.PDFOperator;
import org.apache.pdfbox.util.operator.OperatorProcessor;
@@ -30,6 +33,12 @@
*/
public class ClosePath extends OperatorProcessor
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(ClosePath.class);
+
/**
* process : h : Close path.
* @param operator The operator that is being executed.
@@ -46,7 +55,7 @@
}
catch( Throwable t )
{
- logger().warn(t, t);
+ log.warn(t, t);
}
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/FillEvenOddRule.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/FillEvenOddRule.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/FillEvenOddRule.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/FillEvenOddRule.java Mon Sep 14 13:00:47 2009
@@ -20,6 +20,8 @@
import java.io.IOException;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdfviewer.PageDrawer;
import org.apache.pdfbox.util.PDFOperator;
import org.apache.pdfbox.util.operator.OperatorProcessor;
@@ -33,6 +35,10 @@
public class FillEvenOddRule extends OperatorProcessor
{
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(FillEvenOddRule.class);
/**
* process : f* : fill path using even odd rule.
@@ -51,7 +57,7 @@
}
catch (Exception e)
{
- logger().warn(e, e);
+ log.warn(e, e);
}
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/FillNonZeroRule.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/FillNonZeroRule.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/FillNonZeroRule.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/FillNonZeroRule.java Mon Sep 14 13:00:47 2009
@@ -20,6 +20,8 @@
import java.io.IOException;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdfviewer.PageDrawer;
import org.apache.pdfbox.util.PDFOperator;
import org.apache.pdfbox.util.operator.OperatorProcessor;
@@ -33,6 +35,10 @@
public class FillNonZeroRule extends OperatorProcessor
{
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(FillNonZeroRule.class);
/**
* process : F/f : fill path using non zero winding rule.
@@ -52,7 +58,7 @@
}
catch (Exception e)
{
- logger().warn(e, e);
+ log.warn(e, e);
}
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java Mon Sep 14 13:00:47 2009
@@ -24,6 +24,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.pdfviewer.PageDrawer;
@@ -44,6 +46,12 @@
*/
public class Invoke extends OperatorProcessor
{
+
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(Invoke.class);
+
/**
* process : Do : Paint the specified XObject (section 4.7).
* @param operator The operator that is being executed.
@@ -68,14 +76,14 @@
BufferedImage awtImage = image.getRGBImage();
if (awtImage == null)
{
- logger().warn("getRGBImage returned NULL");
+ log.warn("getRGBImage returned NULL");
return;//TODO PKOCH
}
int imageWidth = awtImage.getWidth();
int imageHeight = awtImage.getHeight();
double pageHeight = pageSize.getHeight();
- logger().info("imageWidth: " + imageWidth + "\t\timageHeight: " + imageHeight);
+ log.info("imageWidth: " + imageWidth + "\t\timageHeight: " + imageHeight);
Matrix ctm = drawer.getGraphicsState().getCurrentTransformationMatrix();
int pageRotation = page.findRotation();
@@ -107,7 +115,7 @@
catch( Exception e )
{
e.printStackTrace();
- logger().error(e, e);
+ log.error(e, e);
}
}
else if(xobject instanceof PDXObjectForm)
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/MoveTo.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/MoveTo.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/MoveTo.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/MoveTo.java Mon Sep 14 13:00:47 2009
@@ -20,6 +20,8 @@
import java.util.List;
import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.pdfviewer.PageDrawer;
import org.apache.pdfbox.util.PDFOperator;
@@ -34,6 +36,10 @@
public class MoveTo extends OperatorProcessor
{
+ /**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(MoveTo.class);
/**
* process : m : Begin new subpath.
@@ -53,7 +59,7 @@
}
catch (Exception exception)
{
- logger().warn( exception, exception);
+ log.warn( exception, exception);
}
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/StrokePath.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/StrokePath.java?rev=814623&r1=814622&r2=814623&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/StrokePath.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/StrokePath.java Mon Sep 14 13:00:47 2009
@@ -17,6 +17,9 @@
package org.apache.pdfbox.util.operator.pagedrawer;
import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdfviewer.PageDrawer;
import org.apache.pdfbox.util.Matrix;
import org.apache.pdfbox.util.PDFOperator;
@@ -36,6 +39,11 @@
{
/**
+ * Log instance.
+ */
+ private static final Log log = LogFactory.getLog(StrokePath.class);
+
+ /**
* S stroke the path.
* @param operator The operator that is being executed.
* @param arguments List
@@ -70,7 +78,7 @@
}
catch (Exception exception)
{
- logger().warn(exception, exception);
+ log.warn(exception, exception);
}
}
}