vmote       2003/07/17 10:31:29

  Modified:    src/java/org/apache/fop/extensions
                        ExtensionElementMapping.java
               src/java/org/apache/fop/fo BoxPropShorthandParser.java
                        CharacterProperty.java ColorTypeProperty.java
                        CondLengthProperty.java ElementMapping.java
                        EnumProperty.java FOElementMapping.java FONode.java
                        FOTreeBuilder.java FObj.java
               src/java/org/apache/fop/svg SVGElementMapping.java
  Log:
  style changes only
  
  Revision  Changes    Path
  1.4       +1 -1      
xml-fop/src/java/org/apache/fop/extensions/ExtensionElementMapping.java
  
  Index: ExtensionElementMapping.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/extensions/ExtensionElementMapping.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExtensionElementMapping.java      13 Jul 2003 03:16:11 -0000      1.3
  +++ ExtensionElementMapping.java      17 Jul 2003 17:31:28 -0000      1.4
  @@ -66,7 +66,7 @@
        * Constructor.
        */
       public ExtensionElementMapping() {
  -        URI = "http://xml.apache.org/fop/extensions";;
  +        namespaceURI = "http://xml.apache.org/fop/extensions";;
       }
   
       /**
  
  
  
  1.3       +5 -1      xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java
  
  Index: BoxPropShorthandParser.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BoxPropShorthandParser.java       26 Apr 2003 18:18:04 -0000      1.2
  +++ BoxPropShorthandParser.java       17 Jul 2003 17:31:28 -0000      1.3
  @@ -50,6 +50,9 @@
    */
   package org.apache.fop.fo;
   
  +/**
  + * Shorthand property parser for Box properties
  + */
   public class BoxPropShorthandParser extends GenericShorthandParser {
   
       /**
  @@ -63,7 +66,8 @@
        * Stores 1 to 4 values of same type.
        * Set the given property based on the number of values set.
        * Example: padding, border-width, border-color, border-style, margin
  -     * @see 
org.apache.fop.fo.GenericShorthandParser#convertValueForProperty(String, 
Property.Maker, PropertyList)
  +     * @see org.apache.fop.fo.GenericShorthandParser#convertValueForProperty(String,
  +     * Property.Maker, PropertyList)
        */
       protected Property convertValueForProperty(String propName,
                                                  Property.Maker maker,
  
  
  
  1.2       +31 -10    xml-fop/src/java/org/apache/fop/fo/CharacterProperty.java
  
  Index: CharacterProperty.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/CharacterProperty.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CharacterProperty.java    11 Mar 2003 13:05:19 -0000      1.1
  +++ CharacterProperty.java    17 Jul 2003 17:31:28 -0000      1.2
  @@ -3,34 +3,34 @@
    * ============================================================================
    *                    The Apache Software License, Version 1.1
    * ============================================================================
  - * 
  + *
    * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - * 
  + *
    * Redistribution and use in source and binary forms, with or without modifica-
    * tion, are permitted provided that the following conditions are met:
  - * 
  + *
    * 1. Redistributions of source code must retain the above copyright notice,
    *    this list of conditions and the following disclaimer.
  - * 
  + *
    * 2. Redistributions in binary form must reproduce the above copyright notice,
    *    this list of conditions and the following disclaimer in the documentation
    *    and/or other materials provided with the distribution.
  - * 
  + *
    * 3. The end-user documentation included with the redistribution, if any, must
    *    include the following acknowledgment: "This product includes software
    *    developed by the Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself, if
    *    and wherever such third-party acknowledgments normally appear.
  - * 
  + *
    * 4. The names "FOP" and "Apache Software Foundation" must not be used to
    *    endorse or promote products derived from this software without prior
    *    written permission. For written permission, please contact
    *    [EMAIL PROTECTED]
  - * 
  + *
    * 5. Products derived from this software may not be called "Apache", nor may
    *    "Apache" appear in their name, without prior written permission of the
    *    Apache Software Foundation.
  - * 
  + *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  @@ -42,18 +42,27 @@
    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    * ============================================================================
  - * 
  + *
    * This software consists of voluntary contributions made by many individuals
    * on behalf of the Apache Software Foundation and was originally created by
    * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.fo;
   
  +/**
  + * Superclass for properties that wrap a character value
  + */
   public class CharacterProperty extends Property {
   
  +    /**
  +     * Inner class for creating instances of CharacterProperty
  +     */
       public static class Maker extends Property.Maker {
   
  +        /**
  +         * @param propName name of property for which a Maker should be created
  +         */
           public Maker(String propName) {
               super(propName);
           }
  @@ -68,18 +77,30 @@
   
       private char character;
   
  +    /**
  +     * @param character character value to be wrapped in this property
  +     */
       public CharacterProperty(char character) {
           this.character = character;
       }
   
  +    /**
  +     * @return this.character cast as an Object
  +     */
       public Object getObject() {
           return new Character(character);
       }
   
  +    /**
  +     * @return this.character
  +     */
       public char getCharacter() {
           return this.character;
       }
   
  +    /**
  +     * @return this.character cast as a String
  +     */
       public String getString() {
           return new Character(character).toString();
       }
  
  
  
  1.2       +30 -11    xml-fop/src/java/org/apache/fop/fo/ColorTypeProperty.java
  
  Index: ColorTypeProperty.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/ColorTypeProperty.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ColorTypeProperty.java    11 Mar 2003 13:05:19 -0000      1.1
  +++ ColorTypeProperty.java    17 Jul 2003 17:31:28 -0000      1.2
  @@ -3,34 +3,34 @@
    * ============================================================================
    *                    The Apache Software License, Version 1.1
    * ============================================================================
  - * 
  + *
    * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - * 
  + *
    * Redistribution and use in source and binary forms, with or without modifica-
    * tion, are permitted provided that the following conditions are met:
  - * 
  + *
    * 1. Redistributions of source code must retain the above copyright notice,
    *    this list of conditions and the following disclaimer.
  - * 
  + *
    * 2. Redistributions in binary form must reproduce the above copyright notice,
    *    this list of conditions and the following disclaimer in the documentation
    *    and/or other materials provided with the distribution.
  - * 
  + *
    * 3. The end-user documentation included with the redistribution, if any, must
    *    include the following acknowledgment: "This product includes software
    *    developed by the Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself, if
    *    and wherever such third-party acknowledgments normally appear.
  - * 
  + *
    * 4. The names "FOP" and "Apache Software Foundation" must not be used to
    *    endorse or promote products derived from this software without prior
    *    written permission. For written permission, please contact
    *    [EMAIL PROTECTED]
  - * 
  + *
    * 5. Products derived from this software may not be called "Apache", nor may
    *    "Apache" appear in their name, without prior written permission of the
    *    Apache Software Foundation.
  - * 
  + *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  @@ -42,20 +42,29 @@
    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    * ============================================================================
  - * 
  + *
    * This software consists of voluntary contributions made by many individuals
    * on behalf of the Apache Software Foundation and was originally created by
    * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.fo;
   
   import org.apache.fop.datatypes.ColorType;
   
  +/**
  + * Superclass for properties that wrap ColorType values
  + */
   public class ColorTypeProperty extends Property {
   
  +    /**
  +     * Inner class for creating instances of ColorTypeProperty
  +     */
       public static class Maker extends Property.Maker {
   
  +        /**
  +         * @param propName name of property for which a Maker should be created
  +         */
           public Maker(String propName) {
               super(propName);
           }
  @@ -76,15 +85,25 @@
   
       private ColorType colorType;
   
  +    /**
  +     * @param colorType color type object which is to be wrapped in this
  +     * Property
  +     */
       public ColorTypeProperty(ColorType colorType) {
           this.colorType = colorType;
       }
   
  -    // Can't convert to any other types
  +    /**
  +     * Can't convert to any other types
  +     * @return this.colorType
  +     */
       public ColorType getColorType() {
           return this.colorType;
       }
   
  +    /**
  +     * @return this.colorType cast as an Object
  +     */
       public Object getObject() {
           return this.colorType;
       }
  
  
  
  1.2       +33 -11    xml-fop/src/java/org/apache/fop/fo/CondLengthProperty.java
  
  Index: CondLengthProperty.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/CondLengthProperty.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CondLengthProperty.java   11 Mar 2003 13:05:19 -0000      1.1
  +++ CondLengthProperty.java   17 Jul 2003 17:31:28 -0000      1.2
  @@ -3,34 +3,34 @@
    * ============================================================================
    *                    The Apache Software License, Version 1.1
    * ============================================================================
  - * 
  + *
    * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - * 
  + *
    * Redistribution and use in source and binary forms, with or without modifica-
    * tion, are permitted provided that the following conditions are met:
  - * 
  + *
    * 1. Redistributions of source code must retain the above copyright notice,
    *    this list of conditions and the following disclaimer.
  - * 
  + *
    * 2. Redistributions in binary form must reproduce the above copyright notice,
    *    this list of conditions and the following disclaimer in the documentation
    *    and/or other materials provided with the distribution.
  - * 
  + *
    * 3. The end-user documentation included with the redistribution, if any, must
    *    include the following acknowledgment: "This product includes software
    *    developed by the Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself, if
    *    and wherever such third-party acknowledgments normally appear.
  - * 
  + *
    * 4. The names "FOP" and "Apache Software Foundation" must not be used to
    *    endorse or promote products derived from this software without prior
    *    written permission. For written permission, please contact
    *    [EMAIL PROTECTED]
  - * 
  + *
    * 5. Products derived from this software may not be called "Apache", nor may
    *    "Apache" appear in their name, without prior written permission of the
    *    Apache Software Foundation.
  - * 
  + *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  @@ -42,21 +42,30 @@
    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    * ============================================================================
  - * 
  + *
    * This software consists of voluntary contributions made by many individuals
    * on behalf of the Apache Software Foundation and was originally created by
    * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.fo;
   
   import org.apache.fop.datatypes.Length;
   import org.apache.fop.datatypes.CondLength;
   
  +/**
  + * Superclass for properties that have conditional lengths
  + */
   public class CondLengthProperty extends Property {
   
  +    /**
  +     * Inner class for creating instances of CondLengthProperty
  +     */
       public static class Maker extends Property.Maker {
   
  +        /**
  +         * @param name of property for which a Maker should be created
  +         */
           public Maker(String name) {
               super(name);
           }
  @@ -65,19 +74,32 @@
   
       private CondLength condLength = null;
   
  +    /**
  +     * @param condLength conditional length object which is to be wrapped in
  +     * this property
  +     */
       public CondLengthProperty(CondLength condLength) {
           this.condLength = condLength;
       }
   
  +    /**
  +     * @return this.condLength
  +     */
       public CondLength getCondLength() {
           return this.condLength;
       }
   
  -    /* Question, should we allow this? */
  +    /**
  +     * TODO: Should we allow this?
  +     * @return this.condLength cast as a Length
  +     */
       public Length getLength() {
           return this.condLength.getLength().getLength();
       }
   
  +    /**
  +     * @return this.condLength cast as an Object
  +     */
       public Object getObject() {
           return this.condLength;
       }
  
  
  
  1.3       +19 -18    xml-fop/src/java/org/apache/fop/fo/ElementMapping.java
  
  Index: ElementMapping.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/ElementMapping.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ElementMapping.java       12 Jul 2003 21:22:03 -0000      1.2
  +++ ElementMapping.java       17 Jul 2003 17:31:28 -0000      1.3
  @@ -3,34 +3,34 @@
    * ============================================================================
    *                    The Apache Software License, Version 1.1
    * ============================================================================
  - * 
  + *
    * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - * 
  + *
    * Redistribution and use in source and binary forms, with or without modifica-
    * tion, are permitted provided that the following conditions are met:
  - * 
  + *
    * 1. Redistributions of source code must retain the above copyright notice,
    *    this list of conditions and the following disclaimer.
  - * 
  + *
    * 2. Redistributions in binary form must reproduce the above copyright notice,
    *    this list of conditions and the following disclaimer in the documentation
    *    and/or other materials provided with the distribution.
  - * 
  + *
    * 3. The end-user documentation included with the redistribution, if any, must
    *    include the following acknowledgment: "This product includes software
    *    developed by the Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself, if
    *    and wherever such third-party acknowledgments normally appear.
  - * 
  + *
    * 4. The names "FOP" and "Apache Software Foundation" must not be used to
    *    endorse or promote products derived from this software without prior
    *    written permission. For written permission, please contact
    *    [EMAIL PROTECTED]
  - * 
  + *
    * 5. Products derived from this software may not be called "Apache", nor may
    *    "Apache" appear in their name, without prior written permission of the
    *    Apache Software Foundation.
  - * 
  + *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  @@ -42,29 +42,30 @@
    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    * ============================================================================
  - * 
  + *
    * This software consists of voluntary contributions made by many individuals
    * on behalf of the Apache Software Foundation and was originally created by
    * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.fo;
   
   import java.util.HashMap;
   
   /**
  - * Interface for adding supported element and property mappings to
  - * the given builder.
  + * Abstract base class for Element Mappings (including FO Element Mappings)
  + * which provide the framework of valid elements and attibutes for a given
  + * namespace.
    */
  -/** Abstract base class of FO Element Mappings.  */
   public abstract class ElementMapping {
  +    /** constant for defining the default value */
       public static final String DEFAULT = "<default>";
   
       /** The HashMap table of formatting objects defined by the ElementMapping */
       protected HashMap foObjs = null;
   
       /** The namespace for the ElementMapping */
  -    protected String URI = null;
  +    protected String namespaceURI = null;
   
       /**
        * Returns a HashMap of maker objects for this element mapping
  @@ -82,18 +83,18 @@
        * Returns the namespace URI for this element mapping
        *
        * @return Namespace URI for this element mapping
  -    */
  +     */
       public String getNamespaceURI() {
  -        return URI;
  +        return namespaceURI;
       }
   
       /**
        * Initializes the set of maker objects associated with this ElementMapping
  -     *
  -    */
  +     */
       protected abstract void initialize();
   
       public static class Maker {
  +
           public FONode make(FONode parent) {
               return null;
           }
  
  
  
  1.2       +30 -10    xml-fop/src/java/org/apache/fop/fo/EnumProperty.java
  
  Index: EnumProperty.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/EnumProperty.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EnumProperty.java 11 Mar 2003 13:05:19 -0000      1.1
  +++ EnumProperty.java 17 Jul 2003 17:31:28 -0000      1.2
  @@ -3,34 +3,34 @@
    * ============================================================================
    *                    The Apache Software License, Version 1.1
    * ============================================================================
  - * 
  + *
    * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - * 
  + *
    * Redistribution and use in source and binary forms, with or without modifica-
    * tion, are permitted provided that the following conditions are met:
  - * 
  + *
    * 1. Redistributions of source code must retain the above copyright notice,
    *    this list of conditions and the following disclaimer.
  - * 
  + *
    * 2. Redistributions in binary form must reproduce the above copyright notice,
    *    this list of conditions and the following disclaimer in the documentation
    *    and/or other materials provided with the distribution.
  - * 
  + *
    * 3. The end-user documentation included with the redistribution, if any, must
    *    include the following acknowledgment: "This product includes software
    *    developed by the Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself, if
    *    and wherever such third-party acknowledgments normally appear.
  - * 
  + *
    * 4. The names "FOP" and "Apache Software Foundation" must not be used to
    *    endorse or promote products derived from this software without prior
    *    written permission. For written permission, please contact
    *    [EMAIL PROTECTED]
  - * 
  + *
    * 5. Products derived from this software may not be called "Apache", nor may
    *    "Apache" appear in their name, without prior written permission of the
    *    Apache Software Foundation.
  - * 
  + *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  @@ -42,26 +42,37 @@
    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    * ============================================================================
  - * 
  + *
    * This software consists of voluntary contributions made by many individuals
    * on behalf of the Apache Software Foundation and was originally created by
    * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.fo;
   
   import org.apache.fop.apps.FOPException;
   
  +/**
  + * Superclass for properties that wrap an enumeration value
  + */
   public class EnumProperty extends Property {
   
  +    /**
  +     * Inner class for creating EnumProperty instances
  +     */
       public static class Maker extends Property.Maker {
   
  +        /**
  +         * @param propName name of property for which a Maker should be created
  +         */
           protected Maker(String propName) {
               super(propName);
           }
   
           /**
            * Called by subclass if no match found.
  +         * @param value string containing the value to be checked
  +         * @return null (indicates that an appropriate match was not found)
            */
           public Property checkEnumValues(String value) {
               //log.error("Unknown enumerated value for property '"
  @@ -86,14 +97,23 @@
   
       private int value;
   
  +    /**
  +     * @param explicitValue enumerated value to be set for this property
  +     */
       public EnumProperty(int explicitValue) {
           this.value = explicitValue;
       }
   
  +    /**
  +     * @return this.value
  +     */
       public int getEnum() {
           return this.value;
       }
   
  +    /**
  +     * @return this.value cast as an Object
  +     */
       public Object getObject() {
           // FIXME: return String value: property must reference maker
           // return maker.getEnumValue(this.value);
  
  
  
  1.4       +18 -12    xml-fop/src/java/org/apache/fop/fo/FOElementMapping.java
  
  Index: FOElementMapping.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOElementMapping.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FOElementMapping.java     17 Jul 2003 04:52:34 -0000      1.3
  +++ FOElementMapping.java     17 Jul 2003 17:31:28 -0000      1.4
  @@ -3,34 +3,34 @@
    * ============================================================================
    *                    The Apache Software License, Version 1.1
    * ============================================================================
  - * 
  + *
    * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - * 
  + *
    * Redistribution and use in source and binary forms, with or without modifica-
    * tion, are permitted provided that the following conditions are met:
  - * 
  + *
    * 1. Redistributions of source code must retain the above copyright notice,
    *    this list of conditions and the following disclaimer.
  - * 
  + *
    * 2. Redistributions in binary form must reproduce the above copyright notice,
    *    this list of conditions and the following disclaimer in the documentation
    *    and/or other materials provided with the distribution.
  - * 
  + *
    * 3. The end-user documentation included with the redistribution, if any, must
    *    include the following acknowledgment: "This product includes software
    *    developed by the Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself, if
    *    and wherever such third-party acknowledgments normally appear.
  - * 
  + *
    * 4. The names "FOP" and "Apache Software Foundation" must not be used to
    *    endorse or promote products derived from this software without prior
    *    written permission. For written permission, please contact
    *    [EMAIL PROTECTED]
  - * 
  + *
    * 5. Products derived from this software may not be called "Apache", nor may
    *    "Apache" appear in their name, without prior written permission of the
    *    Apache Software Foundation.
  - * 
  + *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  @@ -42,12 +42,12 @@
    * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    * ============================================================================
  - * 
  + *
    * This software consists of voluntary contributions made by many individuals
    * on behalf of the Apache Software Foundation and was originally created by
    * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
    * Software Foundation, please see <http://www.apache.org/>.
  - */ 
  + */
   package org.apache.fop.fo;
   
   // Java
  @@ -57,11 +57,17 @@
    * Element mapping class for all XSL-FO elements.
    */
   public class FOElementMapping extends ElementMapping {
  -    
  +
  +    /**
  +     * Basic constructor; inititializes the namespace URI for the fo: namespace
  +     */
       public FOElementMapping() {
  -        URI = "http://www.w3.org/1999/XSL/Format";;
  +        namespaceURI = "http://www.w3.org/1999/XSL/Format";;
       }
   
  +    /**
  +     * Initializes the collection of valid objects for the fo: namespace
  +     */
       protected void initialize() {
           if (foObjs == null) {
               foObjs = new HashMap();
  
  
  
  1.4       +6 -0      xml-fop/src/java/org/apache/fop/fo/FONode.java
  
  Index: FONode.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FONode.java       14 Jul 2003 14:14:03 -0000      1.3
  +++ FONode.java       17 Jul 2003 17:31:28 -0000      1.4
  @@ -163,9 +163,15 @@
           // do nothing by default
       }
   
  +    /**
  +     * @param child child node to be added to the children of this node
  +     */
       protected void addChild(FONode child) {
       }
   
  +    /**
  +     * @return the parent node of this node
  +     */
       public FONode getParent() {
           return this.parent;
       }
  
  
  
  1.7       +1 -1      xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
  
  Index: FOTreeBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FOTreeBuilder.java        12 Jul 2003 21:22:03 -0000      1.6
  +++ FOTreeBuilder.java        17 Jul 2003 17:31:28 -0000      1.7
  @@ -340,7 +340,7 @@
       public boolean hasData() {
           return (rootFObj != null);
       }
  -      
  +
   }
   
   // code stolen from org.apache.batik.util and modified slightly
  
  
  
  1.10      +20 -5     xml-fop/src/java/org/apache/fop/fo/FObj.java
  
  Index: FObj.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- FObj.java 13 Jul 2003 20:52:05 -0000      1.9
  +++ FObj.java 17 Jul 2003 17:31:28 -0000      1.10
  @@ -150,7 +150,7 @@
        * The attributes must be used immediately as the sax attributes
        * will be altered for the next element.
        * @param attlist Collection of attributes passed to us from the parser.
  -     * @throws FOPException
  +     * @throws FOPException for invalid FO data
        */
       public void handleAttrs(Attributes attlist) throws FOPException {
           properties = getListBuilder().makeList(FO_URI, name, attlist, this);
  @@ -205,24 +205,33 @@
           // if we got here, it is because parent is null
           if (returnRoot) {
               return p;
  -        }
  -        else {
  +        } else {
               return null;
           }
       }
   
  +    /**
  +     * For a given namespace, determine whether the properties of this object
  +     * match that namespace.
  +     * @param nameSpaceURI the namespace URI to be tested against
  +     * @return this.properties, if the namespaces match; otherwise, null
  +     */
       public PropertyList getPropertiesForNamespace(String nameSpaceURI) {
           if (this.properties == null) {
               return null;
           }
  -        if (! nameSpaceURI.equals(this.properties.getNameSpace())) {
  +        if (!nameSpaceURI.equals(this.properties.getNameSpace())) {
               return null;
           }
           return this.properties;
       }
   
  +    /**
  +     * @param propertyList the collection of Property objects to be managed
  +     * @return a PropertyManager for the Property objects
  +     */
       protected PropertyManager makePropertyManager(
  -      PropertyList propertyList) {
  +            PropertyList propertyList) {
           return new PropertyManager(propertyList);
       }
   
  @@ -405,10 +414,16 @@
           }
       }
   
  +    /**
  +     * @return true if there are any Markers attached to this object
  +     */
       public boolean hasMarkers() {
           return markers != null && !markers.isEmpty();
       }
   
  +    /**
  +     * @return th collection of Markers attached to this object
  +     */
       public Map getMarkers() {
           return markers;
       }
  
  
  
  1.5       +1 -1      xml-fop/src/java/org/apache/fop/svg/SVGElementMapping.java
  
  Index: SVGElementMapping.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/SVGElementMapping.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SVGElementMapping.java    12 Jul 2003 21:22:04 -0000      1.4
  +++ SVGElementMapping.java    17 Jul 2003 17:31:29 -0000      1.5
  @@ -68,7 +68,7 @@
       private boolean batik = true;
   
       public SVGElementMapping() {
  -        URI = SVGDOMImplementation.SVG_NAMESPACE_URI;
  +        namespaceURI = SVGDOMImplementation.SVG_NAMESPACE_URI;
       }
   
       protected void initialize() {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to