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 pb...@apache.org on 2002/10/30 14:35:57 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/pagination FoRegionBody.java
pbwest 2002/10/30 05:35:57
Modified: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoRegionBody.java
Log:
Name changes for sparsePropsSet support.
Removed getPropertyValue().
Revision Changes Path
No revision
No revision
1.1.2.2 +22 -40 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBody.java
Index: FoRegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBody.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoRegionBody.java 28 Oct 2002 00:04:37 -0000 1.1.2.1
+++ FoRegionBody.java 30 Oct 2002 13:35:57 -0000 1.1.2.2
@@ -35,28 +35,24 @@
private static final String tag = "$Name$";
private static final String revision = "$Revision$";
- /** Map of <tt>Integer</tt> indices of <i>applicableProps</i> array.
+ /** Map of <tt>Integer</tt> indices of <i>sparsePropsSet</i> array.
It is indexed by the FO index of the FO associated with a given
- position in the <i>applicableProps</i> array. */
- private static final HashMap applicablePropsHash;
+ position in the <i>sparsePropsSet</i> array. See
+ {@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
+ */
+ private static final HashMap sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
- private static final int[] applicableIndices;
+ private static final int[] sparseIndices;
/** The number of applicable properties. This is the size of the
- <i>applicableProps</i> array. */
+ <i>sparsePropsSet</i> array. */
private static final int numProps;
- /** The array of applicable properties. Slots in this array are indexed
- by values from the <i>applicableProps</i> <tt>HashMap</tt>.
- It is effectively a sparse array of the set of properties. */
- private PropertyValue[] applicableProps;
-
static {
- int propx = 0;
// Collect the sets of properties that apply
- BitSet propsets = (BitSet)(PropertySets.backgroundSet.clone());
+ BitSet propsets = PropertySets.backgroundSetClone();
propsets.or(PropertySets.borderSet);
propsets.or(PropertySets.paddingSet);
propsets.or(PropertySets.marginBlockSet);
@@ -69,18 +65,19 @@
propsets.set(PropNames.COLUMN_COUNT);
propsets.set(PropNames.COLUMN_GAP);
- // Map these properties into applicableProps
- // applicableProps is a HashMap containing the indicies of the
- // applicableProps array, indexed by the FO index of the FO slot
- // in applicableProps.
- applicablePropsHash = new HashMap();
+ // Map these properties into sparsePropsSet
+ // sparsePropsSet is a HashMap containing the indicies of the
+ // sparsePropsSet array, indexed by the FO index of the FO slot
+ // in sparsePropsSet.
+ sparsePropsMap = new HashMap();
numProps = propsets.cardinality();
- applicableIndices = new int[numProps];
+ sparseIndices = new int[numProps];
+ int propx = 0;
for (int next = propsets.nextSetBit(0);
next >= 0;
next = propsets.nextSetBit(next + 1)) {
- applicableIndices[propx] = next;
- applicablePropsHash.put
+ sparseIndices[propx] = next;
+ sparsePropsMap.put
(Ints.consts.get(next), Ints.consts.get(propx++));
}
}
@@ -95,24 +92,9 @@
throws Tree.TreeException, FOPException
{
super(foTree, FObjectNames.REGION_BODY, parent, event,
- FOPropertySets.LAYOUT_SET);
- applicableProps = new PropertyValue[numProps];
- // Develop the property set for this FO
-
- FoXMLEvent ev = xmlevents.getEndElement(event);
+ FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
+ numProps);
+ makeSparsePropsSet();
}
- /**
- * Get a property value applying to this FO node.
- * @param property - the <tt>int</tt> property index.
- * @return the <tt>PropertyValue</tt> with the indicated property index.
- */
- public PropertyValue getPropertyValue(int property)
- throws PropertyException
- {
- return applicableProps[
- ((Integer)
- (applicablePropsHash.get(Ints.consts.get(property)))).intValue()
- ];
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org