pbwest 2002/11/20 23:10:14
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
ShorthandPropSets.java
Log:
Moved shorthandExpansions. Fixed getSHandExpansionSet().
Revision Changes Path
No revision
No revision
1.1.2.5 +35 -35 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ShorthandPropSets.java 21 Oct 2002 15:47:17 -0000 1.1.2.4
+++ ShorthandPropSets.java 21 Nov 2002 07:10:14 -0000 1.1.2.5
@@ -277,37 +277,6 @@
};
/**
- * Map property index to shorthand array index
- */
- private static final HashMap shorthandMap;
- static {
- shorthandMap = new HashMap(shorthands.length);
- for (int i = 0; i < shorthands.length; i++) {
- shorthandMap.put
- ((Object)(Ints.consts.get(shorthands[i])),
- (Object)(Ints.consts.get(i)));
- }
- }
-
- /**
- * RO Shorthand properties.
- */
- public static final ROIntArray roShorthands =
- 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
@@ -341,6 +310,37 @@
};
/**
+ * Map property index to shorthand array index
+ */
+ private static final HashMap shorthandMap;
+ static {
+ shorthandMap = new HashMap(shorthands.length);
+ for (int i = 0; i < shorthands.length; i++) {
+ shorthandMap.put
+ ((Object)(Ints.consts.get(shorthands[i])),
+ (Object)(Ints.consts.get(i)));
+ }
+ }
+
+ /**
+ * RO Shorthand properties.
+ */
+ public static final ROIntArray roShorthands =
+ 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);
+ }
+
+ /**
* @param property <tt>int</tt> property index
* @return <tt>ROIntArray</tt> containing the expansion list for
* this shorthand.
@@ -360,7 +360,7 @@
}
// Get the array of indices of the properties in the
// expansion of this shorthand
- return shorthandExpansions[property];
+ return shorthandExpansions[sHIndex.intValue()];
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
