pbwest 2002/10/02 20:23:32
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
ShorthandPropSets.java
Log:
Fixed initialization of shorthand and compound property bitmaps.
Revision Changes Path
No revision
No revision
1.1.2.2 +40 -3 xml-fop/src/org/apache/fop/fo/Attic/ShorthandPropSets.java
Index: ShorthandPropSets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/ShorthandPropSets.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ShorthandPropSets.java 2 Oct 2002 07:04:03 -0000 1.1.2.1
+++ ShorthandPropSets.java 3 Oct 2002 03:23:32 -0000 1.1.2.2
@@ -13,6 +13,7 @@
import java.lang.CloneNotSupportedException;
import java.util.Set;
+import java.util.BitSet;
import java.util.HashSet;
import java.util.HashMap;
import java.util.List;
@@ -26,6 +27,7 @@
import org.apache.fop.datatypes.PropertyValueList;
import org.apache.fop.fo.PropNames;
import org.apache.fop.datastructs.ROIntArray;
+import org.apache.fop.datastructs.ROBitSet;
import org.apache.fop.datatypes.Ints;
/**
@@ -293,6 +295,18 @@
new ROIntArray(shorthands);
/**
+ * A <tt>ROBitSet</tt> of the shorthand properties.
+ */
+ public static final ROBitSet shorthandPropSet;
+ private static final BitSet shorthandpropset;
+ static {
+ shorthandpropset = new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
+ for (int i = 0; i < shorthands.length; i++)
+ shorthandpropset.set(shorthands[i]);
+ shorthandPropSet = new ROBitSet(shorthandpropset);
+ }
+
+ /**
* Array of <i>ROIntArray</i><b> in same order as <i>shorthands</i></b>
* <i>ROIntArray</i>.
* If a public view of this is required, use
@@ -774,6 +788,29 @@
public static final ROIntArray roCompounds;
static {
roCompounds = new ROIntArray(compounds);
+ }
+
+ /**
+ * A <tt>ROBitSet</tt> of the compound properties.
+ */
+ public static final ROBitSet compoundPropSet;
+ private static final BitSet compoundpropset;
+
+ /**
+ * a <tt>ROBitSet of shorthand and compound properties.
+ */
+ public static final ROBitSet shorthandCompoundProps;
+ private static final BitSet shorthandcompoundprops;
+
+ static {
+ compoundpropset = new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
+ for (int i = 0; i < compounds.length; i++)
+ compoundpropset.set(compounds[i]);
+ compoundPropSet = new ROBitSet(compoundpropset);
+ shorthandcompoundprops = new BitSet();
+ shorthandcompoundprops.or(compoundpropset);
+ shorthandcompoundprops.or(shorthandpropset);
+ shorthandCompoundProps = new ROBitSet(shorthandcompoundprops);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
