[patch] Patch for a similar optimization in Marker.java

marker-attribute-opt.diff (text/plain), 6.45 KB, created by Andreas L. Delmelle on 2006-12-06 14:55:04 UTC

(hide)

Description: Patch for a similar optimization in Marker.java

Filename:

MIME Type:

Creator: Andreas L. Delmelle

Created: 2006-12-06 14:55:04 UTC

Size: 6.45 KB

patch

obsolete

>Index: src/java/org/apache/fop/fo/flow/Marker.java >=================================================================== >--- src/java/org/apache/fop/fo/flow/Marker.java (revision 483248) >+++ src/java/org/apache/fop/fo/flow/Marker.java (working copy) >@@ -19,7 +19,9 @@ > > package org.apache.fop.fo.flow; > >-import java.util.HashMap; >+import java.util.Collections; >+import java.util.List; >+import java.util.Map; > > import org.xml.sax.Attributes; > import org.xml.sax.Locator; >@@ -29,7 +31,6 @@ > import org.apache.fop.fo.FONode; > import org.apache.fop.fo.FObj; > import org.apache.fop.fo.FObjMixed; >-import org.apache.fop.fo.FOPropertyMapping; > import org.apache.fop.fo.PropertyList; > import org.apache.fop.fo.PropertyListMaker; > import org.apache.fop.fo.ValidationException; >@@ -44,7 +45,7 @@ > // End of property values > > private PropertyListMaker savePropertyListMaker; >- private HashMap descendantPropertyLists = new HashMap(); >+ private Map descendantPropertyLists = new java.util.HashMap(); > > /** > * Create a marker fo. >@@ -60,8 +61,8 @@ > public void bind(PropertyList pList) throws FOPException { > if (findAncestor(FO_FLOW) < 0) { > invalidChildError(locator, FO_URI, "marker", >- "An fo:marker is permitted only as the descendant " + >- "of an fo:flow"); >+ "An fo:marker is permitted only as the descendant " >+ + "of an fo:flow"); > } > > markerClassName = pList.get(PR_MARKER_CLASS_NAME).getString(); >@@ -147,7 +148,7 @@ > sb.append(" {").append(getMarkerClassName()).append("}"); > return sb.toString(); > } >- >+ > /** > * An implementation of PropertyList which only stores the explicitly > * specified properties/attributes as bundles of name-value-namespace >@@ -155,42 +156,7 @@ > */ > protected class MarkerPropertyList extends PropertyList > implements Attributes { >- >- protected class MarkerAttribute { >- >- protected String namespace; >- protected String qname; >- protected String name; >- protected String value; >- >- /** >- * Main constructor >- * @param namespace the namespace URI >- * @param qname the qualified name >- * @param name the name >- * @param value the value >- */ >- public MarkerAttribute(String namespace, String qname, >- String name, String value) { >- this.namespace = namespace; >- this.qname = qname; >- this.name = (name == null ? qname : name); >- this.value = value; >- } >- >- /** >- * Convenience constructor for FO attributes >- * @param name the attribute name >- * @param value the attribute value >- */ >- public MarkerAttribute(String name, String value) { >- this.namespace = null; >- this.qname = name; >- this.name = name; >- this.value = value; >- } >- } >- >+ > /** the array of attributes **/ > private MarkerAttribute[] attribs; > >@@ -230,8 +196,13 @@ > name = attributes.getLocalName(i); > value = attributes.getValue(i); > >- this.attribs[i] = >- new MarkerAttribute(namespace, qname, name, value); >+ if (namespace == null || "".equals(namespace)) { >+ this.attribs[i] = >+ new MarkerAttribute(namespace, qname, name, value); >+ } else { >+ this.attribs[i] = >+ MarkerAttribute.getFOAttributeInstance(name, value); >+ } > } > } > >@@ -397,4 +368,70 @@ > return null; > } > } >+ >+ /** >+ * Convenience inner class >+ */ >+ private static final class MarkerAttribute { >+ >+ protected static Map foAttributeCache = >+ Collections.synchronizedMap(new java.util.HashMap()); >+ >+ protected String namespace; >+ protected String qname; >+ protected String name; >+ protected String value; >+ >+ /** >+ * Main constructor >+ * @param namespace the namespace URI >+ * @param qname the qualified name >+ * @param name the name >+ * @param value the value >+ */ >+ private MarkerAttribute(String namespace, String qname, >+ String name, String value) { >+ this.namespace = namespace; >+ this.qname = qname; >+ this.name = (name == null ? qname : name); >+ this.value = value; >+ } >+ >+ /** >+ * Convenience method, reduces the number >+ * of distinct MarkerAttribute instances >+ * >+ * @param name the attribute name >+ * @param value the attribute value >+ * @return the single MarkerAttribute instance corresponding to >+ * the name/value-pair >+ */ >+ private static MarkerAttribute getFOAttributeInstance( >+ String name, String value) { >+ MarkerAttribute newInstance = null; >+ List valueCache; >+ if (!MarkerAttribute.foAttributeCache.containsKey(name)) { >+ newInstance = new MarkerAttribute(null, name, name, value); >+ valueCache = Collections.synchronizedList( >+ new java.util.ArrayList()); >+ valueCache.add(newInstance); >+ MarkerAttribute.foAttributeCache.put(name, valueCache); >+ } else { >+ valueCache = (List) MarkerAttribute.foAttributeCache.get(name); >+ boolean existsInstance = false; >+ for (int i = valueCache.size(); --i >= 0; ) { >+ newInstance = (MarkerAttribute) valueCache.get(i); >+ if (newInstance.value.equals(value)) { >+ existsInstance = true; >+ break; >+ } >+ } >+ if (!existsInstance) { >+ newInstance = new MarkerAttribute(null, name, name, value); >+ valueCache.add(newInstance); >+ } >+ } >+ return newInstance; >+ } >+ } > } View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]