pbwest      2002/10/30 05:44:03

  Modified:    src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
                        FoRegionAfter.java FoRegionBefore.java
                        FoRegionEnd.java FoRegionStart.java
  Log:
  Removed applicableProps, getEndElement() and
  getPropertyValue().  Extends FoRegionBeforeAfter/FoRegionStartEnd.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +3 -31     
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionAfter.java
  
  Index: FoRegionAfter.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionAfter.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- FoRegionAfter.java        28 Oct 2002 00:04:37 -0000      1.1.2.1
  +++ FoRegionAfter.java        30 Oct 2002 13:44:03 -0000      1.1.2.2
  @@ -10,10 +10,6 @@
   package org.apache.fop.fo.pagination;
   
   // FOP
  -import org.apache.fop.fo.FOAttributes;
  -import org.apache.fop.fo.PropNames;
  -import org.apache.fop.fo.FOPropertySets;
  -import org.apache.fop.fo.PropertySets;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTree;
  @@ -21,11 +17,6 @@
   import org.apache.fop.xml.FoXMLEvent;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.datastructs.Tree;
  -import org.apache.fop.datatypes.PropertyValue;
  -import org.apache.fop.datatypes.Ints;
  -
  -import java.util.HashMap;
  -import java.util.BitSet;
   
   /**
    * Implements the fo:simple-page-master flow object
  @@ -35,11 +26,6 @@
       private static final String tag = "$Name$";
       private static final String revision = "$Revision$";
   
  -    /** The array of applicable properties. Slots in this array are indexed
  -        by values from the <i>applicableProps</i> <tt>HashMap</tt>.
  -        It is effectively a sparse array of the set of properties. */
  -    private PropertyValue[] applicableProps;
  -
       /**
        * @param foTree the FO tree being built
        * @param parent the parent FONode of this node
  @@ -50,21 +36,7 @@
           throws Tree.TreeException, FOPException
       {
           super(foTree, FObjectNames.REGION_AFTER, parent, event);
  -        applicableProps = new PropertyValue[numProps];
  -        FoXMLEvent ev = xmlevents.getEndElement(event);
  +        makeSparsePropsSet();
       }
   
  -    /**
  -     * Get a property value applying to this FO node.
  -     * @param property - the <tt>int</tt> property index.
  -     * @return the <tt>PropertyValue</tt> with the indicated property index.
  -     */
  -    public PropertyValue getPropertyValue(int property)
  -            throws PropertyException
  -    {
  -        return applicableProps[
  -            ((Integer)
  -            (applicablePropsHash.get(Ints.consts.get(property)))).intValue()
  -        ];
  -    }
   }
  
  
  
  1.1.2.2   +3 -31     
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBefore.java
  
  Index: FoRegionBefore.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBefore.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- FoRegionBefore.java       28 Oct 2002 00:04:37 -0000      1.1.2.1
  +++ FoRegionBefore.java       30 Oct 2002 13:44:03 -0000      1.1.2.2
  @@ -10,10 +10,6 @@
   package org.apache.fop.fo.pagination;
   
   // FOP
  -import org.apache.fop.fo.FOAttributes;
  -import org.apache.fop.fo.PropNames;
  -import org.apache.fop.fo.FOPropertySets;
  -import org.apache.fop.fo.PropertySets;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTree;
  @@ -21,11 +17,6 @@
   import org.apache.fop.xml.FoXMLEvent;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.datastructs.Tree;
  -import org.apache.fop.datatypes.PropertyValue;
  -import org.apache.fop.datatypes.Ints;
  -
  -import java.util.HashMap;
  -import java.util.BitSet;
   
   /**
    * Implements the fo:simple-page-master flow object
  @@ -35,11 +26,6 @@
       private static final String tag = "$Name$";
       private static final String revision = "$Revision$";
   
  -    /** The array of applicable properties. Slots in this array are indexed
  -        by values from the <i>applicableProps</i> <tt>HashMap</tt>.
  -        It is effectively a sparse array of the set of properties. */
  -    private PropertyValue[] applicableProps;
  -
       /**
        * @param foTree the FO tree being built
        * @param parent the parent FONode of this node
  @@ -50,21 +36,7 @@
           throws Tree.TreeException, FOPException
       {
           super(foTree, FObjectNames.REGION_BEFORE, parent, event);
  -        applicableProps = new PropertyValue[numProps];
  -        FoXMLEvent ev = xmlevents.getEndElement(event);
  +        makeSparsePropsSet();
       }
   
  -    /**
  -     * Get a property value applying to this FO node.
  -     * @param property - the <tt>int</tt> property index.
  -     * @return the <tt>PropertyValue</tt> with the indicated property index.
  -     */
  -    public PropertyValue getPropertyValue(int property)
  -            throws PropertyException
  -    {
  -        return applicableProps[
  -            ((Integer)
  -            (applicablePropsHash.get(Ints.consts.get(property)))).intValue()
  -        ];
  -    }
   }
  
  
  
  1.1.2.2   +3 -30     xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionEnd.java
  
  Index: FoRegionEnd.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionEnd.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- FoRegionEnd.java  28 Oct 2002 00:04:37 -0000      1.1.2.1
  +++ FoRegionEnd.java  30 Oct 2002 13:44:03 -0000      1.1.2.2
  @@ -10,10 +10,6 @@
   package org.apache.fop.fo.pagination;
   
   // FOP
  -import org.apache.fop.fo.FOAttributes;
  -import org.apache.fop.fo.PropNames;
  -import org.apache.fop.fo.FOPropertySets;
  -import org.apache.fop.fo.PropertySets;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTree;
  @@ -21,11 +17,7 @@
   import org.apache.fop.xml.FoXMLEvent;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.datastructs.Tree;
  -import org.apache.fop.datatypes.PropertyValue;
  -import org.apache.fop.datatypes.Ints;
   
  -import java.util.HashMap;
  -import java.util.BitSet;
   
   /**
    * Implements the fo:simple-page-master flow object
  @@ -35,11 +27,6 @@
       private static final String tag = "$Name$";
       private static final String revision = "$Revision$";
   
  -    /** The array of applicable properties. Slots in this array are indexed
  -        by values from the <i>applicableProps</i> <tt>HashMap</tt>.
  -        It is effectively a sparse array of the set of properties. */
  -    private PropertyValue[] applicableProps;
  -
       /**
        * @param foTree the FO tree being built
        * @param parent the parent FONode of this node
  @@ -50,21 +37,7 @@
           throws Tree.TreeException, FOPException
       {
           super(foTree, FObjectNames.REGION_END, parent, event);
  -        applicableProps = new PropertyValue[numProps];
  -        FoXMLEvent ev = xmlevents.getEndElement(event);
  +        makeSparsePropsSet();
       }
   
  -    /**
  -     * Get a property value applying to this FO node.
  -     * @param property - the <tt>int</tt> property index.
  -     * @return the <tt>PropertyValue</tt> with the indicated property index.
  -     */
  -    public PropertyValue getPropertyValue(int property)
  -            throws PropertyException
  -    {
  -        return applicableProps[
  -            ((Integer)
  -            (applicablePropsHash.get(Ints.consts.get(property)))).intValue()
  -        ];
  -    }
   }
  
  
  
  1.1.2.2   +3 -31     
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStart.java
  
  Index: FoRegionStart.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStart.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- FoRegionStart.java        28 Oct 2002 00:04:37 -0000      1.1.2.1
  +++ FoRegionStart.java        30 Oct 2002 13:44:03 -0000      1.1.2.2
  @@ -10,10 +10,6 @@
   package org.apache.fop.fo.pagination;
   
   // FOP
  -import org.apache.fop.fo.FOAttributes;
  -import org.apache.fop.fo.PropNames;
  -import org.apache.fop.fo.FOPropertySets;
  -import org.apache.fop.fo.PropertySets;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTree;
  @@ -21,11 +17,6 @@
   import org.apache.fop.xml.FoXMLEvent;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.datastructs.Tree;
  -import org.apache.fop.datatypes.PropertyValue;
  -import org.apache.fop.datatypes.Ints;
  -
  -import java.util.HashMap;
  -import java.util.BitSet;
   
   /**
    * Implements the fo:simple-page-master flow object
  @@ -35,11 +26,6 @@
       private static final String tag = "$Name$";
       private static final String revision = "$Revision$";
   
  -    /** The array of applicable properties. Slots in this array are indexed
  -        by values from the <i>applicableProps</i> <tt>HashMap</tt>.
  -        It is effectively a sparse array of the set of properties. */
  -    private PropertyValue[] applicableProps;
  -
       /**
        * @param foTree the FO tree being built
        * @param parent the parent FONode of this node
  @@ -50,21 +36,7 @@
           throws Tree.TreeException, FOPException
       {
           super(foTree, FObjectNames.REGION_START, parent, event);
  -        applicableProps = new PropertyValue[numProps];
  -        FoXMLEvent ev = xmlevents.getEndElement(event);
  +        makeSparsePropsSet();
       }
   
  -    /**
  -     * Get a property value applying to this FO node.
  -     * @param property - the <tt>int</tt> property index.
  -     * @return the <tt>PropertyValue</tt> with the indicated property index.
  -     */
  -    public PropertyValue getPropertyValue(int property)
  -            throws PropertyException
  -    {
  -        return applicableProps[
  -            ((Integer)
  -            (applicablePropsHash.get(Ints.consts.get(property)))).intValue()
  -        ];
  -    }
   }
  
  
  

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

Reply via email to