]> source.dussan.org Git - xmlgraphics-fop.git/commitdiff
AHS: changed Area methods slightly
authorarved <arved@unknown>
Thu, 26 Jul 2001 00:52:45 +0000 (00:52 +0000)
committerarved <arved@unknown>
Thu, 26 Jul 2001 00:52:45 +0000 (00:52 +0000)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194371 13f79535-47bb-0310-9956-ffa450edef68

src/org/apache/fop/fo/flow/Block.java
src/org/apache/fop/fo/flow/FootnoteBody.java
src/org/apache/fop/fo/flow/ListBlock.java
src/org/apache/fop/fo/flow/ListItem.java
src/org/apache/fop/fo/flow/RetrieveMarker.java
src/org/apache/fop/layout/Area.java

index b84a5cdb924b2cf1269f2da3c24cf8f509f431eb..97c716132ae8ed3da6857ef74a9044b18a371816 100644 (file)
@@ -1,6 +1,5 @@
 /*-- $Id$-- */
-/*
- * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+/* 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 @@ public class Block extends FObjMixed {
                                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 @@ public class Block extends FObjMixed {
                                }
 
                                //MessageHandler.error(" b:OK" + marker + " ");
-                               this.blockArea.isLast = true;
+                               this.blockArea.isLast(true);
                                return new Status(Status.OK);
                }
 
index 38e1fdb140b4d03e75472e48195d2bf9952260eb..90e7c81a55417f6ade327328f5704f13f86c6570 100644 (file)
@@ -1,52 +1,7 @@
-/*-- $Id$ --
-
- ============================================================================
-                                                                        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
-               apache@apache.org.
-
- 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 <jtauber@jtauber.com>. For more  information on the Apache
- Software Foundation, please see <http://www.apache.org/>.
-
+/*-- $Id$
+ * 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 @@ public class FootnoteBody extends FObj {
                      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 @@ public class FootnoteBody extends FObj {
       blockArea.end();
       area.addChild(blockArea);
       area.increaseHeight(blockArea.getHeight());
+         blockArea.isLast(true);
       return new Status(Status.OK);
     }
 }
index f805deef1731060755c278c675517c4db115ecf9..4f187c87edac8ee2a66f67e093955d7395eb11ba 100644 (file)
@@ -94,10 +94,10 @@ public class ListBlock extends FObj {
                                        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 @@ public class ListBlock extends FObj {
                                                area.start();
                                }
 
-                               blockArea.isLast = true;
+                               blockArea.isLast(true);
                                return new Status(Status.OK);
                }
 
index 6f74a6099df8ca258b020b0df1f8ff561baaba99..6e51598ba1f4e8cbc91b70b782417b2d2a9c9307 100644 (file)
@@ -80,10 +80,10 @@ public class ListItem extends FObj {
                                                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 @@ public class ListItem extends FObj {
                                if (area instanceof BlockArea) {
                                                area.start();
                                }
-                               this.blockArea.isLast = true;
+                               this.blockArea.isLast(true);
                                return new Status(Status.OK);
     }
 
index 10e1300c7954d94e96c4a1b3e78d51d6050d2251..6e36cbd5a5862050ecda34b05987d7f904f7bdc1 100644 (file)
@@ -111,7 +111,7 @@ public class RetrieveMarker extends FObjMixed {
                        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 @@ public class RetrieveMarker extends FObjMixed {
                        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 @@ public class RetrieveMarker extends FObjMixed {
                        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;
                                        }
                                }
index c25a7cbf51b18c4e8b245026abc37e108615aef4..f022e1bd5abde2621d5bca99ef5cc8866c949c58 100644 (file)
@@ -9,6 +9,7 @@ package org.apache.fop.layout;
 // 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 @@ abstract public class Area extends Box {
        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 @@ abstract public class Area extends Box {
         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 @@ abstract public class Area extends Box {
   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;
+       }
+       
 }