From: Peter Bernard West Date: Mon, 19 Apr 2004 15:37:23 +0000 (+0000) Subject: Made subclass of Border shorthands X-Git-Tag: Defoe_export~222 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1042814f7cf77e5ddb6f4e2e558adacf2e69cc05;p=xmlgraphics-fop.git Made subclass of Border shorthands git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197522 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/fo/properties/BorderBottom.java b/src/java/org/apache/fop/fo/properties/BorderBottom.java index a492de028..9f680c17e 100644 --- a/src/java/org/apache/fop/fo/properties/BorderBottom.java +++ b/src/java/org/apache/fop/fo/properties/BorderBottom.java @@ -25,7 +25,7 @@ import org.apache.fop.fo.FONode; 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 @@ public class BorderBottom extends Property { *

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. + *

    + *
  • 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 * - * 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 int proeprty index. - * @param foNode - the FONode being built - * @param value PropertyValue returned by the parser - * @return PropertyValue 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) diff --git a/src/java/org/apache/fop/fo/properties/BorderLeft.java b/src/java/org/apache/fop/fo/properties/BorderLeft.java index 352581308..b80717da9 100644 --- a/src/java/org/apache/fop/fo/properties/BorderLeft.java +++ b/src/java/org/apache/fop/fo/properties/BorderLeft.java @@ -25,7 +25,7 @@ import org.apache.fop.fo.FONode; 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 @@ public class BorderLeft extends Property { *

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. + *

    + *
  • 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 * - * 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 int property index. - * @param foNode - the FONode being built - * @param value PropertyValue returned by the parser - * @return PropertyValue 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) diff --git a/src/java/org/apache/fop/fo/properties/BorderRight.java b/src/java/org/apache/fop/fo/properties/BorderRight.java index f02d80dad..84dc053b8 100644 --- a/src/java/org/apache/fop/fo/properties/BorderRight.java +++ b/src/java/org/apache/fop/fo/properties/BorderRight.java @@ -25,7 +25,7 @@ import org.apache.fop.fo.FONode; 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 @@ public class BorderRight extends Property { *

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. + *

    + *
  • 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 * - * 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 int property index. - * @param foNode - the FONode being built - * @param value PropertyValue returned by the parser - * @return PropertyValue 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) diff --git a/src/java/org/apache/fop/fo/properties/BorderTop.java b/src/java/org/apache/fop/fo/properties/BorderTop.java index 0a6c9725b..6d0d833d0 100644 --- a/src/java/org/apache/fop/fo/properties/BorderTop.java +++ b/src/java/org/apache/fop/fo/properties/BorderTop.java @@ -25,7 +25,7 @@ import org.apache.fop.fo.FONode; 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 @@ public class BorderTop extends Property { *

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. + *

    + *
  • 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 * - * 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 int property index. - * @param foNode - the FONode being built - * @param value PropertyValue returned by the parser - * @return PropertyValue 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)