pbwest 2002/12/02 23:41:05
Modified: src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBasicLink.java FoBidiOverride.java
FoBlockContainer.java FoBlock.java FoCharacter.java
FoExternalGraphic.java FoFloat.java FoFlow.java
FoFootnoteBody.java FoFootnote.java
FoInitialPropertySet.java FoInlineContainer.java
FoInline.java FoInstreamForeignObject.java
FoLeader.java FoListBlock.java FoListItemBody.java
FoListItem.java FoListItemLabel.java FoMarker.java
FoMultiCase.java FoMultiProperties.java
FoMultiPropertySet.java FoMultiSwitch.java
FoMultiToggle.java FoNoFo.java
FoPageNumberCitation.java FoPageNumber.java
FoPageSequence.java FoPcdata.java
FoRetrieveMarker.java FoStaticContent.java
FoTableAndCaption.java FoTableBody.java
FoTableCaption.java FoTableCell.java
FoTableColumn.java FoTableFooter.java
FoTableHeader.java FoTable.java FoTableRow.java
FoTitle.java FoWrapper.java
Log:
sparsePropsMap changed from HashMap to int[].
Revision Changes Path
No revision
No revision
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoBasicLink.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoBasicLink.java 3 Dec 2002 07:41:02 -0000 1.1.2.11
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -83,7 +84,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -91,8 +93,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoBidiOverride.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoBidiOverride.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -70,7 +71,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -78,8 +80,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoBlockContainer.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoBlockContainer.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -82,7 +83,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -90,8 +92,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoBlock.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoBlock.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -96,7 +97,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -104,8 +106,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java
Index: FoCharacter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoCharacter.java 22 Nov 2002 00:35:30 -0000 1.1.2.7
+++ FoCharacter.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -87,7 +88,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -95,8 +97,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java
Index: FoExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoExternalGraphic.java 22 Nov 2002 00:35:30 -0000 1.1.2.7
+++ FoExternalGraphic.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -85,7 +86,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -93,8 +95,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java
Index: FoFloat.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoFloat.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoFloat.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -24,6 +24,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -40,7 +41,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -60,7 +61,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -68,8 +70,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFlow.java
Index: FoFlow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFlow.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoFlow.java 1 Dec 2002 14:40:52 -0000 1.1.2.7
+++ FoFlow.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -24,6 +24,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -40,7 +41,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -59,10 +60,10 @@
// 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(1);
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = 1;
- sparsePropsMap.put
- (Ints.consts.get(PropNames.FLOW_NAME), Ints.consts.get(0));
+ sparsePropsMap[PropNames.FLOW_NAME] = 0;
sparseIndices = new int[] { PropNames.FLOW_NAME };
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java
Index: FoFootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoFootnoteBody.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoFootnoteBody.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -24,6 +24,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -40,7 +41,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -59,7 +60,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -67,8 +69,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java
Index: FoFootnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoFootnote.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoFootnote.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -50,7 +51,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -69,7 +70,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -77,8 +79,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +7 -6
xml-fop/src/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java
Index: FoInitialPropertySet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoInitialPropertySet.java 22 Nov 2002 00:35:30 -0000 1.1.2.7
+++ FoInitialPropertySet.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -72,7 +73,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -80,8 +82,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java
Index: FoInlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoInlineContainer.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoInlineContainer.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -24,6 +24,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -40,7 +41,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -81,7 +82,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -89,8 +91,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java
Index: FoInline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoInline.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoInline.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -85,7 +86,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -93,8 +95,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.9 +7 -6
xml-fop/src/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java
Index: FoInstreamForeignObject.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoInstreamForeignObject.java 22 Nov 2002 00:35:30 -0000 1.1.2.8
+++ FoInstreamForeignObject.java 3 Dec 2002 07:41:03 -0000 1.1.2.9
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -84,7 +85,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -92,8 +94,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java
Index: FoLeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoLeader.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoLeader.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -88,7 +89,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -96,8 +98,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java
Index: FoListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoListBlock.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoListBlock.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -39,7 +40,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -73,7 +74,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -81,8 +83,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java
Index: FoListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoListItemBody.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoListItemBody.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -62,7 +63,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -70,8 +72,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java
Index: FoListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoListItem.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoListItem.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -39,7 +40,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -72,7 +73,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -80,8 +82,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java
Index: FoListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoListItemLabel.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoListItemLabel.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -62,7 +63,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -70,8 +72,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java
Index: FoMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoMarker.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoMarker.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -59,11 +60,11 @@
// 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(1);
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = 1;
sparseIndices = new int[] { PropNames.MARKER_CLASS_NAME };
- sparsePropsMap.put
- (Ints.consts.get(PropNames.MARKER_CLASS_NAME), Ints.consts.get(0));
+ sparsePropsMap[PropNames.MARKER_CLASS_NAME] = 0;
}
/**
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java
Index: FoMultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoMultiCase.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoMultiCase.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -64,7 +65,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -72,8 +74,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java
Index: FoMultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoMultiProperties.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoMultiProperties.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -39,7 +40,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -59,7 +60,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -67,8 +69,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java
Index: FoMultiPropertySet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoMultiPropertySet.java 22 Nov 2002 00:46:27 -0000 1.1.2.7
+++ FoMultiPropertySet.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -58,7 +59,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -66,8 +68,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java
Index: FoMultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoMultiSwitch.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoMultiSwitch.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -39,7 +40,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -60,7 +61,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -68,8 +70,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java
Index: FoMultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoMultiToggle.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoMultiToggle.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -62,7 +63,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -70,8 +72,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +6 -5 xml-fop/src/org/apache/fop/fo/flow/Attic/FoNoFo.java
Index: FoNoFo.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoNoFo.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoNoFo.java 22 Nov 2002 00:46:27 -0000 1.1.2.7
+++ FoNoFo.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- //private static final HashMap sparsePropsMap;
+ //private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -58,10 +59,10 @@
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
sparsePropsMap = new HashMap(1);
+ Arrays.fill(sparsePropsMap, -1);
numProps = 1;
sparseIndices = new int[] { PropNames.NO_PROPERTY };
- sparsePropsMap.put
- (Ints.consts.get(PropNames.NO_PROPERTY), Ints.consts.get(0));
+ sparsePropsMap[PropNames.NO_PROPERTY] = 0;
}
*/
1.1.2.8 +7 -6
xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java
Index: FoPageNumberCitation.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoPageNumberCitation.java 22 Nov 2002 00:46:27 -0000 1.1.2.7
+++ FoPageNumberCitation.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -84,7 +85,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -92,8 +94,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumber.java
Index: FoPageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumber.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoPageNumber.java 22 Nov 2002 00:46:27 -0000 1.1.2.7
+++ FoPageNumber.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -83,7 +84,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -91,8 +93,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageSequence.java
Index: FoPageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoPageSequence.java 1 Dec 2002 14:40:52 -0000 1.1.2.7
+++ FoPageSequence.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
import java.util.NoSuchElementException;
@@ -40,7 +41,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -68,7 +69,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -76,8 +78,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.6 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPcdata.java
Index: FoPcdata.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPcdata.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoPcdata.java 22 Nov 2002 00:46:27 -0000 1.1.2.5
+++ FoPcdata.java 3 Dec 2002 07:41:03 -0000 1.1.2.6
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -87,7 +88,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -95,8 +97,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java
Index: FoRetrieveMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoRetrieveMarker.java 22 Nov 2002 00:46:27 -0000 1.1.2.7
+++ FoRetrieveMarker.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -59,7 +60,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -67,8 +69,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoStaticContent.java
Index: FoStaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoStaticContent.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoStaticContent.java 1 Dec 2002 14:40:52 -0000 1.1.2.7
+++ FoStaticContent.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -24,6 +24,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -40,7 +41,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -59,10 +60,10 @@
// 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(1);
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = 1;
- sparsePropsMap.put
- (Ints.consts.get(PropNames.FLOW_NAME), Ints.consts.get(0));
+ sparsePropsMap[PropNames.FLOW_NAME] = 0;
sparseIndices = new int[] { PropNames.FLOW_NAME };
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java
Index: FoTableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoTableAndCaption.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoTableAndCaption.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -39,7 +40,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -73,7 +74,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -81,8 +83,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java
Index: FoTableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableBody.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoTableBody.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -39,7 +40,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -68,7 +69,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -76,8 +78,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java
Index: FoTableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoTableCaption.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoTableCaption.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -24,6 +24,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -40,7 +41,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -71,7 +72,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -79,8 +81,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java
Index: FoTableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoTableCell.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoTableCell.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -24,6 +24,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -40,7 +41,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -81,7 +82,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -89,8 +91,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.8 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableColumn.java
Index: FoTableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableColumn.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoTableColumn.java 22 Nov 2002 01:05:23 -0000 1.1.2.7
+++ FoTableColumn.java 3 Dec 2002 07:41:03 -0000 1.1.2.8
@@ -22,6 +22,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -38,7 +39,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -67,7 +68,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -75,8 +77,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java
Index: FoTableFooter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableFooter.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoTableFooter.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -39,7 +40,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -68,7 +69,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -76,8 +78,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java
Index: FoTableHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableHeader.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoTableHeader.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -39,7 +40,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -68,7 +69,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -76,8 +78,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java
Index: FoTable.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTable.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoTable.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -39,7 +40,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -85,7 +86,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -93,8 +95,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java
Index: FoTableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableRow.java 1 Dec 2002 14:40:52 -0000 1.1.2.10
+++ FoTableRow.java 3 Dec 2002 07:41:03 -0000 1.1.2.11
@@ -23,6 +23,7 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -39,7 +40,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -75,7 +76,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -83,8 +85,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTitle.java
Index: FoTitle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTitle.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoTitle.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoTitle.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -27,6 +27,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -43,7 +44,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -71,7 +72,8 @@
// 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();
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -79,8 +81,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
- sparsePropsMap.put
- (Ints.consts.get(next), Ints.consts.get(propx++));
+ sparsePropsMap[next] = propx++;
}
}
1.1.2.10 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java
Index: FoWrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoWrapper.java 1 Dec 2002 14:40:52 -0000 1.1.2.9
+++ FoWrapper.java 3 Dec 2002 07:41:03 -0000 1.1.2.10
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the <i>sparsePropsSet</i> array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
- private static final HashMap sparsePropsMap;
+ private static final int[] sparsePropsMap;
/** An <tt>int</tt> array of of the applicable property indices, in
property index order. */
@@ -59,11 +60,11 @@
// 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(1);
+ sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+ Arrays.fill(sparsePropsMap, -1);
numProps = 1;
sparseIndices = new int[] { PropNames.ID };
- sparsePropsMap.put
- (Ints.consts.get(PropNames.ID), Ints.consts.get(0));
+ sparsePropsMap[PropNames.MARKER_CLASS_NAME] = 0;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
