From 19c1ab18a9d22898f0893a0e1890b7e69f965ae1 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Sat, 11 Jan 2003 16:49:26 +0000 Subject: [PATCH] Fixed validation errors forrest.diff no longer necessary due to changes in Forrest Little FOP logo in credits line (commented out, discussion pending) Submitted by: Jeff Turner Updated skinconf.xml's DTD Updated year git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195840 13f79535-47bb-0310-9956-ffa450edef68 --- .../properties/enumerated-values.xml | 146 +++++++++--------- src/documentation/forrest.diff | 57 ------- src/documentation/skinconf.xml | 10 +- 3 files changed, 82 insertions(+), 131 deletions(-) delete mode 100644 src/documentation/forrest.diff diff --git a/src/documentation/content/xdocs/design/alt.design/properties/enumerated-values.xml b/src/documentation/content/xdocs/design/alt.design/properties/enumerated-values.xml index 29a6760be..f5019b76b 100644 --- a/src/documentation/content/xdocs/design/alt.design/properties/enumerated-values.xml +++ b/src/documentation/content/xdocs/design/alt.design/properties/enumerated-values.xml @@ -15,8 +15,8 @@ must provide a way of translating between the tokens and the integers, and vice versa. Depending on the number of tokens in an enumeration set, the mapping from token to - integer is maintained in an array or a HashMap. - The switch-over point from array to HashMap was + integer is maintained in an array or a HashMap. + The switch-over point from array to HashMap was determined by some highly implementation-dependent testing to be in the region of four to five elements.

@@ -33,34 +33,34 @@

org.apache.fop.fo.properties.Direction is an + >org.apache.fop.fo.properties.Direction is an example of a class which supports an enumerated value with a small set of tokens. The dataTypes + "Direction.html#dataTypes" >dataTypes field contains the ENUM data type constant, defined in Property. The enumeration integer constants - are defined as public static final int - values, LTR - and RTL. Associating enumeration + >ENUM data type constant, defined in Property. The enumeration integer constants + are defined as public static final int + values, LTR + and RTL. Associating enumeration tokens with these integer constants occurs in the array - String[] - rwEnums, which is initialized with the token + String[] + rwEnums, which is initialized with the token strings. By convention, zero is never used to represent a valid enumeration constant, anywhere in this code. It is, of course, critical that synchronization between rwEnums and the enumeration constants be + >rwEnums and the enumeration constants be maintained.`

The publicly accessible mapping from enumeration token to enumeration constant is achieved through the method int - getEnumIndex(String). The corresponding + href= "Direction.html#getEnumIndex" >int + getEnumIndex(String). The corresponding mapping from enumeration constant to enumeration token is achieved through the method String - getEnumText(int). + "Direction.html#getEnumText" >String + getEnumText(int).

@@ -70,37 +70,37 @@

org.apache.fop.fo.properties.RenderingIntent + >org.apache.fop.fo.properties.RenderingIntent is an example of a class which supports an enumerated value with a larger set of tokens. The dataTypesdataTypes field contains the ENUM data type - constant, defined in Property. + "Property.html#NOTYPE" >ENUM data type + constant, defined in Property. Enumeration integer constants are defined as public static - final int values. Zero is never used to + href= "RenderingIntent.html#PERCEPTUAL" >public static + final int values. Zero is never used to represent a valid enumeration constant. The enumeration tokens are stored in the array String[] rwEnumsString[] rwEnums, which is initialized with the token strings. Association of enumeration tokens with the integer constants - occurs in the HashMap rwEnumHashHashMap rwEnumHash, which is initialized from the token array in a - static {} initializer. It is, of course, - critical that synchronization between rwEnums + static {} initializer. It is, of course, + critical that synchronization between rwEnums and the enumeration constants be maintained.`

The publicly accessible mapping from enumeration token to enumeration constant is achieved through the method int - getEnumIndex(String). The corresponding + href= "RenderingIntent.html#getEnumIndex" >int + getEnumIndex(String). The corresponding mapping from enumeration constant to enumeration token is achieved through the method String - getEnumText(int). + "RenderingIntent.html#getEnumText" >String + getEnumText(int).

@@ -113,23 +113,23 @@ factored out to a new class, which each of the properties then extends. An example of such a common super-class is BorderCommonStyle. Like a property with a + >BorderCommonStyle. Like a property with a normal HashMap representation of an enumerated value, BorderCommonStyle defines public static - final int enumeration integer constants. + "BorderCommonStyle.html#PERCEPTUAL" >public static + final int enumeration integer constants. Similarly, the enumeration tokens are stored in the array String[] rwEnums, and the association of + >String[] rwEnums, and the association of enumeration tokens with the integer constants occurs in the - HashMap - rwEnumHash, initialized in a static - {} initializer. The mapping methods int - getEnumIndex(String) and String - getEnumText(int) are also present. + HashMap + rwEnumHash, initialized in a static + {} initializer. The mapping methods int + getEnumIndex(String) and String + getEnumText(int) are also present.

@@ -138,11 +138,11 @@ "simple-properties.html" >simple properties. These values are defined in the individual sub-classes of this class, e.g. BorderLeftStyle. None of the above fields - or methods occur, and BorderLeftStyle is left + >BorderLeftStyle. None of the above fields + or methods occur, and BorderLeftStyle is left looking like an example of a simple property. The enumeration mapping methods are, however, available through - the super-class BorderCommonStyle. + the super-class BorderCommonStyle.

@@ -153,50 +153,50 @@ In "normal" enumerated values, the token is, effectively, passed directly into the layout operation of the flow object to which the property is applied. Some enumerated values, - however, generate a Numeric result. Their + however, generate a Numeric result. Their resolution involves mapping the token to the indicated - Numeric value. + Numeric value.

An example is the BorderCommonWidth property. This, + >BorderCommonWidth property. This, like the example of BorderCommonStyle above, also represents + >BorderCommonStyle above, also represents common enumerated values which have been factored out to form a super-class for particular properties. BorderCommonWidth, therefore, also defines enumeration - constant values and an array of tokens. In - this case, there is no HashMap, because of the + >BorderCommonWidth, therefore, also defines enumeration + constant values and an array of tokens. In + this case, there is no HashMap, because of the limited number of tokens, but the mapping methods int - getEnumIndex(String) and String - getEnumText(int) are present. + href= "BorderCommonWidth.html#getEnumIndex" >int + getEnumIndex(String) and String + getEnumText(int) are present.

The added element in this property is the array double[] - mappedPoints. The entries in this array + "BorderCommonWidth.html#mappedPoints" >double[] + mappedPoints. The entries in this array must by maintained in syncronization with the String[] - rwEnums array of tokens and the set of String[] + rwEnums array of tokens and the set of enumeration constants. The mapping from token to Numeric value is achieved by the Numeric - getMappedLength(FONode, int, int) method. + "BorderCommonWidth.html#getMappedLength" >Numeric + getMappedLength(FONode, int, int) method.

BorderLeftWidth extends BorderCommonWidthBorderLeftWidth extends BorderCommonWidth. It includes the basic static data, like simple properties, and, in this case, the PropertyValue - getInitialValue(int) method to derive the + "BorderLeftWidth.html#getInitialValue" >PropertyValue + getInitialValue(int) method to derive the initial value.

@@ -205,13 +205,13 @@ As usual with property values, the usual method of deriving a mapped numeric value is by calling the Numeric getMappedNumeric(FONode, int, int)Numeric getMappedNumeric(FONode, int, int) method in pconsts. All properties which - support a mapped numeric value must have a Numeric - getMappedNumeric(FONode, int) method, which will + >pconsts. All properties which + support a mapped numeric value must have a Numeric + getMappedNumeric(FONode, int) method, which will be called through its singleton instance by the PropertyConsts method. + >PropertyConsts method.

diff --git a/src/documentation/forrest.diff b/src/documentation/forrest.diff deleted file mode 100644 index ad81726c6..000000000 --- a/src/documentation/forrest.diff +++ /dev/null @@ -1,57 +0,0 @@ -Index: src/resources/skins/common/xslt/fo/document2fo.xsl -=================================================================== -RCS file: /home/cvspublic/xml-forrest/src/resources/skins/common/xslt/fo/document2fo.xsl,v -retrieving revision 1.4 -diff -u -r1.4 document2fo.xsl ---- src/resources/skins/common/xslt/fo/document2fo.xsl 4 Dec 2002 14:14:29 -0000 1.4 -+++ src/resources/skins/common/xslt/fo/document2fo.xsl 5 Dec 2002 09:23:13 -0000 -@@ -93,6 +93,25 @@ - - - -+ -+ -+ -+ -+ Created by: FOP 1.0dev -+ -+ -+ -+ -+ http://xml.apache.org/fop/dev -+ -+ -+ -+ -+ - - - -@@ -107,6 +126,7 @@ - text-align="start"> - Page - -+ - - - -@@ -115,6 +135,7 @@ - font-style="italic"> - - -+ - - - -@@ -136,6 +157,7 @@ - font-style="italic"> - - -+ - - - diff --git a/src/documentation/skinconf.xml b/src/documentation/skinconf.xml index 9c7dd7d35..6c0ac4101 100644 --- a/src/documentation/skinconf.xml +++ b/src/documentation/skinconf.xml @@ -14,6 +14,7 @@ jefft@apache.org + @@ -60,7 +61,7 @@ jefft@apache.org - 1999-2002 + 1999-2003 The Apache Software Foundation. + -- 2.39.5