You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2009/09/03 20:09:40 UTC
svn commit: r811063 - in /incubator/pdfbox/trunk: ./
src/main/java/org/apache/pdfbox/cos/
src/main/java/org/apache/pdfbox/exceptions/
src/main/java/org/apache/pdfbox/filter/
src/main/java/org/apache/pdfbox/pdfparser/
src/main/java/org/apache/pdfbox/pdf...
Author: lehmi
Date: Thu Sep 3 18:09:38 2009
New Revision: 811063
URL: http://svn.apache.org/viewvc?rev=811063&view=rev
Log:
PDFBOX-472: use apache commons logging. Patch from Sean Bridges (sean dot bridges at gmail dot com)
Modified:
incubator/pdfbox/trunk/build.xml
incubator/pdfbox/trunk/pom.xml
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/cos/COSDocument.java
incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/exceptions/LoggingObject.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/graphics/color/PDColorSpaceInstance.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/util/PDFStreamEngine.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/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/build.xml
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/build.xml?rev=811063&r1=811062&r2=811063&view=diff
==============================================================================
--- incubator/pdfbox/trunk/build.xml (original)
+++ incubator/pdfbox/trunk/build.xml Thu Sep 3 18:09:38 2009
@@ -79,15 +79,17 @@
<property name="junit.url" value="${maven.repo2}/junit/junit/3.8.2/${junit.name}.jar" />
<property name="junit.jar" value="${jar.dir}/${junit.name}.jar" />
- <property name="icu4j.jar" value="${jar.dir}/icu4j-4_0.jar" />
+ <property name="logging.name" value="commons-logging-1.1.1" />
+ <property name="logging.url" value="${maven.repo1}/commons-logging/commons-logging/1.1.1/${logging.name}.jar" />
+ <property name="logging.jar" value="${jar.dir}/${logging.name}.jar" />
+
+ <property name="icu4j.jar" value="${jar.dir}/icu4j-4_0.jar" />
<property name="checkstyle.url" value="${maven.repo2}/checkstyle/checkstyle/4.4/checkstyle-4.4.jar" />
<property name="checkstyle.jar" value="${tool.dir}/checkstyle.jar" />
<property name="beanutils.url" value="${maven.repo2}/commons-beanutils/commons-beanutils-core/1.7.0/commons-beanutils-core-1.7.0.jar" />
<property name="beanutils.jar" value="${tool.dir}/commons-beanutils.jar" />
- <property name="logging.url" value="${maven.repo2}/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar" />
- <property name="logging.jar" value="${tool.dir}/commons-logging.jar" />
<property name="antlr.url" value="${maven.repo2}/antlr/antlr/2.7.6/antlr-2.7.6.jar" />
<property name="antlr.jar" value="${tool.dir}/antlr.jar" />
@@ -270,6 +272,7 @@
<classpath>
<pathelement path="${junit.jar}" />
<pathelement path="${ant.jar}" />
+ <pathelement path="${logging.jar}" />
<pathelement path="${lucene.jar}" />
<pathelement path="${lucene-demo.jar}" />
<pathelement path="${fontbox.jar}" />
@@ -294,6 +297,7 @@
<classpath>
<pathelement path="${junit.jar}" />
<pathelement path="${ant.jar}" />
+ <pathelement path="${logging.jar}" />
<pathelement path="${lucene.jar}" />
<pathelement path="${lucene-demo.jar}" />
<pathelement path="${fontbox.jar}" />
@@ -314,6 +318,7 @@
<classpath>
<pathelement path="${junit.jar}" />
<pathelement path="${ant.jar}" />
+ <pathelement path="${logging.jar}" />
<pathelement path="${lucene.jar}" />
<pathelement path="${lucene-demo.jar}" />
<pathelement path="${fontbox.jar}" />
@@ -374,10 +379,6 @@
<param name="destfile" value="${beanutils.jar}"/>
</antcall>
<antcall target="downloadfile">
- <param name="sourcefile" value="${logging.url}"/>
- <param name="destfile" value="${logging.jar}"/>
- </antcall>
- <antcall target="downloadfile">
<param name="sourcefile" value="${antlr.url}"/>
<param name="destfile" value="${antlr.jar}"/>
</antcall>
@@ -396,7 +397,7 @@
</target>
<target name="find.lucene-core">
- <available property="lucene-core.found" file="${jar.dir}/${lucene.jar}"/>
+ <available property="lucene-core.found" file="${lucene.jar}"/>
</target>
<target name="get.lucene-core"
@@ -437,6 +438,10 @@
<param name="sourcefile" value="${junit.url}"/>
<param name="destfile" value="${junit.jar}"/>
</antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${logging.url}"/>
+ <param name="destfile" value="${logging.jar}"/>
+ </antcall>
</target>
<target name="package" depends="get.externallibs,compile" description="Package pdfbox into a jar file">
Modified: incubator/pdfbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/pom.xml?rev=811063&r1=811062&r2=811063&view=diff
==============================================================================
--- incubator/pdfbox/trunk/pom.xml (original)
+++ incubator/pdfbox/trunk/pom.xml Thu Sep 3 18:09:38 2009
@@ -56,6 +56,12 @@
<version>0.8.0-incubator</version>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -162,7 +162,7 @@
}
catch (ClassCastException e)
{
- logger().warning(e.toString() + "\n at\n" + fullStackTrace(e));
+ logger().warn(e, e);
}
}
}
@@ -212,7 +212,7 @@
}
catch (ClassCastException e)
{
- logger().warning(e.toString() + "\n at\n" + fullStackTrace(e));
+ logger().warn(e, e);
}
}
}
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/exceptions/LoggingObject.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/exceptions/LoggingObject.java?rev=811063&r1=811062&r2=811063&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/exceptions/LoggingObject.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/exceptions/LoggingObject.java Thu Sep 3 18:09:38 2009
@@ -16,11 +16,8 @@
*/
package org.apache.pdfbox.exceptions;
-import java.io.IOException;
-import java.util.logging.FileHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Implementation of base object to help with error-handling.
@@ -30,73 +27,19 @@
*/
public abstract class LoggingObject
{
- private static Logger logger; //dwilson 3/15/07
-
- static
- {
- try
- {
- FileHandler fh = new FileHandler("PDFBox.log", true);
- fh.setFormatter(new SimpleFormatter());
- logger = Logger.getLogger("TestLog");
- logger.addHandler(fh);
-
- /*Set the log level here.
- The lower your logging level, the more stuff will be logged.
- Options are:
- * OFF -- log nothing
- * SEVERE (highest value)
- * WARNING
- * INFO
- * CONFIG
- * FINE
- * FINER
- * FINEST (lowest value)
- http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/Level.html
-
- I recommend INFO for debug builds and either SEVERE or OFF for production builds.
- */
- logger.setLevel(Level.WARNING);
-// logger_.setLevel(Level.INFO);
- }
- catch (IOException exception)
- {
- System.err.println("Error while opening the logfile:");
- exception.printStackTrace();
- }
- }
+ private static Log logger; //dwilson 3/15/07
/**
* Returns the main logger instance.
* @return the logger instance
*/
- protected Logger logger() //dwilson 3/15/07
+ protected Log logger() //dwilson 3/15/07
{
- return logger;
- }
-
- /**
- * Constructs a String with the full stack trace of the given exception.
- * @param e the exception
- * @return the full stack trace as a string
- */
- protected static String fullStackTrace(Throwable e)
- {
- int i;
- StackTraceElement[] element;
-
- StringBuffer sRet = new StringBuffer();
- element = e.getStackTrace();
- for (i = 0; i < element.length; i++)
+ if (logger == null)
{
- sRet.append((element[i].toString())).append("\n");
+ logger = LogFactory.getLog(getClass());
}
- if (e.getCause() != null)
- {
- sRet.append("Caused By \n\t").append(e.getCause().getMessage());
- sRet.append(fullStackTrace(e.getCause()));
- }
-
- return sRet.toString();
+ return logger;
}
+
}
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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -115,17 +115,17 @@
catch (OutOfMemoryError exception)
{
// if the stream is corrupt an OutOfMemoryError may occur
- logger().severe("Stop reading corrupt stream");
+ logger().error("Stop reading corrupt stream");
}
catch (ZipException exception)
{
// if the stream is corrupt an OutOfMemoryError may occur
- logger().severe("Stop reading corrupt stream");
+ logger().error("Stop reading corrupt stream");
}
catch (EOFException exception)
{
// if the stream is corrupt an OutOfMemoryError may occur
- logger().severe("Stop reading corrupt stream");
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -21,8 +21,6 @@
import java.io.IOException;
import java.io.OutputStream;
-import java.util.logging.Level;
-
import org.apache.pdfbox.io.ByteArrayPushBackInputStream;
import org.apache.pdfbox.io.PushBackInputStream;
import org.apache.pdfbox.io.RandomAccess;
@@ -189,7 +187,7 @@
{
//an invalid dictionary, we are expecting
//the key, read until we can recover
- logger().warning("Invalid dictionary, found:" + (char)c + " but expected:\''");
+ logger().warn("Invalid dictionary, found:" + (char)c + " but expected:\''");
int read = pdfSource.read();
while(read != -1 && read != '/' && read != '>')
{
@@ -222,7 +220,7 @@
if( value == null )
{
- logger().warning("Bad Dictionary Declaration " + pdfSource );
+ logger().warn("Bad Dictionary Declaration " + pdfSource );
}
else
{
@@ -699,7 +697,7 @@
}
else
{
- logger().log(Level.WARNING, "Corrupt object reference" );
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -85,7 +85,10 @@
new COSInteger( ((Integer)objectNumbers.get( objectCounter)).intValue() );
object.setObjectNumber( objNum );
streamObjects.add( object );
- logger().fine( "parsed=" + object );
+ if(logger().isDebugEnabled())
+ {
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.logging.Level;
import java.util.regex.Pattern;
import org.apache.pdfbox.cos.COSBase;
@@ -179,7 +178,7 @@
* Warning is sent to the PDFBox.log and to the Console that
* we skipped over an object
*/
- logger().log(Level.WARNING ,"Parsing Error, Skipping Object", e);
+ logger().warn("Parsing Error, Skipping Object", e);
skipToNextObj();
}
else
@@ -683,7 +682,7 @@
String[] splitString = currentLine.split(" ");
if (splitString.length < 3)
{
- logger().warning("invalid xref line: " + currentLine);
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -142,9 +142,9 @@
else
{
// TODO : need to implement....
- logger().warning("Unsupported RenderingMode "+this.getGraphicsState().getTextState().getRenderingMode()
- +" in PageDrawer.processTextPosition()");
- logger().warning("Using RenderingMode "+PDTextState.RENDERING_MODE_FILL_TEXT+" instead");
+ logger().warn("Unsupported RenderingMode "+this.getGraphicsState().getTextState().getRenderingMode()
+ +" in PageDrawer.processTextPosition()"
+ + "Using RenderingMode "+PDTextState.RENDERING_MODE_FILL_TEXT+" instead");
graphics.setColor( this.getGraphicsState().getNonStrokingColorSpace().createColor() );
}
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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -52,7 +52,6 @@
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List;
-import java.util.logging.Level;
/**
* This represents a single page in a PDF document.
@@ -703,7 +702,7 @@
}
catch (ImagingOpException e)
{
- logger().log(Level.WARNING, "Unable to rotate page image", e);
+ logger().warn("Unable to rotate page image", e);
}
return retval;
Modified: incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpaceInstance.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpaceInstance.java?rev=811063&r1=811062&r2=811063&view=diff
==============================================================================
--- incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpaceInstance.java (original)
+++ incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpaceInstance.java Thu Sep 3 18:09:38 2009
@@ -96,17 +96,17 @@
{
values = values + components[i] + "\t";
}
- logger().severe(exception.toString() + "\n" + values + "\n at\n" + fullStackTrace(exception));
+ logger().error(exception + "\n" + values, exception);
throw exception;
}
catch (IOException ioexception)
{
- logger().severe(ioexception.toString() + "\n at\n" + fullStackTrace(ioexception));
+ logger().error(ioexception, ioexception);
throw ioexception;
}
catch (Exception e)
{
- logger().severe(e.toString() + "\n at\n" + fullStackTrace(e));
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -109,13 +109,13 @@
}
catch (IOException ioexception)
{
- logger().severe(ioexception.toString() + "\n at\n" + fullStackTrace(ioexception));
+ logger().error(ioexception, ioexception);
throw ioexception;
}
catch (Exception exception)
{
- logger().severe(exception.toString() + "\n at\n" +fullStackTrace(exception));
+ logger().error(exception, exception);
throw new IOException("Failed to Create ColorSpace");
}
}
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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -113,7 +113,7 @@
}
catch (Exception e)
{
- logger().severe(e.toString() + "\n at\n" + fullStackTrace(e));
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -133,7 +133,7 @@
PDColorSpace colorspace = getColorSpace();
if (colorspace == null)
{
- logger().severe("getColorSpace() returned NULL. Predictor = " + getPredictor());
+ logger().error("getColorSpace() returned NULL. Predictor = " + getPredictor());
return null;
}
@@ -185,7 +185,7 @@
}
catch (Exception exception)
{
- logger().severe(exception.toString() + "\n at\n" + fullStackTrace(exception));
+ logger().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/util/PDFStreamEngine.java
URL: http://svn.apache.org/viewvc/incubator/pdfbox/trunk/src/main/java/org/apache/pdfbox/util/PDFStreamEngine.java?rev=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -227,7 +227,10 @@
{
arguments.add( next );
}
- logger().fine("token: " + next.toString());
+ if(logger().isDebugEnabled())
+ {
+ logger().debug("token: " + next.toString());
+ }
}
}
}
@@ -483,7 +486,7 @@
}
catch (IOException e)
{
- logger().warning(e.toString() + "\n at\n" + fullStackTrace(e));
+ logger().warn(e, e);
}
}
@@ -517,7 +520,7 @@
}
catch (Exception e)
{
- logger().warning(e.toString() + "\n at\n" + fullStackTrace(e));
+ logger().warn(e, e);
}
}
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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -80,13 +80,13 @@
}
else
{
- logger().warning("Not supported colorspace "+colorSpace.getName()
+ logger().warn("Not supported colorspace "+colorSpace.getName()
+ " within operator "+operator.getOperation());
}
}
else
{
- logger().warning("Colorspace not found in "+getClass().getName()+".process!!");
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -91,7 +91,7 @@
}
else
{
- logger().warning("Not supported colorspace "+colorSpace.getName()
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -85,7 +85,7 @@
}
else
{
- logger().warning("Colorspace not found in "+getClass().getName()+".process!!");
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -88,7 +88,7 @@
}
else
{
- logger().warning("Not supported colorspace "+colorSpace.getName()
+ logger().warn("Not supported colorspace "+colorSpace.getName()
+ " within operator "+operator.getOperation());
}
}
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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -51,7 +51,7 @@
}
catch (Exception e)
{
- logger().warning(e.getMessage() + "\n at\n" + fullStackTrace(e));
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -51,7 +51,7 @@
}
catch (Exception e)
{
- logger().warning(e.getMessage() + "\n at\n" + fullStackTrace(e));
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -46,7 +46,7 @@
}
catch( Throwable t )
{
- logger().warning(t.getMessage() + "\n at\n" + fullStackTrace(t));
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -51,7 +51,7 @@
}
catch (Exception e)
{
- logger().warning(e.getMessage() + "\n at\n" + fullStackTrace(e));
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -52,7 +52,7 @@
}
catch (Exception e)
{
- logger().warning(e.getMessage() + "\n at\n" + fullStackTrace(e));
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -68,7 +68,7 @@
BufferedImage awtImage = image.getRGBImage();
if (awtImage == null)
{
- logger().warning("getRGBImage returned NULL");
+ logger().warn("getRGBImage returned NULL");
return;//TODO PKOCH
}
int imageWidth = awtImage.getWidth();
@@ -107,7 +107,7 @@
catch( Exception e )
{
e.printStackTrace();
- logger().severe(e.toString() + "\n at\n" + fullStackTrace(e));
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -53,7 +53,7 @@
}
catch (Exception exception)
{
- logger().warning( exception.toString() + "/n at/n" + fullStackTrace(exception));
+ logger().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=811063&r1=811062&r2=811063&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 Thu Sep 3 18:09:38 2009
@@ -70,7 +70,7 @@
}
catch (Exception exception)
{
- logger().warning( exception.toString() + "/n at/n" + fullStackTrace(exception));
+ logger().warn(exception, exception);
}
}
}