pbwest 2002/10/02 00:10:37 Modified: src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design SystemFontFunction.java Log: Split ShorthandPropSets from PropertySets. Revision Changes Path No revision No revision 1.1.2.5 +7 -7 xml-fop/src/org/apache/fop/fo/expr/Attic/SystemFontFunction.java Index: SystemFontFunction.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/Attic/SystemFontFunction.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- SystemFontFunction.java 18 Sep 2002 15:35:03 -0000 1.1.2.4 +++ SystemFontFunction.java 2 Oct 2002 07:10:37 -0000 1.1.2.5 @@ -9,7 +9,7 @@ import org.apache.fop.fo.Properties.Font; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; +import org.apache.fop.fo.ShorthandPropSets; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.expr.FunctionNotImplementedException; import org.apache.fop.datastructs.ROIntArray; @@ -29,7 +29,7 @@ * Return the <tt>PropertyValue</tt> appropriate to the <em>property</em> * of the argument. <em>property</em> must be one of the font * characteristic properties in the expansion set of the <em>font</em> - * shorthand property; <em>PropertySets.fontExpansion</em>. + * shorthand property; <em>ShorthandPropSets.fontExpansion</em>. * @param property <tt>int</tt> index of the font characteristic property * to be returned. * @param font <tt>String</tt> name of the system font @@ -50,7 +50,7 @@ * font characteristic, named by <em>propName</em>, defined on the * system font named by <em>font</em>. <em>propName</em> must be one of * characteristic properties in the expansion set of the <em>font</em> - * shorthand property; <em>PropertySets.fontExpansion</em>. + * shorthand property; <em>ShorthandPropSets.fontExpansion</em>. * @param property <tt>int</tt> index of the property for the * <tt>PropertyValue</tt> to be returned. * @param font <tt>String</tt> name of the system font @@ -88,7 +88,7 @@ { // Get the array of indices of the properties in the // expansion of this shorthand - ROIntArray expansion = PropertySets.fontExpansion; + ROIntArray expansion = ShorthandPropSets.fontExpansion; PropertyValueList list = new PropertyValueList(property); for (int i = 0; i < expansion.length; i++) { list.add(systemFontCharacteristic(expansion.get(i), font));
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]