foray-commit — FOray repository commit log messages

[FOray-commit] SF.net SVN: foray: [7315] trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java

[<vic...@us...>]

Revision: 7315
Author:   victormote
Date:     2006-05-29 15:34:40 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7315&view=rev

Log Message:
-----------
Conform to renamed axsl method.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java	2006-05-29 22:16:41 UTC (rev 7314)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java	2006-05-29 22:34:40 UTC (rev 7315)
@@ -77,7 +77,7 @@
 //        FootnoteBody fb = getFO();
         try {
             RegionRABody bac = p.getWritableRegionBody();
-            FootnoteRA footArea = bac.getWritableFootnoteReferenceArea();
+            FootnoteRA footArea = bac.getWritableFootnoteRA();
             int oldHeight = footArea.crBPD();
             if (!footArea.hasChildren()) {
                 PageSequence pageSeq = bac.getWritablePage().getPageSequence();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7314] trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java

[<vic...@us...>]

Revision: 7314
Author:   victormote
Date:     2006-05-29 15:16:41 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7314&view=rev

Log Message:
-----------
Use new axsl methods to simplify layout logic for Footnote.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java	2006-05-29 22:15:59 UTC (rev 7313)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java	2006-05-29 22:16:41 UTC (rev 7314)
@@ -29,7 +29,6 @@
 import org.axsl.areaW.PageArea;
 
 import org.axsl.areaW.AreaWException;
-import org.axsl.foR.FONode;
 import org.axsl.foR.fo.Footnote;
 import org.axsl.foR.fo.FootnoteBody;
 import org.axsl.foR.fo.Inline;
@@ -49,38 +48,29 @@
 
     public int layout(Area area) throws AreaWException {
         Footnote node = getFO();
-        Inline inline = null;
-        FootnoteBody fbody = null;
         if (getProgress() == FONodePL.START) {
             setProgress(0);
         }
-        int numChildren = node.childrenFO().size();
-        for (int i = getProgress(); i < numChildren; i++) {
-            FONode fo = (FONode)node.childrenFO().get(i);
-            if (fo instanceof Inline) {
-                inline = (Inline) fo;
-                FObjMixedPL inlinePL = (FObjMixedPL) getLayoutProxy(inline);
-                int status = inlinePL.layout(area);
-                if (Status.isIncomplete(status)) {
-                    return status;
-                }
-            } else if (inline != null && fo instanceof FootnoteBody) {
-                // add footnote to current page or next if it can't fit
-                fbody = (FootnoteBody) fo;
-                if (area instanceof NormalBlockArea) {
-                    ((NormalBlockArea)area).addFootnote(fbody);
-                } else {
-                    FootnoteBodyPL fbPL
-                            = ((FootnoteBodyPL) getLayoutProxy(fbody));
-                    PageArea page = area.getWritablePage();
-                    fbPL.layoutFootnote(page, area);
-                }
-            }
+
+        /* Layout the Inline. */
+        Inline inline = node.getInline();
+        FObjMixedPL inlinePL = (FObjMixedPL) getLayoutProxy(inline);
+        int status = inlinePL.layout(area);
+        if (Status.isIncomplete(status)) {
+            return status;
         }
-        if (fbody == null) {
-            layout.getLogger().error("no footnote-body in footnote");
+
+        /* Layout the FootnoteBody. */
+        FootnoteBody fbody = node.getFootnoteBody();
+        // add footnote to current page or next if it can't fit
+        if (area instanceof NormalBlockArea) {
+            ((NormalBlockArea)area).addFootnote(fbody);
+        } else {
+            FootnoteBodyPL fbPL
+                    = ((FootnoteBodyPL) getLayoutProxy(fbody));
+            PageArea page = area.getWritablePage();
+            fbPL.layoutFootnote(page, area);
         }
-        if (area instanceof NormalBlockArea) {}
         return Status.OK;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7313] trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java

[<vic...@us...>]

Revision: 7313
Author:   victormote
Date:     2006-05-29 15:15:59 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7313&view=rev

Log Message:
-----------
1. Conform to new axsl requirements regarding fo:footnote children.
2. Add validation logic to Footnote to ensure that children fit the content model and to expedite subsequent processing.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java	2006-05-29 21:49:32 UTC (rev 7312)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java	2006-05-29 22:15:59 UTC (rev 7313)
@@ -59,4 +59,27 @@
         return true;
     }
 
+    public void end() throws FOTreeException {
+        if (this.children.size() != 2) {
+            throwException("fo:footnote requires exactly two children.");
+        }
+        if (! (this.children.get(0) instanceof Inline)) {
+            throwException("First child of fo:footnote must be an fo:inline.");
+        }
+        if (! (this.children.get(1) instanceof FootnoteBody)) {
+            throwException("Second child of fo:footnote must be an "
+                    + "fo:footnote-body.");
+        }
+    }
+
+    public org.axsl.foR.fo.Inline getInline() {
+        /* Cast and index are guaranteed in the end() method. */
+        return (Inline) this.children.get(0);
+    }
+
+    public org.axsl.foR.fo.FootnoteBody getFootnoteBody() {
+        /* Cast and index are guaranteed in the end() method. */
+        return (FootnoteBody) this.children.get(1);
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7312] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7312
Author:   victormote
Date:     2006-05-29 14:49:32 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7312&view=rev

Log Message:
-----------
Handle axsl changes regarding cursor positioning methods.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java	2006-05-29 21:49:18 UTC (rev 7311)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java	2006-05-29 21:49:32 UTC (rev 7312)
@@ -29,9 +29,13 @@
 import org.axsl.common.Constants;
 import org.axsl.foR.FObj;
 
-
+/**
+ * Common superclass for all areas generated by inline formatting objects.
+ * This should not be confused with the more specific class {@link InlineArea}
+ * which specifically handles areas generated by the fo:inline object.
+ */
 public abstract class AbstractInlineArea extends AreaFlexible
-        implements GeneralInlineArea{
+        implements GeneralInlineArea {
 
     public AbstractInlineArea(FObj generatedBy, Area parentArea) {
         super(generatedBy, parentArea);
@@ -65,12 +69,17 @@
         return crOriginX() + this.ancestorLineArea().alignmentAdjustment();
     }
 
-    public int alignmentPointX() {
-        return this.ancestorLineArea().alignmentPointX();
+    public int baselineX() {
+        return this.rrOriginX();
     }
 
-    public int alignmentPointY() {
-        return this.ancestorLineArea().alignmentPointY();
+    public int baselineY() {
+        return this.ancestorLineArea().alignmentPointY()
+                - this.traitBaselineShift();
     }
 
+    public int traitBaselineShift() {
+        return traitGeneratedBy().traitBaselineShift();
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 21:49:18 UTC (rev 7311)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 21:49:32 UTC (rev 7312)
@@ -564,7 +564,16 @@
     }
 
     /**
-     * {@inheritDoc}
+     * Provides the number which would, when added to the before-edge of the
+     * line-area in the block-progression-dimension, produce the
+     * alignment-point for text on this line.
+     * We believe the alignment point, which is defined in XSL-FO Standard 1.0,
+     * Section 7.8.1, to be the same point which is described in the PDF
+     * Reference, Second Edition, Section 5.1.3, as the "glyph origin".
+     * Renderers should rely on this behavior.
+     * @return The distance, in millipoints, between the before-edge of this
+     * line-area and a line parallel to it that runs through the
+     * alignment-point.
      */
     public int alignmentPointOffset() {
         int axis = this.getWritingMode().getAbsoluteAxis(Constants.AXIS_IP);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7311] trunk/foray/foray-render/src/java/org/foray/render

[<vic...@us...>]

Revision: 7311
Author:   victormote
Date:     2006-05-29 14:49:18 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7311&view=rev

Log Message:
-----------
Handle axsl changes regarding cursor positioning methods.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java	2006-05-29 19:57:56 UTC (rev 7310)
+++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java	2006-05-29 21:49:18 UTC (rev 7311)
@@ -119,7 +119,7 @@
      * @return The Y position that should be used for the underline stroke.
      */
     protected int getUnderlineYPosition(GeneralInlineArea area) {
-        return area.alignmentPointY() - (area.traitFontSize() / 10);
+        return area.baselineY() - (area.traitFontSize() / 10);
     }
 
     /**
@@ -128,7 +128,7 @@
      * @return The Y position that should be used for the overline stroke.
      */
     protected int getOverlineYPosition(GeneralInlineArea area) {
-        return area.alignmentPointY() + area.getFontAscender()
+        return area.baselineY() + area.getFontAscender()
                 + (area.traitFontSize() / 10);
     }
 
@@ -138,7 +138,7 @@
      * @return The Y position that should be used for the through stroke.
      */
     protected int getThroughYPosition(GeneralInlineArea area) {
-        return area.alignmentPointY() + (area.getFontAscender() * 3 / 8);
+        return area.baselineY() + (area.getFontAscender() * 3 / 8);
     }
 
     /**

Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-05-29 19:57:56 UTC (rev 7310)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-05-29 21:49:18 UTC (rev 7311)
@@ -288,10 +288,8 @@
         getContentStream().setCharacterSpacing(letterspacing);
 
         /* Position the cursor. */
-        float originX = area.rrOriginX() / 1000f;
-        float originY = (area.rrOriginY()
-                - area.ancestorLineAreaOut().alignmentPointOffset())
-                / 1000f;
+        float originX = area.baselineX() / 1000f;
+        float originY = area.baselineY() / 1000f;
         getContentStream().setCursor(originX, originY);
 
         FontUse primaryFont = area.getPrimaryFont();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7310] trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java

[<vic...@us...>]

Revision: 7310
Author:   victormote
Date:     2006-05-29 12:57:56 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7310&view=rev

Log Message:
-----------
When creating a new TextArea, set initial values of letter-spacing and word-spacing to their optimum values.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 19:56:56 UTC (rev 7309)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 19:57:56 UTC (rev 7310)
@@ -810,9 +810,12 @@
         if (parent instanceof FObjMixed) {
             FObjMixed mixed = (FObjMixed) foText.parentFO();
             int sequence = mixed.getChildren().indexOf(foText);
+            int initialWordSpacing = this.traitWordSpacingOpt();
+            int initialLetterSpacing = this.traitLetterSpacingOpt();
             return new TextArea(mixed, parentArea, sequence,
-                    startOffset, sizeInChars, ipd, 0, 0,
-                    hasDiscretionaryHyphen, hasFauxSmallCaps);
+                    startOffset, sizeInChars, ipd, initialLetterSpacing,
+                    initialWordSpacing, hasDiscretionaryHyphen,
+                    hasFauxSmallCaps);
         }
         if (parent instanceof Character) {
             return new TextArea((Character) parent, parentArea, ipd, 0, 0,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7309] trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java

[<vic...@us...>]

Revision: 7309
Author:   victormote
Date:     2006-05-29 12:56:56 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7309&view=rev

Log Message:
-----------
Rename constructor variable for clarity.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2006-05-29 19:35:02 UTC (rev 7308)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2006-05-29 19:56:56 UTC (rev 7309)
@@ -109,15 +109,15 @@
 
     public TextArea(FObjMixed generatedBy, Area parentArea,
             int backingSequence, int backingOffset, int backingSize,
-            int progressionDimensionUsed, int resolvedLetterSpacing,
-            int resolvedWordSpacing, boolean hasDiscretionaryHyphen,
+            int progressionDimensionUsed, int initialLetterSpacing,
+            int initialWordSpacing, boolean hasDiscretionaryHyphen,
             boolean hasFauxSmallCaps) {
         super(generatedBy, parentArea);
         this.backingSequence = backingSequence;
         this.backingOffset = backingOffset;
         this.backingSize = backingSize;
-        this.resolvedLetterSpacing = resolvedLetterSpacing;
-        this.resolvedWordSpacing = resolvedWordSpacing;
+        this.resolvedLetterSpacing = initialLetterSpacing;
+        this.resolvedWordSpacing = initialWordSpacing;
         this.hasDiscretionaryHyphen = hasDiscretionaryHyphen;
         this.hasFauxSmallCaps = hasFauxSmallCaps;
         setProgressionDimension(progressionDimensionUsed);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7308] trunk/foray/foray-pdf/src/java/org/foray/pdf/object

[<vic...@us...>]

Revision: 7308
Author:   victormote
Date:     2006-05-29 12:35:02 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7308&view=rev

Log Message:
-----------
Make PDFTextString subclass PDFObject directly, instead of PDFString.

Modified Paths:
--------------
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java	2006-05-29 19:13:45 UTC (rev 7307)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFString.java	2006-05-29 19:35:02 UTC (rev 7308)
@@ -32,6 +32,10 @@
 
 /**
  * A PDF String Object, as defined in PDF Reference, 2nd edition, Section 3.2.3.
+ * PDF string objects are used in content streams, and are specifically
+ * distinguished from PDF text strings, which are used for such things as
+ * bookmark titles, annotations, etc.
+ * @see PDFTextString
  */
 public class PDFString extends PDFObject {
 

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java	2006-05-29 19:13:45 UTC (rev 7307)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java	2006-05-29 19:35:02 UTC (rev 7308)
@@ -25,11 +25,13 @@
 package org.foray.pdf.object;
 
 /**
- * A subclass of PDFString modelling a PDF Text String, as defined in PDF
- * Reference, 2nd Edition, Section 3.8.1.
+ * A PDF Text String, as defined in PDF Reference, 2nd Edition, Section 3.8.1.
+ * Text-strings are used in such PDF concepts as bookmarks, text annotations,
+ * etc., which do not have control over fonts, layout, etc.
+ * For string objects used in PDF content streams, see {@link PDFString}.
  * @see PDFString
  */
-public class PDFTextString extends PDFString {
+public class PDFTextString extends PDFObject {
 
     /**
      * This char is returned when a Unicode character cannot be encoded using
@@ -37,8 +39,12 @@
      */
     public static final char INVALID_PDF_DOC_ENCODING = 0xffff;
 
+    /** The encapsulated String. */
+    protected String theString;
+
     public PDFTextString(PDFDocument doc, String string) {
-        super(doc, string, null);
+        super(doc);
+        this.theString = string;
     }
 
     /**
@@ -129,4 +135,14 @@
         return INVALID_PDF_DOC_ENCODING;
     }
 
+    public boolean isEmpty() {
+        if (this.theString == null) {
+            return true;
+        }
+        if (this.theString.equals("")) {
+            return true;
+        }
+        return false;
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7307] trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java

[<vic...@us...>]

Revision: 7307
Author:   victormote
Date:     2006-05-29 12:13:45 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7307&view=rev

Log Message:
-----------
Clean up unneeded comments.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:55:44 UTC (rev 7306)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 19:13:45 UTC (rev 7307)
@@ -44,9 +44,6 @@
     private int dimensionFootnoteRA;
     private int dimensionBeforeFloatRA;
 
-    // keeps track of footnote state for multiple layouts
-//    private int footnoteState = 0;
-
     public RegionRABody(RegionBody generatedBy, PageRA parentArea,
             int xPosition, int yPosition) {
         super(generatedBy, parentArea);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7306] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7306
Author:   victormote
Date:     2006-05-29 11:55:44 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7306&view=rev

Log Message:
-----------
Conform to axsl changes.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-05-29 18:42:45 UTC (rev 7305)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-05-29 18:55:44 UTC (rev 7306)
@@ -31,7 +31,8 @@
  * Manages the before-float-reference-area. Its parent should always be an
  * instance of RegionRABody.
  */
-public class BeforeFloatRA extends AreaFixed {
+public class BeforeFloatRA extends AreaFixed
+        implements org.axsl.areaW.BeforeFloatRA {
 
     public BeforeFloatRA(FObj generatedBy, RegionRABody parentArea) {
         super(generatedBy, parentArea);

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:42:45 UTC (rev 7305)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:55:44 UTC (rev 7306)
@@ -69,14 +69,10 @@
         return mainReferenceArea;
     }
 
-    public BeforeFloatRA getBeforeFloatReferenceArea() {
-        return beforeFloatReferenceArea;
+    public org.axsl.areaW.BeforeFloatRA getWritableBeforeFloatRA() {
+        return this.beforeFloatReferenceArea;
     }
 
-    public FootnoteRA getFootnoteReferenceArea() {
-        return footnoteReferenceArea;
-    }
-
     public org.axsl.areaW.FootnoteRA getWritableFootnoteReferenceArea() {
         return footnoteReferenceArea;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7305] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7305
Author:   victormote
Date:     2006-05-29 11:42:45 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7305&view=rev

Log Message:
-----------
Conform to axsl area-tree changes. Keep track of footnote layout status in the layout system, not in the area tree.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java	2006-05-29 18:42:37 UTC (rev 7304)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java	2006-05-29 18:42:45 UTC (rev 7305)
@@ -28,8 +28,7 @@
 import org.axsl.foR.FObj;
 
 /**
- * Manages the main-reference-area. Its parent should always be an instance of
- * RegionRABody.
+ * Manages the footnote reference area for a page.
  */
 public class FootnoteRA extends AreaFixed implements org.axsl.areaW.FootnoteRA {
 

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:42:37 UTC (rev 7304)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:42:45 UTC (rev 7305)
@@ -45,7 +45,7 @@
     private int dimensionBeforeFloatRA;
 
     // keeps track of footnote state for multiple layouts
-    private int footnoteState = 0;
+//    private int footnoteState = 0;
 
     public RegionRABody(RegionBody generatedBy, PageRA parentArea,
             int xPosition, int yPosition) {
@@ -81,24 +81,6 @@
         return footnoteReferenceArea;
     }
 
-    public int getFootnoteState() {
-        return footnoteState;
-    }
-
-    public boolean needsFootnoteAdjusting() {
-        int footnoteYPosition = footnoteReferenceArea.crOriginY();
-        switch (footnoteState) {
-        case 0:
-            if (footnoteReferenceArea.crBPD() > 0
-                    && mainReferenceArea.crBPD() > footnoteYPosition) {
-                return true;
-            }
-        case 1:
-            break;
-        }
-        return false;
-    }
-
     protected static void resetMaxHeight(Area ar, int change) {
         List childs = ar.getChildren();
         for (int i = 0; i < childs.size(); i++) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7304] trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java

[<vic...@us...>]

Revision: 7304
Author:   victormote
Date:     2006-05-29 11:42:37 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7304&view=rev

Log Message:
-----------
Conform to axsl area-tree changes. Keep track of footnote layout status in the layout system, not in the area tree.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java	2006-05-29 18:33:48 UTC (rev 7303)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java	2006-05-29 18:42:37 UTC (rev 7304)
@@ -87,10 +87,8 @@
                             = (StaticContentPL) getLayoutProxy(separator);
                     staticPL.layout(footArea);
                     int diff = footArea.crBPD() - oldHeight;
-                    if (bac.getFootnoteState() == 0) {
-                        Area ar = bac.getWritableMainRA();
-                        decreaseMaxHeight(ar, diff);
-                    }
+                    Area ar = bac.getWritableMainRA();
+                    decreaseMaxHeight(ar, diff);
                      oldHeight = footArea.crBPD();
                 }
             }
@@ -99,10 +97,8 @@
                 // add as a pending footnote
                 return false;
             }
-            if (bac.getFootnoteState() == 0) {
-                Area ar = bac.getWritableMainRA();
-                decreaseMaxHeight(ar, footArea.crBPD() - oldHeight);
-            }
+            Area ar = bac.getWritableMainRA();
+            decreaseMaxHeight(ar, footArea.crBPD() - oldHeight);
         } catch (AreaWException exception) {
             return false;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7303] trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java

[<vic...@us...>]

Revision: 7303
Author:   victormote
Date:     2006-05-29 11:33:48 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7303&view=rev

Log Message:
-----------
Remove unneeded instance variables.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:30:34 UTC (rev 7302)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:33:48 UTC (rev 7303)
@@ -44,10 +44,6 @@
     private int dimensionFootnoteRA;
     private int dimensionBeforeFloatRA;
 
-    // reference area yPositions
-    private int mainYPosition;
-    private int footnoteYPosition;
-
     // keeps track of footnote state for multiple layouts
     private int footnoteState = 0;
 
@@ -90,12 +86,11 @@
     }
 
     public boolean needsFootnoteAdjusting() {
-        footnoteYPosition = footnoteReferenceArea.crOriginY();
+        int footnoteYPosition = footnoteReferenceArea.crOriginY();
         switch (footnoteState) {
         case 0:
             if (footnoteReferenceArea.crBPD() > 0
-                    && mainYPosition + mainReferenceArea.crBPD()
-                       > footnoteYPosition) {
+                    && mainReferenceArea.crBPD() > footnoteYPosition) {
                 return true;
             }
         case 1:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7302] trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java

[<vic...@us...>]

Revision: 7302
Author:   victormote
Date:     2006-05-29 11:30:34 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7302&view=rev

Log Message:
-----------
Force the parent of BeforeFloatRA to be a RegionRABody.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-05-29 18:27:35 UTC (rev 7301)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-05-29 18:30:34 UTC (rev 7302)
@@ -33,7 +33,7 @@
  */
 public class BeforeFloatRA extends AreaFixed {
 
-    public BeforeFloatRA(FObj generatedBy, Area parentArea) {
+    public BeforeFloatRA(FObj generatedBy, RegionRABody parentArea) {
         super(generatedBy, parentArea);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7301] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7301
Author:   victormote
Date:     2006-05-29 11:27:35 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7301&view=rev

Log Message:
-----------
Remove some unused methods and instance variables.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-05-29 18:17:42 UTC (rev 7300)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java	2006-05-29 18:27:35 UTC (rev 7301)
@@ -41,18 +41,6 @@
         return AreaNode.AREATYPE_BEFORE_FLOAT_RA;
     }
 
-    public int getXPosition() {
-        // x-position is the same as the parent's
-        RegionRABody parent = (RegionRABody) getParent();
-        return parent.getXPosition();
-    }
-
-    public int getYPosition() {
-        // y-position is the same as the parent's
-        RegionRABody parent = (RegionRABody) getParent();
-        return parent.getYPosition();
-    }
-
     public int crBPD() {
         return ((RegionRABody) getParentArea()).getDimensionBeforeFloatRA();
     }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:17:42 UTC (rev 7300)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:27:35 UTC (rev 7301)
@@ -36,10 +36,6 @@
 public class RegionRABody extends AreaFixed implements RegionBodyArea,
         org.axsl.areaW.RegionRABody {
 
-    // dimensions for the 'region-reference-area'
-    private int xPosition;
-    private int yPosition;
-
     // the 3 primary reference areas
     private MainRA mainReferenceArea;
     private BeforeFloatRA beforeFloatReferenceArea;
@@ -58,8 +54,6 @@
     public RegionRABody(RegionBody generatedBy, PageRA parentArea,
             int xPosition, int yPosition) {
         super(generatedBy, parentArea);
-        this.xPosition = xPosition;
-        this.yPosition = yPosition;
 
         // create the primary reference areas
         beforeFloatReferenceArea = new BeforeFloatRA(generatedBy, this);
@@ -67,14 +61,6 @@
         footnoteReferenceArea = new FootnoteRA(generatedBy, this);
     }
 
-    public int getXPosition() {
-        return xPosition + getPaddingLeft() + getBorderLeftWidth();
-    }
-
-    public int getYPosition() {
-        return yPosition + getPaddingTop() + getBorderTopWidth();
-    }
-
     public MainReferenceArea getMainReferenceArea() {
         return mainReferenceArea;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7300] trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java

[<vic...@us...>]

Revision: 7300
Author:   victormote
Date:     2006-05-29 11:17:42 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7300&view=rev

Log Message:
-----------
Correct computation of remaining space in area. Was double-counting the space already used.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2006-05-29 17:51:49 UTC (rev 7299)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2006-05-29 18:17:42 UTC (rev 7300)
@@ -105,11 +105,12 @@
      */
     public org.axsl.areaW.LineArea createNextLineArea() {
         /* The size of the next line does not need to consider the half-leading
-         * that follows the line. */
+         * that follows the line. That half-leading will be automatically
+         * handled if the line is actually created, but can safely be ignored
+         * for purposes of deciding whether the line will fit. */
         int sizeNextLineArea = this.traitFontSize()
                 + this.traitHalfLeadingOpt();
-        if (this.getProgressionDimension()
-                + sizeNextLineArea
+        if (sizeNextLineArea
                 > this.progressionDimensionAvailable()) {
             return null;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7299] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7299
Author:   victormote
Date:     2006-05-29 10:51:49 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7299&view=rev

Log Message:
-----------
Make space-before and space-after traits of line-areas zero.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-05-29 16:32:23 UTC (rev 7298)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-05-29 17:51:49 UTC (rev 7299)
@@ -773,14 +773,30 @@
         return traitGeneratedBy().traitPaddingAfter(traitIsLast());
     }
 
+    public int traitSpaceBeforeMinimum() {
+        return traitGeneratedBy().traitSpaceBeforeMinimum();
+    }
+
     public int traitSpaceBeforeOptimum() {
         return traitGeneratedBy().traitSpaceBeforeOptimum();
     }
 
+    public int traitSpaceBeforeMaximum() {
+        return traitGeneratedBy().traitSpaceBeforeMaximum();
+    }
+
+    public int traitSpaceAfterMinumum() {
+        return traitGeneratedBy().traitSpaceAfterMinimum();
+    }
+
     public int traitSpaceAfterOptimum() {
         return traitGeneratedBy().traitSpaceAfterOptimum();
     }
 
+    public int traitSpaceAfterMaximum() {
+        return traitGeneratedBy().traitSpaceAfterMaximum();
+    }
+
     public int traitSpaceStartOptimum() {
         Area ancestor = this.ancestorBlockAreaNotALineArea();
         return traitGeneratedBy().traitSpaceStartOptimum(ancestor.crIPD());

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 16:32:23 UTC (rev 7298)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 17:51:49 UTC (rev 7299)
@@ -848,4 +848,40 @@
         return this;
     }
 
+    public int traitSpaceBeforeMinimum() {
+        /* space-before applies to the parent normal block area, but not to the
+         * line-area.*/
+        return 0;
+    }
+
+    public int traitSpaceBeforeOptimum() {
+        /* space-before applies to the parent normal block area, but not to the
+         * line-area.*/
+        return 0;
+    }
+
+    public int traitSpaceBeforeMaximum() {
+        /* space-before applies to the parent normal block area, but not to the
+         * line-area.*/
+        return 0;
+    }
+
+    public int traitSpaceAfterMinumum() {
+        /* space-after applies to the parent normal block area, but not to the
+         * line-area.*/
+        return 0;
+    }
+
+    public int traitSpaceAfterOptimum() {
+        /* space-after applies to the parent normal block area, but not to the
+         * line-area.*/
+        return 0;
+    }
+
+    public int traitSpaceAfterMaximum() {
+        /* space-after applies to the parent normal block area, but not to the
+         * line-area.*/
+        return 0;
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7298] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7298
Author:   victormote
Date:     2006-05-29 09:32:23 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7298&view=rev

Log Message:
-----------
Correct the process of checking the existence of a previous line in the block Area, so that the half-leading between lines is computed properly.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 16:12:53 UTC (rev 7297)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 16:32:23 UTC (rev 7298)
@@ -56,7 +56,7 @@
         /* The progression dimension used is exactly equal to the size of the
          * em-box, i.e. exactly equal to the font-size. */
         this.setProgressionDimension(this.traitFontSize());
-        LineArea prevLineArea = (LineArea) this.getPreviousChildOfGeneratedBy();
+        LineArea prevLineArea = parentArea.getPreviousLineArea(this);
         if (prevLineArea == null) {
             this.setAnteriorSpace(traitHalfLeadingOpt());
         } else {

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2006-05-29 16:12:53 UTC (rev 7297)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2006-05-29 16:32:23 UTC (rev 7298)
@@ -235,4 +235,19 @@
         this.pendingFootnotes = new ArrayList(newFootnotes);
     }
 
+    public LineArea getPreviousLineArea(LineArea lineArea) {
+        if (this.children == null) {
+            return null;
+        }
+        int index = children.indexOf(lineArea);
+        if (index <= 0) {
+            return null;
+        }
+        Object previousObject = children.get(index - 1);
+        if (previousObject instanceof LineArea) {
+            return (LineArea) previousObject;
+        }
+        return null;
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7296] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7296
Author:   victormote
Date:     2006-05-29 08:51:25 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7296&view=rev

Log Message:
-----------
Conform to axsl changes regarding removal of line-height traits, using half-leading traits instead.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-05-29 15:51:15 UTC (rev 7295)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-05-29 15:51:25 UTC (rev 7296)
@@ -1150,10 +1150,6 @@
         return true;
     }
 
-    public int traitLineHeight() {
-        return this.traitGeneratedBy().traitLineHeightOpt();
-    }
-
     public org.axsl.areaW.TableBodyContainer makeTableBodyContainer(
             TableBody tableBody) {
         return new org.foray.area.TableBodyContainer(tableBody, this);

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2006-05-29 15:51:15 UTC (rev 7295)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2006-05-29 15:51:25 UTC (rev 7296)
@@ -130,17 +130,7 @@
     }
 
     /**
-     * <p>Returns the actual total value of the size of this area (not counting
-     * space-before, etc.) in its progression direction.
-     * This value does <em>not</em> include space-before, etc., but
-     * <em>does</em> include borders and padding.
-     * For block areas, the progression dimension is the
-     * block-progression-dimension.
-     * For inline areas, it is the inline-progression-dimension.
-     * The Area stores this size, but the Layout system is responsible to
-     * compute and set it.
-     * Every AreaFlexible starts out with a progressionDimension of zero.</p>
-     * @return The progressionDimension.
+     * {@inheritDoc}
      */
     public int getProgressionDimension() {
         return this.progressionDimension;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 15:51:15 UTC (rev 7295)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-05-29 15:51:25 UTC (rev 7296)
@@ -53,12 +53,9 @@
 
     public LineArea(FObj generatedBy, NormalBlockArea parentArea) {
         super(generatedBy, parentArea);
-        if (getAscender() < 1
-                || getDescender() > -1) {
-            this.setProgressionDimension(this.traitLineHeight());
-        } else {
-            this.setProgressionDimension(getAscender() - getDescender());
-        }
+        /* The progression dimension used is exactly equal to the size of the
+         * em-box, i.e. exactly equal to the font-size. */
+        this.setProgressionDimension(this.traitFontSize());
         LineArea prevLineArea = (LineArea) this.getPreviousChildOfGeneratedBy();
         if (prevLineArea == null) {
             this.setAnteriorSpace(traitHalfLeadingOpt());

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2006-05-29 15:51:15 UTC (rev 7295)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2006-05-29 15:51:25 UTC (rev 7296)
@@ -49,8 +49,10 @@
         implements org.axsl.areaR.NormalBlockArea,
         org.axsl.areaW.NormalBlockArea {
 
+    /* TODO: This is a layout concept and should not be in AreaTree? */
     private LineArea currentLineArea;
 
+    /* TODO: This is a layout concept and should not be in AreaTree? */
     private ArrayList pendingFootnotes = null;
 
     public NormalBlockArea(FObj parentFObj, Area parentArea) {
@@ -102,8 +104,12 @@
      * @return the new current line area, which will be empty.
      */
     public org.axsl.areaW.LineArea createNextLineArea() {
+        /* The size of the next line does not need to consider the half-leading
+         * that follows the line. */
+        int sizeNextLineArea = this.traitFontSize()
+                + this.traitHalfLeadingOpt();
         if (this.getProgressionDimension()
-                + traitGeneratedBy().traitLineHeightOpt()
+                + sizeNextLineArea
                 > this.progressionDimensionAvailable()) {
             return null;
         }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java	2006-05-29 15:51:15 UTC (rev 7295)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java	2006-05-29 15:51:25 UTC (rev 7296)
@@ -237,8 +237,10 @@
     public boolean canAddLineArea(NormalBlockArea blockArea) {
         for (int i = 0; i < getChildren().size(); i++) {
             NormalFlowRA nf = (NormalFlowRA) getChildren().get(i);
+            int sizeNextLine = blockArea.traitFontSize()
+                    + blockArea.traitGeneratedBy().traitHalfLeadingOpt();
             if (nf.bpdUsedByChildren()
-                    + blockArea.traitGeneratedBy().traitLineHeightOpt()
+                    + sizeNextLine
                     <= this.progressionDimensionAvailable()) {
                 return true;
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7295] trunk/foray/foray-fotree/src/java/org/foray/fotree

[<vic...@us...>]

Revision: 7295
Author:   victormote
Date:     2006-05-29 08:51:15 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7295&view=rev

Log Message:
-----------
Conform to axsl changes regarding removal of line-height traits, using half-leading traits instead.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-05-27 19:14:38 UTC (rev 7294)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-05-29 15:51:15 UTC (rev 7295)
@@ -896,41 +896,6 @@
     /**
      * {@inheritDoc}
      */
-    public int traitLineHeightMin() {
-        return propertyList.traitLineHeight(Property.MINIMUM);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public int traitLineHeightOpt() {
-        return propertyList.traitLineHeight(Property.OPTIMUM);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public int traitLineHeightMax() {
-        return propertyList.traitLineHeight(Property.MAXIMUM);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public short traitLineHeightConditionality() {
-        return propertyList.traitLineHeightConditionality();
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public int traitLineHeightPrecedence() {
-        return propertyList.traitLineHeightPrecedence();
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
     public int traitEndIndent(int ipdContainingRA) {
         return propertyList.getIndent(Constants.DIRECTION_END,
                 ipdContainingRA);

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java	2006-05-27 19:14:38 UTC (rev 7294)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java	2006-05-29 15:51:15 UTC (rev 7295)
@@ -224,7 +224,7 @@
     public static int getPrecedenceNoInstance(FObj fobj) {
         FObj parent = fobj.getFObjParent();
         if (parent != null) {
-            return parent.traitLineHeightPrecedence();
+            return parent.traitHalfLeadingPrecedence();
         }
         return DtSpace.PRECEDENCE_FORCE;
     }
@@ -240,7 +240,7 @@
     public static short getConditionalityNoInstance(FObj fobj) {
         FObj parent = fobj.getFObjParent();
         if (parent != null) {
-            return parent.traitLineHeightConditionality();
+            return parent.traitHalfLeadingConditionality();
         }
         return Constants.FOVAL_RETAIN;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7294] trunk/foray/foray-app/src/java/org/foray/app

[<vic...@us...>]

Revision: 7294
Author:   victormote
Date:     2006-05-27 12:14:38 -0700 (Sat, 27 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7294&view=rev

Log Message:
-----------
Convert use of other FOraySession constructors to use of the factory method instead.

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java
    trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java
    trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java
    trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java
    trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java
Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java	2006-05-27 16:54:33 UTC (rev 7293)
+++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java	2006-05-27 19:14:38 UTC (rev 7294)
@@ -103,8 +103,7 @@
         resource.setMissingEmphasized(false);
 
         SessionConfig configuration = this.options.getSessionConfig();
-        session = new FOraySession(null, configuration, null, null, null, null,
-                null, null);
+        FOraySession session = FOraySpecific.makeFOraySession(configuration);
 
         // init parser
         parser = inputHandler.getParser();

Modified: trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java	2006-05-27 16:54:33 UTC (rev 7293)
+++ trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java	2006-05-27 19:14:38 UTC (rev 7294)
@@ -24,7 +24,6 @@
  
 package org.foray.app;
 
-import org.foray.common.Logging;
 import org.foray.core.FOrayException;
 import org.foray.core.FOraySession;
 import org.foray.core.SessionConfig;
@@ -56,10 +55,9 @@
     }
 
     public void run() throws FOrayException {
-        Log logger = Logging.makeDefaultLogger();
         SessionConfig configuration = this.options.getSessionConfig();
-        FOraySession session = new FOraySession(logger, configuration, null,
-                null, null, null, null, null);
+        FOraySession session = FOraySpecific.makeFOraySession(
+                configuration);
 
         PrinterJob pj = PrinterJob.getPrinterJob();
         if(System.getProperty("dialog") != null) {

Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java	2006-05-27 16:54:33 UTC (rev 7293)
+++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java	2006-05-27 19:14:38 UTC (rev 7294)
@@ -24,6 +24,7 @@
  
 package org.foray.app.ant;
 
+import org.foray.app.FOraySpecific;
 import org.foray.app.Options;
 import org.foray.app.OutputTargetFactory;
 import org.foray.app.Starter;
@@ -263,8 +264,8 @@
         }
 
         try {
-            FOraySession session = new FOraySession(this.getLogger(),
-                    sessionConfig, null, null, null, null, null, null);
+            FOraySession session = FOraySpecific.makeFOraySession(
+                    sessionConfig);
             FOrayDocument document = new FOrayDocument(session,
                     inputHandler.getInputSource(), parser);
 

Modified: trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java	2006-05-27 16:54:33 UTC (rev 7293)
+++ trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java	2006-05-27 19:14:38 UTC (rev 7294)
@@ -24,6 +24,7 @@
  
 package org.foray.app.test;
 
+import org.foray.app.FOraySpecific;
 import org.foray.app.OutputTargetFactory;
 import org.foray.common.Logging;
 import org.foray.core.FOInputHandler;
@@ -270,8 +271,8 @@
                                                              + xsl));
             }
 
-            FOraySession session = new FOraySession(log, configuration, null,
-                    null, null, null, null, null);
+            FOraySession session = FOraySpecific.makeFOraySession(
+                    configuration);
 
             XMLReader parser = inputHandler.getParser();
             setParserFeatures(parser);

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java	2006-05-27 16:54:33 UTC (rev 7293)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java	2006-05-27 19:14:38 UTC (rev 7294)
@@ -34,6 +34,7 @@
 
 import javax.xml.transform.TransformerException;
 
+import org.foray.app.FOraySpecific;
 import org.foray.core.Application;
 import org.foray.core.FOInputHandler;
 import org.foray.core.FOrayDocument;
@@ -41,7 +42,6 @@
 import org.foray.core.FOraySession;
 import org.foray.core.FOrayTarget;
 import org.foray.core.InputHandler;
-import org.foray.core.SessionConfig;
 import org.foray.render.awt.AWTRenderer;
 import org.foray.render.awt.viewer.PreviewDialog;
 import org.foray.render.awt.viewer.SecureResourceBundle;
@@ -111,9 +111,7 @@
         // TODO: userMessage doesn't seem to be used anywhere.
 
         //Setup FOraySession
-        SessionConfig config = new SessionConfig(getLogger());
-        FOraySession session = new FOraySession(logger, config, null, null,
-                null, null, null, null);
+        FOraySession session = FOraySpecific.makeFOraySession(null);
 
         //Setup FOrayDocument
         InputHandler inputHandler = new FOInputHandler(getLogger(), fo);

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java	2006-05-27 16:54:33 UTC (rev 7293)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java	2006-05-27 19:14:38 UTC (rev 7294)
@@ -24,6 +24,7 @@
  
 package org.foray.demo.embed;
 
+import org.foray.app.FOraySpecific;
 import org.foray.app.OutputTargetFactory;
 import org.foray.core.Application;
 import org.foray.core.FOInputHandler;
@@ -32,7 +33,6 @@
 import org.foray.core.FOraySession;
 import org.foray.core.FOrayTarget;
 import org.foray.core.InputHandler;
-import org.foray.core.SessionConfig;
 
 import org.axsl.output.OutputTarget;
 
@@ -50,9 +50,7 @@
             FOrayException {
 
         // Setup FOraySession
-        SessionConfig config = new SessionConfig(getLogger());
-        FOraySession session = new FOraySession(getLogger(), config, null, null,
-                null, null, null, null);
+        FOraySession session = FOraySpecific.makeFOraySession(null);
 
         // Setup FOrayDocument
         InputHandler inputHandler = new FOInputHandler(getLogger(), fo);

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java	2006-05-27 16:54:33 UTC (rev 7293)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java	2006-05-27 19:14:38 UTC (rev 7294)
@@ -24,13 +24,13 @@
  
 package org.foray.demo.embed;
 
+import org.foray.app.FOraySpecific;
 import org.foray.app.OutputTargetFactory;
 import org.foray.core.Application;
 import org.foray.core.FOrayDocument;
 import org.foray.core.FOrayException;
 import org.foray.core.FOraySession;
 import org.foray.core.FOrayTarget;
-import org.foray.core.SessionConfig;
 import org.foray.demo.embed.model.ProjectTeam;
 
 import org.axsl.output.OutputTarget;
@@ -56,9 +56,7 @@
                 throws IOException, FOrayException, TransformerException {
                     
         // Setup FOraySession
-        SessionConfig config = new SessionConfig(getLogger());
-        FOraySession session = new FOraySession(getLogger(), config, null, null,
-                null, null, null, null);
+        FOraySession session = FOraySpecific.makeFOraySession(null);
 
         // Setup FOrayDocument
         // Setup JAXP transformation

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java	2006-05-27 16:54:33 UTC (rev 7293)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java	2006-05-27 19:14:38 UTC (rev 7294)
@@ -24,6 +24,7 @@
  
 package org.foray.demo.embed;
 
+import org.foray.app.FOraySpecific;
 import org.foray.app.OutputTargetFactory;
 import org.foray.core.Application;
 import org.foray.core.FOrayDocument;
@@ -56,8 +57,7 @@
 
         // Setup FOraySession
         SessionConfig config = new SessionConfig(getLogger());
-        FOraySession session = new FOraySession(getLogger(), config, null, null,
-                null, null, null, null);
+        FOraySession session = FOraySpecific.makeFOraySession(config);
 
         // Setup FOrayDocument
         // Setup JAXP transformation

Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java	2006-05-27 16:54:33 UTC (rev 7293)
+++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java	2006-05-27 19:14:38 UTC (rev 7294)
@@ -24,6 +24,7 @@
  
 package org.foray.demo.servlet;
 
+import org.foray.app.FOraySpecific;
 import org.foray.app.OutputTargetFactory;
 import org.foray.common.Logging;
 import org.foray.core.FOInputHandler;
@@ -32,7 +33,6 @@
 import org.foray.core.FOraySession;
 import org.foray.core.FOrayTarget;
 import org.foray.core.InputHandler;
-import org.foray.core.SessionConfig;
 
 import org.axsl.output.OutputTarget;
 
@@ -110,9 +110,7 @@
             throws FOrayException {
         response.setContentType(getContentType());
         // Setup FOraySession
-        SessionConfig configuration = new SessionConfig(logger);
-        FOraySession session = new FOraySession(logger, configuration, null,
-                null, null, null, null, null);
+        FOraySession session = FOraySpecific.makeFOraySession(null);
         return session;
     }
 
@@ -198,9 +196,7 @@
             response.setContentType("application/pdf");
 
             // Setup FOraySession
-            SessionConfig configuration = new SessionConfig(logger);
-            FOraySession session = new FOraySession(logger, configuration, null,
-                    null, null, null, null, null);
+            FOraySession session = FOraySpecific.makeFOraySession(null);
 
             // Setup FOrayDocument
             TransformerFactory factory = TransformerFactory.newInstance();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7293] trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java

[<vic...@us...>]

Revision: 7293
Author:   victormote
Date:     2006-05-27 09:54:33 -0700 (Sat, 27 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7293&view=rev

Log Message:
-----------
Don't remove empty blocks if they are empty on purpose.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-05-26 22:46:24 UTC (rev 7292)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-05-27 16:54:33 UTC (rev 7293)
@@ -313,11 +313,20 @@
                 purgeEmptyNodes((Area) object);
             }
         }
-        if (area instanceof LineArea && ! area.hasChildren()) {
+
+        /* Remove empty line areas. */
+        if (area instanceof LineArea
+                && ! area.hasChildren()) {
             area.remove();
             getLogger().debug("Removing empty line-area.");
         }
-        if (area instanceof NormalBlockArea && ! area.hasChildren()) {
+
+        /* Remove empty block areas only if they are generated by FONodes that
+         * actually have children. If the FONode has no children, then an empty
+         * area is needed in the area tree. */
+        if (area instanceof NormalBlockArea
+                && ! area.hasChildren()
+                && area.generatedBy.getFONode().hasChildren()) {
             area.remove();
             getLogger().debug("Removing empty normal block-area.");
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7292] trunk/foray/foray-app/src/java/org/foray/app

[<vic...@us...>]

Revision: 7292
Author:   victormote
Date:     2006-05-26 15:46:24 -0700 (Fri, 26 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7292&view=rev

Log Message:
-----------
Move more bootstrapping logic to FOraySpecific.

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java
    trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java
Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java	2006-05-26 22:36:59 UTC (rev 7291)
+++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java	2006-05-26 22:46:24 UTC (rev 7292)
@@ -33,13 +33,7 @@
 import org.foray.output.OutputConfig;
 import org.foray.pioneer.PioneerLS;
 
-import org.axsl.areaW.AreaTreeFactory;
-import org.axsl.foR.FOTreeFactory;
-import org.axsl.fontR.FontServer;
-import org.axsl.graphicR.GraphicServer;
-import org.axsl.layout.LayoutFactory;
 import org.axsl.output.OutputTarget;
-import org.axsl.text.TextServer;
 
 import org.apache.commons.logging.Log;
 
@@ -78,32 +72,9 @@
          * who wish to embed FOray in other applications. 
          */
 
-        /*
-         * Instantiate and configure the FOraySession.
-         * All parameters (Logger, SessionConfig, FontServer, TextServer,
-         * GraphicServer, and FOTreeServer) are optional.
-         * Each one that is passed as null in the constructor will be created
-         * by the FOraySession.
-         * However, if an instance <em>is</em> passed here, it needs to already
-         * be fully configured and ready to go.
-         */
-        /* Set Logger to null so that new one will be created at the right
-         * verbosity level. */
+        /* Instantiate the FOraySession. */
         SessionConfig sessionConfig = this.options.getSessionConfig();
-        Log logger = FOraySpecific.makeLogger(sessionConfig);
-        FontServer fontServer = FOraySpecific.makeFontServer(logger,
-                sessionConfig);
-        TextServer textServer = FOraySpecific.makeTextServer(logger,
-                sessionConfig);
-        GraphicServer graphicServer = FOraySpecific.makeGraphicServer(logger);
-        FOTreeFactory foTreeServer = FOraySpecific.makeFOTreeFactory(logger,
-                sessionConfig, graphicServer, textServer);
-        AreaTreeFactory areaTreeFactory = FOraySpecific.makeAreaTreeFactory(
-                logger, textServer);
-        LayoutFactory layoutFactory = FOraySpecific.makeLayoutFactory(logger);
-        FOraySession session = new FOraySession(logger, sessionConfig,
-                fontServer, textServer, graphicServer, foTreeServer,
-                areaTreeFactory, layoutFactory);
+        FOraySession session = FOraySpecific.makeFOraySession(sessionConfig);
 
         /*
          * Instantiate and configure the FOrayDocument(s). The constructor

Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java	2006-05-26 22:36:59 UTC (rev 7291)
+++ trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java	2006-05-26 22:46:24 UTC (rev 7292)
@@ -28,6 +28,7 @@
 import org.foray.common.Logging;
 import org.foray.common.XMLParser;
 import org.foray.core.FOrayException;
+import org.foray.core.FOraySession;
 import org.foray.core.SessionConfig;
 import org.foray.font.FOrayFontServer;
 import org.foray.fotree.FOrayFOTreeServer;
@@ -65,6 +66,31 @@
     private FOraySpecific() {
     }
 
+    /**
+     * @return A new FOraySession instance configured with default servers and
+     * factories.
+     * @throws FOrayException For errors in creating the server and factories,
+     * or in instantiating the FOraySession.
+     */
+    public static FOraySession makeFOraySession(SessionConfig sessionConfig)
+            throws FOrayException {
+        Log logger = FOraySpecific.makeLogger(sessionConfig);
+        FontServer fontServer = FOraySpecific.makeFontServer(logger,
+                sessionConfig);
+        TextServer textServer = FOraySpecific.makeTextServer(logger,
+                sessionConfig);
+        GraphicServer graphicServer = FOraySpecific.makeGraphicServer(logger);
+        FOTreeFactory foTreeServer = FOraySpecific.makeFOTreeFactory(logger,
+                sessionConfig, graphicServer, textServer);
+        AreaTreeFactory areaTreeFactory = FOraySpecific.makeAreaTreeFactory(
+                logger, textServer);
+        LayoutFactory layoutFactory = FOraySpecific.makeLayoutFactory(logger);
+        FOraySession session = new FOraySession(logger, sessionConfig,
+                fontServer, textServer, graphicServer, foTreeServer,
+                areaTreeFactory, layoutFactory);
+        return session;
+    }
+
     public static Log makeLogger(SessionConfig configuration) {
         if (configuration.optionVerbosity().equals("debug")) {
             return Logging.makeDebugLogger();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7291] trunk/foray/foray-output/src/java/org/foray/output

[<vic...@us...>]

Revision: 7291
Author:   victormote
Date:     2006-05-26 15:36:59 -0700 (Fri, 26 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7291&view=rev

Log Message:
-----------
Clean up build problem. aXSL is not supposed to have access to any logging.

Modified Paths:
--------------
    trunk/foray/foray-output/src/java/org/foray/output/Converter.java
    trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java
    trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java
Modified: trunk/foray/foray-output/src/java/org/foray/output/Converter.java
===================================================================
--- trunk/foray/foray-output/src/java/org/foray/output/Converter.java	2006-05-26 22:36:47 UTC (rev 7290)
+++ trunk/foray/foray-output/src/java/org/foray/output/Converter.java	2006-05-26 22:36:59 UTC (rev 7291)
@@ -24,6 +24,8 @@
 
 package org.foray.output;
 
+import org.apache.commons.logging.Log;
+
 /**
  * Abstract superclass for all output targets that do no layout, instead
  * converting directly from the FO Tree.
@@ -33,8 +35,8 @@
     /**
      * 
      */
-    public Converter(OutputConfig outputConfig) {
-        super(outputConfig);
+    public Converter(Log logger, OutputConfig outputConfig) {
+        super(logger, outputConfig);
     }
 
 }

Modified: trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java
===================================================================
--- trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java	2006-05-26 22:36:47 UTC (rev 7290)
+++ trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java	2006-05-26 22:36:59 UTC (rev 7291)
@@ -34,6 +34,8 @@
 import org.axsl.foR.fo.TableRow;
 import org.axsl.fontR.FontConsumer;
 
+import org.apache.commons.logging.Log;
+
 import java.awt.Color;
 import java.io.IOException;
 
@@ -71,8 +73,8 @@
     /**
      * create the MIF renderer
      */
-    public MIFConverter(OutputConfig outputConfig) {
-        super(outputConfig);
+    public MIFConverter(Log logger, OutputConfig outputConfig) {
+        super(logger, outputConfig);
     }
 
     public void convert(Table table) {

Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java
===================================================================
--- trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java	2006-05-26 22:36:47 UTC (rev 7290)
+++ trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java	2006-05-26 22:36:59 UTC (rev 7291)
@@ -49,7 +49,8 @@
     /**
      * 
      */
-    public OutputTarget(OutputConfig outputConfig) {
+    public OutputTarget(Log logger, OutputConfig outputConfig) {
+        this.logger = logger;
         this.options = outputConfig;
     }
 
@@ -156,13 +157,6 @@
     }
 
     /**
-     * {@inheritDoc}
-     */
-    public void setLogger(Log logger) {
-        this.logger = logger;
-    }
-
-    /**
      * @param fontConsumer The fontConsumer to set.
      */
     public void setFontConsumer(FontConsumer fontConsumer) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7290] trunk/foray/foray-app/src/java/org/foray/app

[<vic...@us...>]

Revision: 7290
Author:   victormote
Date:     2006-05-26 15:36:47 -0700 (Fri, 26 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7290&view=rev

Log Message:
-----------
Clean up build problem. aXSL is not supposed to have access to any logging.

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java
    trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java
    trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java
Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java	2006-05-26 22:36:29 UTC (rev 7289)
+++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java	2006-05-26 22:36:47 UTC (rev 7290)
@@ -119,7 +119,7 @@
         }
 
         OutputConfig renderOptions = commandLineOptions.getRendererOptions();
-        this.renderer = new AWTRenderer(renderOptions);
+        this.renderer = new AWTRenderer(this.getLogger(), renderOptions);
         frame = createPreviewDialog(renderer, resource);
         renderer.setProgressListener(frame);
         renderer.setComponent(frame);

Modified: trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java	2006-05-26 22:36:29 UTC (rev 7289)
+++ trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java	2006-05-26 22:36:47 UTC (rev 7290)
@@ -102,7 +102,7 @@
         OutputTarget renderer = null;
         switch (rendererType) {
         case RENDER_AWT: {
-            renderer = new AWTRenderer(outputOptions);
+            renderer = new AWTRenderer(logger, outputOptions);
             break;
         }
         case RENDER_PRINT: {
@@ -110,32 +110,32 @@
                     + "from the standard method.");
         }
         case RENDER_PCL: {
-            renderer = new PCLRenderer(outputOptions);
+            renderer = new PCLRenderer(logger, outputOptions);
             break;
         }
         case RENDER_PS: {
-            renderer = new PSRenderer(outputOptions);
+            renderer = new PSRenderer(logger, outputOptions);
             break;
         }
         case RENDER_TXT: {
-            renderer = new TXTRenderer(outputOptions);
+            renderer = new TXTRenderer(logger, outputOptions);
             break;
         }
         case RENDER_MIF: {
-            renderer = new MIFConverter(outputOptions);
+            renderer = new MIFConverter(logger, outputOptions);
             break;
         }
         case RENDER_XML: {
-            renderer = new XMLRenderer(outputOptions);
+            renderer = new XMLRenderer(logger, outputOptions);
             break;
         }
         case RENDER_SVG: {
-            renderer = new SVGRenderer(outputOptions);
+            renderer = new SVGRenderer(logger, outputOptions);
             break;
         }
         default: {
             PDFDocument document = new org.foray.pdf.object.PDFDocument(logger);
-            renderer = new PDFRenderer(outputOptions, document);
+            renderer = new PDFRenderer(logger, outputOptions, document);
             break;
         }
         }

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java	2006-05-26 22:36:29 UTC (rev 7289)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java	2006-05-26 22:36:47 UTC (rev 7290)
@@ -121,7 +121,7 @@
                 inputHandler.getInputSource(), inputHandler.getParser());
 
         //Setup renderer
-        AWTRenderer renderer = new AWTRenderer(null);
+        AWTRenderer renderer = new AWTRenderer(this.logger, null);
 
         //Setup FOrayTarget
         new FOrayTarget(document, renderer, null, null);

Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java	2006-05-26 22:36:29 UTC (rev 7289)
+++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java	2006-05-26 22:36:47 UTC (rev 7290)
@@ -115,7 +115,7 @@
         // Setup the Renderer
         PrinterJob pj = PrinterJob.getPrinterJob();
         pj.setCopies(1);
-        AWTPrintRenderer renderer = new AWTPrintRenderer(null, pj);
+        AWTPrintRenderer renderer = new AWTPrintRenderer(this.logger, null, pj);
         // Setup FOrayTarget
         FOrayTarget target = new FOrayTarget(document, renderer, null, null);
         return target;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.