You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2007/12/07 09:49:49 UTC
svn commit: r602024 - in
/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop:
image2/impl/AbstractImageSessionContext.java
image2/pipeline/PipelineFactory.java pdf/PDFICCStream.java pdf/PDFObject.java
Author: jeremias
Date: Fri Dec 7 00:49:49 2007
New Revision: 602024
URL: http://svn.apache.org/viewvc?rev=602024&view=rev
Log:
Some small javadoc and logging improvements/refinements.
Modified:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/AbstractImageSessionContext.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/pipeline/PipelineFactory.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/pdf/PDFICCStream.java
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/pdf/PDFObject.java
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/AbstractImageSessionContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/AbstractImageSessionContext.java?rev=602024&r1=602023&r2=602024&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/AbstractImageSessionContext.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/AbstractImageSessionContext.java Fri Dec 7 00:49:49 2007
@@ -169,16 +169,19 @@
public Source needSource(String uri) throws FileNotFoundException {
Source src = getSource(uri);
if (src == null) {
- log.debug("Creating new Source for " + uri);
+ if (log.isDebugEnabled()) {
+ log.debug("Creating new Source for " + uri);
+
+ }
src = newSource(uri);
if (src == null) {
throw new FileNotFoundException("Image not found: " + uri);
}
} else {
- log.debug("Reusing Source for " + uri);
+ if (log.isDebugEnabled()) {
+ log.debug("Reusing Source for " + uri);
+ }
}
- log.debug(" --> " + src);
- log.debug(" --> " + Thread.currentThread().getName() + " " + Thread.currentThread());
return src;
}
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/pipeline/PipelineFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/pipeline/PipelineFactory.java?rev=602024&r1=602023&r2=602024&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/pipeline/PipelineFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/pipeline/PipelineFactory.java Fri Dec 7 00:49:49 2007
@@ -101,8 +101,8 @@
pipeline = new ImageProviderPipeline(manager.getCache(), loader);
} else {
//Need to use ImageConverters
- if (log.isDebugEnabled()) {
- log.debug("No ImageLoaderFactory found that can load this format directly."
+ if (log.isTraceEnabled()) {
+ log.trace("No ImageLoaderFactory found that can load this format directly."
+ " Trying ImageConverters instead...");
}
@@ -120,15 +120,15 @@
dir);
ImageRepresentation origin = new ImageRepresentation(flavors[j]);
dijkstra.execute(origin, destination);
- if (log.isDebugEnabled()) {
- log.debug("Lowest penalty: " + dijkstra.getLowestPenalty(destination));
+ if (log.isTraceEnabled()) {
+ log.trace("Lowest penalty: " + dijkstra.getLowestPenalty(destination));
}
Vertex prev = destination;
Vertex pred = dijkstra.getPredecessor(destination);
if (pred == null) {
- if (log.isDebugEnabled()) {
- log.debug("No route found!");
+ if (log.isTraceEnabled()) {
+ log.trace("No route found!");
}
} else {
LinkedList stops = new LinkedList();
@@ -146,7 +146,7 @@
ImageConversionEdge edge = (ImageConversionEdge)iter.next();
pipeline.addConverter(edge.getImageConverter());
}
- if (log.isDebugEnabled()) {
+ if (pipeline != null && log.isDebugEnabled()) {
log.debug("Pipeline: " + pipeline);
}
return pipeline;
@@ -159,7 +159,7 @@
}
}
- if (log.isDebugEnabled()) {
+ if (pipeline != null && log.isDebugEnabled()) {
log.debug("Pipeline: " + pipeline);
}
return pipeline;
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/pdf/PDFICCStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/pdf/PDFICCStream.java?rev=602024&r1=602023&r2=602024&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/pdf/PDFICCStream.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/pdf/PDFICCStream.java Fri Dec 7 00:49:49 2007
@@ -66,9 +66,7 @@
return length;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
protected void outputRawStreamData(OutputStream out) throws IOException {
cp.write(out);
}
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/pdf/PDFObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/pdf/PDFObject.java?rev=602024&r1=602023&r2=602024&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/pdf/PDFObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/pdf/PDFObject.java Fri Dec 7 00:49:49 2007
@@ -83,7 +83,9 @@
*/
public void setObjectNumber(int objnum) {
this.objnum = objnum;
- log.trace("Assigning " + this + " object number " + objnum);
+ if (log.isTraceEnabled()) {
+ log.trace("Assigning " + this + " object number " + objnum);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org