arved       01/07/25 17:52:45

  Modified:    src/org/apache/fop/fo/flow Block.java FootnoteBody.java
                        ListBlock.java ListItem.java RetrieveMarker.java
               src/org/apache/fop/layout Area.java
  Log:
  AHS: changed Area methods slightly
  
  Revision  Changes    Path
  1.36      +5 -6      xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Block.java        2001/07/16 10:37:57     1.35
  +++ Block.java        2001/07/26 00:52:45     1.36
  @@ -1,6 +1,5 @@
  -/*-- $Id: Block.java,v 1.35 2001/07/16 10:37:57 arved Exp $-- */
  -/*
  - * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
  +/*-- $Id: Block.java,v 1.36 2001/07/26 00:52:45 arved Exp $-- */
  +/* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
    */
  @@ -159,10 +158,10 @@
                                this.blockArea = new 
BlockArea(propMgr.getFontState(area.getFontInfo()), area.getAllocationWidth(),
                                                                area.spaceLeft(), 
startIndent, endIndent, textIndent,
                                                                align, alignLast, 
lineHeight);
  -                             this.blockArea.generatedBy = this;
  +                             this.blockArea.setGeneratedBy(this);
                                this.areasGenerated++;
                                if (this.areasGenerated == 1)
  -                                     this.blockArea.isFirst = true;
  +                                     this.blockArea.isFirst(true);
                                // for normal areas this should be the only pair
                                this.blockArea.addLineagePair(this, 
this.areasGenerated);
                                
  @@ -259,7 +258,7 @@
                                }
   
                                //MessageHandler.error(" b:OK" + marker + " ");
  -                             this.blockArea.isLast = true;
  +                             this.blockArea.isLast(true);
                                return new Status(Status.OK);
                }
   
  
  
  
  1.5       +7 -50     xml-fop/src/org/apache/fop/fo/flow/FootnoteBody.java
  
  Index: FootnoteBody.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/FootnoteBody.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FootnoteBody.java 2001/07/17 03:14:29     1.4
  +++ FootnoteBody.java 2001/07/26 00:52:45     1.5
  @@ -1,52 +1,7 @@
  -/*-- $Id: FootnoteBody.java,v 1.4 2001/07/17 03:14:29 arved Exp $ --
  -
  - ============================================================================
  -                                                                      The Apache 
Software License, Version 1.1
  - ============================================================================
  -
  -             Copyright (C) 1999 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
  - APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  - INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  - DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  - ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  - (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/>.
  -
  +/*-- $Id: FootnoteBody.java,v 1.5 2001/07/26 00:52:45 arved Exp $
  + * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
  + * For details on use and redistribution please refer to the
  + * LICENSE file included with these sources.
    */
   
   package org.apache.fop.fo.flow;
  @@ -98,7 +53,8 @@
                      area.getAllocationWidth(),
                      area.spaceLeft(), startIndent, endIndent, textIndent,
                      align, alignLast, lineHeight);
  -       blockArea.generatedBy = this;
  +       blockArea.setGeneratedBy(this);
  +       blockArea.isFirst(true);
         blockArea.setPage(area.getPage());
         blockArea.start();
   
  @@ -119,6 +75,7 @@
         blockArea.end();
         area.addChild(blockArea);
         area.increaseHeight(blockArea.getHeight());
  +       blockArea.isLast(true);
         return new Status(Status.OK);
       }
   }
  
  
  
  1.18      +4 -4      xml-fop/src/org/apache/fop/fo/flow/ListBlock.java
  
  Index: ListBlock.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListBlock.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ListBlock.java    2001/07/24 00:57:32     1.17
  +++ ListBlock.java    2001/07/26 00:52:45     1.18
  @@ -1,4 +1,4 @@
  -/*-- $Id: ListBlock.java,v 1.17 2001/07/24 00:57:32 arved Exp $
  +/*-- $Id: ListBlock.java,v 1.18 2001/07/26 00:52:45 arved Exp $
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
  @@ -94,10 +94,10 @@
                                        area.getAllocationWidth(),
                                        area.spaceLeft(), startIndent, endIndent, 0, 
align,
                                        alignLast, lineHeight);
  -                             blockArea.generatedBy = this;
  +                             blockArea.setGeneratedBy(this);
                                this.areasGenerated++;
                                if (this.areasGenerated == 1)
  -                                     blockArea.isFirst = true;
  +                                     blockArea.isFirst(true);
                                // for normal areas this should be the only pair
                                blockArea.addLineagePair(this, this.areasGenerated);
                                
  @@ -147,7 +147,7 @@
                                                area.start();
                                }
   
  -                             blockArea.isLast = true;
  +                             blockArea.isLast(true);
                                return new Status(Status.OK);
                }
   
  
  
  
  1.14      +4 -4      xml-fop/src/org/apache/fop/fo/flow/ListItem.java
  
  Index: ListItem.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItem.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ListItem.java     2001/07/24 00:57:57     1.13
  +++ ListItem.java     2001/07/26 00:52:45     1.14
  @@ -1,4 +1,4 @@
  -/*-- $Id: ListItem.java,v 1.13 2001/07/24 00:57:57 arved Exp $
  +/*-- $Id: ListItem.java,v 1.14 2001/07/26 00:52:45 arved Exp $
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
  @@ -80,10 +80,10 @@
                                                new 
BlockArea(propMgr.getFontState(area.getFontInfo()), area.getAllocationWidth(),
                                                                                       
                 area.spaceLeft(), 0, 0,
                                                                                       
                 0, align, alignLast, lineHeight);
  -                             this.blockArea.generatedBy = this;
  +                             this.blockArea.setGeneratedBy(this);
                                this.areasGenerated++;
                                if (this.areasGenerated == 1)
  -                                     this.blockArea.isFirst = true;
  +                                     this.blockArea.isFirst(true);
                                // for normal areas this should be the only pair
                                this.blockArea.addLineagePair(this, 
this.areasGenerated);
                                
  @@ -142,7 +142,7 @@
                                if (area instanceof BlockArea) {
                                                area.start();
                                }
  -                             this.blockArea.isLast = true;
  +                             this.blockArea.isLast(true);
                                return new Status(Status.OK);
       }
   
  
  
  
  1.4       +4 -4      xml-fop/src/org/apache/fop/fo/flow/RetrieveMarker.java
  
  Index: RetrieveMarker.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/RetrieveMarker.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RetrieveMarker.java       2001/07/23 01:58:56     1.3
  +++ RetrieveMarker.java       2001/07/26 00:52:45     1.4
  @@ -1,4 +1,4 @@
  -/*-- $Id: RetrieveMarker.java,v 1.3 2001/07/23 01:58:56 arved Exp $-- */
  +/*-- $Id: RetrieveMarker.java,v 1.4 2001/07/26 00:52:45 arved Exp $-- */
   /*
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
  @@ -111,7 +111,7 @@
                        for (int c = 0; c < pageMarkers.size(); c++) {
                                Marker currentMarker = 
(Marker)pageMarkers.elementAt(c);
                                if 
(currentMarker.getMarkerClassName().equals(retrieveClassName)) {
  -                                     if (currentMarker.getRegistryArea().isFirst) {
  +                                     if (currentMarker.getRegistryArea().isFirst()) 
{
                                                return currentMarker;
                                        }
                                }
  @@ -121,7 +121,7 @@
                        for (int c = pageMarkers.size(); c > 0; c--) {
                                Marker currentMarker = 
(Marker)pageMarkers.elementAt(c-1);
                                if 
(currentMarker.getMarkerClassName().equals(retrieveClassName)) {
  -                                     if (currentMarker.getRegistryArea().isFirst) {
  +                                     if (currentMarker.getRegistryArea().isFirst()) 
{
                                                return currentMarker;
                                        }
                                }
  @@ -131,7 +131,7 @@
                        for (int c = pageMarkers.size(); c > 0; c--) {
                                Marker currentMarker = 
(Marker)pageMarkers.elementAt(c-1);
                                if 
(currentMarker.getMarkerClassName().equals(retrieveClassName)) {
  -                                     if (currentMarker.getRegistryArea().isLast) {
  +                                     if (currentMarker.getRegistryArea().isLast()) {
                                                return currentMarker;
                                        }
                                }
  
  
  
  1.23      +35 -4     xml-fop/src/org/apache/fop/layout/Area.java
  
  Index: Area.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Area.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Area.java 2001/07/17 03:15:57     1.22
  +++ Area.java 2001/07/26 00:52:45     1.23
  @@ -1,4 +1,4 @@
  -/* $Id: Area.java,v 1.22 2001/07/17 03:15:57 arved Exp $
  +/* $Id: Area.java,v 1.23 2001/07/26 00:52:45 arved Exp $
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
  @@ -9,6 +9,7 @@
   // FOP
   import org.apache.fop.datatypes.*;
   import org.apache.fop.fo.flow.Marker;
  +import org.apache.fop.layout.inline.InlineSpace;
   
   // Java
   import java.util.Vector;
  @@ -51,15 +52,15 @@
        protected Vector markers;
        
        // as defined in Section 6.1.1
  -     public org.apache.fop.fo.FObj generatedBy;      // corresponds to 
'generated-by' trait
  +     protected org.apache.fop.fo.FObj generatedBy;   // corresponds to 
'generated-by' trait
        protected Hashtable returnedBy;
        
        // as defined in Section 6.1.1
        protected String areaClass;
        
        // as defined in Section 4.2.2
  -     public boolean isFirst = false;
  -     public boolean isLast = false;
  +     protected boolean isFirst = false;
  +     protected boolean isLast = false;
        
       /* author : Seshadri G
       ** the fo which created it */    
  @@ -111,6 +112,11 @@
           this.currentHeight += size;
       }
   
  +    public void addInlineSpace(int size) {
  +        this.addChild(new InlineSpace(size));
  +             // other adjustments...
  +    }
  +
       public FontInfo getFontInfo() {
           return this.page.getFontInfo();
       }
  @@ -376,4 +382,29 @@
     public Vector getMarkers() {
          return markers;
     }
  +  
  +     public void setGeneratedBy(org.apache.fop.fo.FObj generatedBy) {
  +             this.generatedBy = generatedBy;
  +     }
  +     
  +     public org.apache.fop.fo.FObj getGeneratedBy() {
  +             return generatedBy;
  +     }
  +     
  +     public void isFirst(boolean isFirst) {
  +             this.isFirst = isFirst;
  +     }
  +     
  +     public boolean isFirst() {
  +             return isFirst;
  +     }
  +     
  +     public void isLast(boolean isLast) {
  +             this.isLast = isLast;
  +     }
  +     
  +     public boolean isLast() {
  +             return isLast;
  +     }
  +     
   }
  
  
  

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

Reply via email to