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 vh...@apache.org on 2011/12/05 15:38:34 UTC
svn commit: r1210477 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo:
ElementMappingRegistry.java FOTreeBuilder.java FObj.java
properties/PropertyMaker.java
Author: vhennebert
Date: Mon Dec 5 14:38:34 2011
New Revision: 1210477
URL: http://svn.apache.org/viewvc?rev=1210477&view=rev
Log:
Bugzilla #52206: small performance improvements by declaring some class members as static
Patch by Alexis Giotis, applied with minor modifications
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java?rev=1210477&r1=1210476&r2=1210477&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java Mon Dec 5 14:38:34 2011
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.Map;
import org.w3c.dom.DOMImplementation;
-
import org.xml.sax.Locator;
import org.apache.commons.logging.Log;
@@ -42,7 +41,7 @@ import org.apache.fop.fo.ElementMapping.
public class ElementMappingRegistry {
/** logging instance */
- protected Log log = LogFactory.getLog(ElementMappingRegistry.class);
+ private static final Log LOG = LogFactory.getLog(ElementMappingRegistry.class);
/**
* Table mapping element names to the makers of objects
@@ -79,7 +78,7 @@ public class ElementMappingRegistry {
try {
addElementMapping(mapping);
} catch (IllegalArgumentException e) {
- log.warn("Error while adding element mapping", e);
+ LOG.warn("Error while adding element mapping", e);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=1210477&r1=1210476&r2=1210477&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java Mon Dec 5 14:38:34 2011
@@ -53,7 +53,7 @@ import org.apache.fop.util.ContentHandle
public class FOTreeBuilder extends DefaultHandler {
/** logging instance */
- protected Log log = LogFactory.getLog(FOTreeBuilder.class);
+ private static final Log LOG = LogFactory.getLog(FOTreeBuilder.class);
/** The registry for ElementMapping instances */
protected ElementMappingRegistry elementMappingRegistry;
@@ -140,8 +140,8 @@ public class FOTreeBuilder extends Defau
used = true;
empty = true;
rootFObj = null; // allows FOTreeBuilder to be reused
- if (log.isDebugEnabled()) {
- log.debug("Building formatting object tree");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Building formatting object tree");
}
foEventHandler.startDocument();
this.mainFOHandler = new MainFOHandler();
@@ -158,8 +158,8 @@ public class FOTreeBuilder extends Defau
eventProducer.emptyDocument(this);
}
rootFObj = null;
- if (log.isDebugEnabled()) {
- log.debug("Parsing of document complete");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Parsing of document complete");
}
foEventHandler.endDocument();
}
@@ -188,17 +188,17 @@ public class FOTreeBuilder extends Defau
/** {@inheritDoc} */
public void warning(SAXParseException e) {
- log.warn(e.getLocalizedMessage());
+ LOG.warn(e.getLocalizedMessage());
}
/** {@inheritDoc} */
public void error(SAXParseException e) {
- log.error(e.toString());
+ LOG.error(e.toString());
}
/** {@inheritDoc} */
public void fatalError(SAXParseException e) throws SAXException {
- log.error(e.toString());
+ LOG.error(e.toString());
throw e;
}
@@ -364,7 +364,7 @@ public class FOTreeBuilder extends Defau
}
if (currentFObj.getParent() == null) {
- log.debug("endElement for top-level " + currentFObj.getName());
+ LOG.debug("endElement for top-level " + currentFObj.getName());
}
currentFObj = currentFObj.getParent();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=1210477&r1=1210476&r2=1210477&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Mon Dec 5 14:38:34 2011
@@ -627,7 +627,7 @@ public abstract class FObj extends FONod
}
/** Basic {@link FONode.FONodeIterator} implementation */
- public class FObjIterator implements FONodeIterator {
+ public static class FObjIterator implements FONodeIterator {
private static final int F_NONE_ALLOWED = 0;
private static final int F_SET_ALLOWED = 1;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java?rev=1210477&r1=1210476&r2=1210477&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java Mon Dec 5 14:38:34 2011
@@ -43,7 +43,9 @@ import org.apache.fop.fo.expr.PropertyPa
public class PropertyMaker implements Cloneable {
/** Logger instance */
- private static Log log = LogFactory.getLog(PropertyMaker.class);
+ private static final Log LOG = LogFactory.getLog(PropertyMaker.class);
+
+ private static final boolean IS_LOG_TRACE_ENABLED = LOG.isTraceEnabled();
/** the property ID */
protected int propId;
@@ -250,8 +252,8 @@ public class PropertyMaker implements Cl
throws PropertyException {
Property p = null;
- if (log.isTraceEnabled()) {
- log.trace("PropertyMaker.findProperty: "
+ if (IS_LOG_TRACE_ENABLED) {
+ LOG.trace("PropertyMaker.findProperty: "
+ FOPropertyMapping.getPropertyName(propId)
+ ", " + propertyList.getFObj().getName());
}
@@ -377,14 +379,14 @@ public class PropertyMaker implements Cl
*/
public Property make(PropertyList propertyList) throws PropertyException {
if (defaultProperty != null) {
- if (log.isTraceEnabled()) {
- log.trace("PropertyMaker.make: reusing defaultProperty, "
+ if (IS_LOG_TRACE_ENABLED) {
+ LOG.trace("PropertyMaker.make: reusing defaultProperty, "
+ FOPropertyMapping.getPropertyName(propId));
}
return defaultProperty;
}
- if (log.isTraceEnabled()) {
- log.trace("PropertyMaker.make: making default property value, "
+ if (IS_LOG_TRACE_ENABLED) {
+ LOG.trace("PropertyMaker.make: making default property value, "
+ FOPropertyMapping.getPropertyName(propId)
+ ", " + propertyList.getFObj().getName());
}
@@ -413,7 +415,7 @@ public class PropertyMaker implements Cl
if ((propId & Constants.COMPOUND_MASK) != 0) {
newProp = getSubprop(newProp, propId & Constants.COMPOUND_MASK);
}
- if (!isInherited() && log.isWarnEnabled()) {
+ if (!isInherited() && LOG.isWarnEnabled()) {
/* check whether explicit value is available on the parent
* (for inherited properties, an inherited value will always
* be available)
@@ -421,7 +423,7 @@ public class PropertyMaker implements Cl
Property parentExplicit = propertyList.getParentPropertyList()
.getExplicit(getPropId());
if (parentExplicit == null) {
- log.warn(FOPropertyMapping.getPropertyName(getPropId())
+ LOG.warn(FOPropertyMapping.getPropertyName(getPropId())
+ "=\"inherit\" on " + propertyList.getFObj().getName()
+ ", but no explicit value found on the parent FO.");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org