pbwest 2004/04/19 08:37:24 Modified: src/java/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design BorderLeft.java BorderBottom.java BorderRight.java BorderTop.java Log: Made subclass of Border<Absolute> shorthands Revision Changes Path No revision No revision 1.1.2.4 +15 -13 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderLeft.java Index: BorderLeft.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderLeft.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- BorderLeft.java 19 Feb 2004 03:11:40 -0000 1.1.2.3 +++ BorderLeft.java 19 Apr 2004 15:37:23 -0000 1.1.2.4 @@ -25,7 +25,7 @@ import org.apache.fop.fo.PropNames; import org.apache.fop.fo.expr.PropertyException; -public class BorderLeft extends Property { +public class BorderLeft extends BorderAbsoluteShorthand { public static final int dataTypes = SHORTHAND; public int getDataTypes() { @@ -57,18 +57,20 @@ * <p>The value(s) provided, if valid, are converted into a list * containing the expansion of the shorthand. The elements may * be in any order. A minimum of one value will be present. + * <ul> + * <li>a border-EDGE-color <code>ColorType</code> or inheritance value</li> + * <li>a border-EDGE-style <code>EnumType</code> or inheritance value</li> + * <li>a border-EDGE-width <code>MappedNumeric</code> or inheritance + * value</li> + * </ul> + * <p>N.B. this is the order of elements defined in + * <code>ShorthandPropSets.borderRightExpansion</code> * - * a border-EDGE-color ColorType or inheritance value - * a border-EDGE-style EnumType or inheritance value - * a border-EDGE-width MappedNumeric or inheritance value - * - * N.B. this is the order of elements defined in - * ShorthandPropSets.borderRightExpansion - * - * @param propindex - the <tt>int</tt> property index. - * @param foNode - the <tt>FONode</tt> being built - * @param value <tt>PropertyValue</tt> returned by the parser - * @return <tt>PropertyValue</tt> the verified value + * @param propindex index of the property + * @param foNode on which this property value is expressed + * @param value of the property expression parsed in the previous stages + * of property expression evaluation + * @return the refined and expanded value */ public PropertyValue refineParsing (int propindex, FONode foNode, PropertyValue value) 1.1.2.4 +15 -13 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBottom.java Index: BorderBottom.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderBottom.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- BorderBottom.java 19 Feb 2004 03:11:40 -0000 1.1.2.3 +++ BorderBottom.java 19 Apr 2004 15:37:23 -0000 1.1.2.4 @@ -25,7 +25,7 @@ import org.apache.fop.fo.PropNames; import org.apache.fop.fo.expr.PropertyException; -public class BorderBottom extends Property { +public class BorderBottom extends BorderAbsoluteShorthand { public static final int dataTypes = SHORTHAND; public int getDataTypes() { @@ -57,18 +57,20 @@ * <p>The value(s) provided, if valid, are converted into a list * containing the expansion of the shorthand. The elements may * be in any order. A minimum of one value will be present. + * <ul> + * <li>a border-EDGE-color <code>ColorType</code> or inheritance value</li> + * <li>a border-EDGE-style <code>EnumType</code> or inheritance value</li> + * <li>a border-EDGE-width <code>MappedNumeric</code> or inheritance + * value</li> + * </ul> + * <p>N.B. this is the order of elements defined in + * <code>ShorthandPropSets.borderRightExpansion</code> * - * a border-EDGE-color ColorType or inheritance value - * a border-EDGE-style EnumType or inheritance value - * a border-EDGE-width MappedNumeric or inheritance value - * - * N.B. this is the order of elements defined in - * ShorthandPropSets.borderRightExpansion - * - * @param propindex - the <tt>int</tt> proeprty index. - * @param foNode - the <tt>FONode</tt> being built - * @param value <tt>PropertyValue</tt> returned by the parser - * @return <tt>PropertyValue</tt> the verified value + * @param propindex index of the property + * @param foNode on which this property value is expressed + * @param value of the property expression parsed in the previous stages + * of property expression evaluation + * @return the refined and expanded value */ public PropertyValue refineParsing (int propindex, FONode foNode, PropertyValue value) 1.1.2.4 +15 -13 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderRight.java Index: BorderRight.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderRight.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- BorderRight.java 19 Feb 2004 03:11:40 -0000 1.1.2.3 +++ BorderRight.java 19 Apr 2004 15:37:23 -0000 1.1.2.4 @@ -25,7 +25,7 @@ import org.apache.fop.fo.PropNames; import org.apache.fop.fo.expr.PropertyException; -public class BorderRight extends Property { +public class BorderRight extends BorderAbsoluteShorthand { public static final int dataTypes = SHORTHAND; public int getDataTypes() { @@ -57,18 +57,20 @@ * <p>The value(s) provided, if valid, are converted into a list * containing the expansion of the shorthand. The elements may * be in any order. A minimum of one value will be present. + * <ul> + * <li>a border-EDGE-color <code>ColorType</code> or inheritance value</li> + * <li>a border-EDGE-style <code>EnumType</code> or inheritance value</li> + * <li>a border-EDGE-width <code>MappedNumeric</code> or inheritance + * value</li> + * </ul> + * <p>N.B. this is the order of elements defined in + * <code>ShorthandPropSets.borderRightExpansion</code> * - * a border-EDGE-color ColorType or inheritance value - * a border-EDGE-style EnumType or inheritance value - * a border-EDGE-width MappedNumeric or inheritance value - * - * N.B. this is the order of elements defined in - * ShorthandPropSets.borderRightExpansion - * - * @param propindex - the <tt>int</tt> property index. - * @param foNode - the <tt>FONode</tt> being built - * @param value <tt>PropertyValue</tt> returned by the parser - * @return <tt>PropertyValue</tt> the verified value + * @param propindex index of the property + * @param foNode on which this property value is expressed + * @param value of the property expression parsed in the previous stages + * of property expression evaluation + * @return the refined and expanded value */ public PropertyValue refineParsing (int propindex, FONode foNode, PropertyValue value) 1.1.2.4 +15 -13 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderTop.java Index: BorderTop.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderTop.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- BorderTop.java 19 Feb 2004 03:11:41 -0000 1.1.2.3 +++ BorderTop.java 19 Apr 2004 15:37:23 -0000 1.1.2.4 @@ -25,7 +25,7 @@ import org.apache.fop.fo.PropNames; import org.apache.fop.fo.expr.PropertyException; -public class BorderTop extends Property { +public class BorderTop extends BorderAbsoluteShorthand { public static final int dataTypes = SHORTHAND; public int getDataTypes() { @@ -57,18 +57,20 @@ * <p>The value(s) provided, if valid, are converted into a list * containing the expansion of the shorthand. The elements may * be in any order. A minimum of one value will be present. + * <ul> + * <li>a border-EDGE-color <code>ColorType</code> or inheritance value</li> + * <li>a border-EDGE-style <code>EnumType</code> or inheritance value</li> + * <li>a border-EDGE-width <code>MappedNumeric</code> or inheritance + * value</li> + * </ul> + * <p>N.B. this is the order of elements defined in + * <code>ShorthandPropSets.borderRightExpansion</code> * - * a border-EDGE-color ColorType or inheritance value - * a border-EDGE-style EnumType or inheritance value - * a border-EDGE-width MappedNumeric or inheritance value - * - * N.B. this is the order of elements defined in - * ShorthandPropSets.borderRightExpansion - * - * @param propindex - the <tt>int</tt> property index. - * @param foNode - the <tt>FONode</tt> being built - * @param value <tt>PropertyValue</tt> returned by the parser - * @return <tt>PropertyValue</tt> the verified value + * @param propindex index of the property + * @param foNode on which this property value is expressed + * @param value of the property expression parsed in the previous stages + * of property expression evaluation + * @return the refined and expanded value */ public PropertyValue refineParsing (int propindex, FONode foNode, PropertyValue value)
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]