You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/03/18 14:19:50 UTC

cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination RegionOuter.java RegionBA.java RegionSE.java

jeremias    2005/03/18 05:19:50

  Modified:    src/java/org/apache/fop/fo/pagination Tag:
                        Temp_KnuthStylePageBreaking RegionBA.java
                        RegionSE.java
  Added:       src/java/org/apache/fop/fo/pagination Tag:
                        Temp_KnuthStylePageBreaking RegionOuter.java
  Log:
  Common base class for all outer regions (for easier access to the extent property).
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.25.2.1  +3 -13     xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java
  
  Index: RegionBA.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java,v
  retrieving revision 1.25
  retrieving revision 1.25.2.1
  diff -u -r1.25 -r1.25.2.1
  --- RegionBA.java	24 Nov 2004 21:07:29 -0000	1.25
  +++ RegionBA.java	18 Mar 2005 13:19:50 -0000	1.25.2.1
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 1999-2004 The Apache Software Foundation.
  + * Copyright 1999-2005 The Apache Software Foundation.
    * 
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -22,16 +22,14 @@
   import java.awt.Rectangle;
   
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.datatypes.Length;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.PropertyList;
   
   /**
    * Abstract base class for fo:region-before and fo:region-after.
    */
  -public abstract class RegionBA extends Region {
  +public abstract class RegionBA extends RegionOuter {
       // The value of properties relevant for fo:region-[before|after].
  -    private Length extent;
       private int precedence;
       // End of property values
       
  @@ -47,19 +45,11 @@
        */
       public void bind(PropertyList pList) throws FOPException {
           super.bind(pList);
  -        extent = pList.get(PR_EXTENT).getLength();
           precedence = pList.get(PR_PRECEDENCE).getEnum();
       }
   
       /**
  -     * Return the "extent" property.
  -     */
  -    public Length getExtent() {
  -        return extent;
  -    }
  -
  -    /**
  -     * Return the "precedence" property.
  +     * @return the "precedence" property.
        */
       public int getPrecedence() {
           return precedence;
  
  
  
  1.19.2.1  +2 -12     xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java
  
  Index: RegionSE.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java,v
  retrieving revision 1.19
  retrieving revision 1.19.2.1
  diff -u -r1.19 -r1.19.2.1
  --- RegionSE.java	24 Nov 2004 21:07:29 -0000	1.19
  +++ RegionSE.java	18 Mar 2005 13:19:50 -0000	1.19.2.1
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 1999-2004 The Apache Software Foundation.
  + * Copyright 1999-2005 The Apache Software Foundation.
    * 
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -22,16 +22,14 @@
   import java.awt.Rectangle;
   
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.datatypes.Length;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.PropertyList;
   
   /**
    * Abstract base class for fo:region-start and fo:region-end.
    */
  -public abstract class RegionSE extends Region {
  +public abstract class RegionSE extends RegionOuter {
       // The value of properties relevant for fo:region-[start|end].
  -    private Length extent;
       // End of property values
   
       /**
  @@ -46,17 +44,9 @@
        */
       public void bind(PropertyList pList) throws FOPException {
           super.bind(pList);
  -        extent = pList.get(PR_EXTENT).getLength();
       }
   
       /**
  -     * Return the "extent" property.
  -     */
  -    public Length getExtent() {
  -        return extent;
  -    }
  -    
  -    /**
        * Adjust the viewport reference rectangle for a region as a function
        * of precedence.
        * If  before and after have precedence = true, the start and end
  
  
  
  No                   revision
  
  Index: RegionSE.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java,v
  retrieving revision 1.19
  retrieving revision 1.19.2.1
  diff -u -r1.19 -r1.19.2.1
  --- RegionSE.java	24 Nov 2004 21:07:29 -0000	1.19
  +++ RegionSE.java	18 Mar 2005 13:19:50 -0000	1.19.2.1
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 1999-2004 The Apache Software Foundation.
  + * Copyright 1999-2005 The Apache Software Foundation.
    * 
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -22,16 +22,14 @@
   import java.awt.Rectangle;
   
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.datatypes.Length;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.PropertyList;
   
   /**
    * Abstract base class for fo:region-start and fo:region-end.
    */
  -public abstract class RegionSE extends Region {
  +public abstract class RegionSE extends RegionOuter {
       // The value of properties relevant for fo:region-[start|end].
  -    private Length extent;
       // End of property values
   
       /**
  @@ -46,17 +44,9 @@
        */
       public void bind(PropertyList pList) throws FOPException {
           super.bind(pList);
  -        extent = pList.get(PR_EXTENT).getLength();
       }
   
       /**
  -     * Return the "extent" property.
  -     */
  -    public Length getExtent() {
  -        return extent;
  -    }
  -    
  -    /**
        * Adjust the viewport reference rectangle for a region as a function
        * of precedence.
        * If  before and after have precedence = true, the start and end
  
  
  
  No                   revision
  
  Index: RegionSE.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java,v
  retrieving revision 1.19
  retrieving revision 1.19.2.1
  diff -u -r1.19 -r1.19.2.1
  --- RegionSE.java	24 Nov 2004 21:07:29 -0000	1.19
  +++ RegionSE.java	18 Mar 2005 13:19:50 -0000	1.19.2.1
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 1999-2004 The Apache Software Foundation.
  + * Copyright 1999-2005 The Apache Software Foundation.
    * 
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -22,16 +22,14 @@
   import java.awt.Rectangle;
   
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.datatypes.Length;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.PropertyList;
   
   /**
    * Abstract base class for fo:region-start and fo:region-end.
    */
  -public abstract class RegionSE extends Region {
  +public abstract class RegionSE extends RegionOuter {
       // The value of properties relevant for fo:region-[start|end].
  -    private Length extent;
       // End of property values
   
       /**
  @@ -46,17 +44,9 @@
        */
       public void bind(PropertyList pList) throws FOPException {
           super.bind(pList);
  -        extent = pList.get(PR_EXTENT).getLength();
       }
   
       /**
  -     * Return the "extent" property.
  -     */
  -    public Length getExtent() {
  -        return extent;
  -    }
  -    
  -    /**
        * Adjust the viewport reference rectangle for a region as a function
        * of precedence.
        * If  before and after have precedence = true, the start and end
  
  
  
  1.1.2.1   +58 -0     xml-fop/src/java/org/apache/fop/fo/pagination/Attic/RegionOuter.java
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Re: cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination RegionOuter.java RegionBA.java RegionSE.java

Posted by Jeremias Maerki <de...@greenmail.ch>.
Done.

On 19.03.2005 08:13:42 Glen Mazza wrote:
> Jeremias,
> 
> The XSL term for these objects appear to be "side
> regions"[1]--I would recommend us using SideRegion
> instead here, and can take care of the renaming if you
> would like.
> 
> Glen
> 
> [1]
> http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-body
> 
> --- jeremias@apache.org wrote:
> 
> > jeremias    2005/03/18 05:19:50
> > 
> >   Modified:    src/java/org/apache/fop/fo/pagination
> > Tag:
> >                         Temp_KnuthStylePageBreaking
> > RegionBA.java
> >                         RegionSE.java
> >   Added:       src/java/org/apache/fop/fo/pagination
> > Tag:
> >                         Temp_KnuthStylePageBreaking
> > RegionOuter.java
> >   Log:
> >   Common base class for all outer regions (for
> > easier access to the extent property).
> >   



Jeremias Maerki


Re: cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination RegionOuter.java RegionBA.java RegionSE.java

Posted by Glen Mazza <gr...@yahoo.com>.
Jeremias,

The XSL term for these objects appear to be "side
regions"[1]--I would recommend us using SideRegion
instead here, and can take care of the renaming if you
would like.

Glen

[1]
http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-body

--- jeremias@apache.org wrote:

> jeremias    2005/03/18 05:19:50
> 
>   Modified:    src/java/org/apache/fop/fo/pagination
> Tag:
>                         Temp_KnuthStylePageBreaking
> RegionBA.java
>                         RegionSE.java
>   Added:       src/java/org/apache/fop/fo/pagination
> Tag:
>                         Temp_KnuthStylePageBreaking
> RegionOuter.java
>   Log:
>   Common base class for all outer regions (for
> easier access to the extent property).
>