foray-commit Mailing List for FOray (Page 57)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 12476
          http://sourceforge.net/p/foray/code/12476
Author:   victormote
Date:     2022-01-26 23:24:40 +0000 (Wed, 26 Jan 2022)
Log Message:
-----------
Conform to aXSL changes: Complete tie-in of metadata and bookmarks to the area tree.

Modified Paths:
--------------
    trunk/foray/foray-app/src/test/java/org/foray/app/area/TestMetadata.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkParentArea.java
    trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java

Added Paths:
-----------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/DocumentMetadata4a.java

Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/TestMetadata.java
===================================================================

--- trunk/foray/foray-app/src/test/java/org/foray/app/area/TestMetadata.java	2022-01-26 21:12:34 UTC (rev 12475)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/TestMetadata.java	2022-01-26 23:24:40 UTC (rev 12476)
@@ -51,10 +51,10 @@
         final AreaTree4a areaTree = creator.buildAreaTree("fo/metadata-001.fo", getTextServer(),
                 getLineBreakerFactory());
         Assert.assertNotNull(areaTree);
-        Assert.assertEquals("Test Title", areaTree.getTitle());
-        Assert.assertEquals("Test Author", areaTree.getAuthor());
-        Assert.assertEquals("Test Subject", areaTree.getSubject());
-        Assert.assertEquals("Test Keywords", areaTree.getKeywords());
+        Assert.assertEquals("Test Title", areaTree.getMetadata().getTitle());
+        Assert.assertEquals("Test Author", areaTree.getMetadata().getAuthor());
+        Assert.assertEquals("Test Subject", areaTree.getMetadata().getSubject());
+        Assert.assertEquals("Test Keywords", areaTree.getMetadata().getKeywords());
     }
 
 }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2022-01-26 21:12:34 UTC (rev 12475)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaTree4a.java	2022-01-26 23:24:40 UTC (rev 12476)
@@ -62,7 +62,7 @@
 /**
  * The root of the AreaTree.
  */
-public final class AreaTree4a extends NonArea implements AreaTree, DocumentMetadataG5 {
+public final class AreaTree4a extends NonArea implements AreaTree {
 
     /** The initial size at which the linkage map should be created. */
     private static final short INITIAL_LINKAGE_MAP_SIZE = 200;
@@ -76,6 +76,9 @@
     /** The bookmark tree for this document. */
     private BookmarkTreeArea bookmarkTreeArea;
 
+    /** The metadata for this document. */
+    private DocumentMetadataG5 documentMetadata;
+
     /** The font consumer for this area tree. */
     private FontConsumer fontConsumer;
 
@@ -123,6 +126,7 @@
         this.fontConsumer = fontConsumer;
         this.textServer = textServer;
         this.lineBreaker = lbFactory.obtainLineBreaker();
+        this.documentMetadata = new DocumentMetadata4a(this);
     }
 
     /**
@@ -427,26 +431,6 @@
     }
 
     @Override
-    public String getTitle() {
-        return this.getRoot().getTitle();
-    }
-
-    @Override
-    public String getAuthor() {
-        return this.getRoot().getAuthor();
-    }
-
-    @Override
-    public String getSubject() {
-        return this.getRoot().getSubject();
-    }
-
-    @Override
-    public String getKeywords() {
-        return this.getRoot().getKeywords();
-    }
-
-    @Override
     public BookmarkTreeArea getBookmarkTree() {
         return this.bookmarkTreeArea;
     }
@@ -471,7 +455,7 @@
 
     @Override
     public DocumentMetadataG5 getMetadata() {
-        return this;
+        return this.documentMetadata;
     }
 
 }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java	2022-01-26 21:12:34 UTC (rev 12475)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkArea.java	2022-01-26 23:24:40 UTC (rev 12476)
@@ -41,8 +41,6 @@
 
 import java.awt.Color;
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * The AreaTree representation of an fo:bookmark object.
@@ -55,9 +53,6 @@
     /** The parent of this node. */
     private BookmarkParentArea parent;
 
-    /** The children of this node. */
-    private List<BookmarkArea> children = new ArrayList<BookmarkArea>();
-
     /** The title area for this bookmark. */
     private BookmarkTitleArea titleArea;
 
@@ -83,6 +78,14 @@
     }
 
     /**
+     * Returns the parent of this bookmark.
+     * @return The parent of this bookmark.
+     */
+    public BookmarkParentArea getParent() {
+        return this.parent;
+    }
+
+    /**
      * Return the bookmark title for this bookmark.
      * @return The bookmark title for this bookmark.
      */
@@ -101,11 +104,6 @@
         this.titleArea = newTitleArea;
     }
 
-    @Override
-    public List<BookmarkArea> getChildren() {
-        return this.children;
-    }
-
     /**
      * Creates the child areas for this bookmark area.
      * @param bookmark The "generated-by" Bookmark.
@@ -121,11 +119,6 @@
         }
     }
 
-    @Override
-    protected void addBookmarkAreaChild(final BookmarkArea bookmarkArea) {
-        this.children.add(bookmarkArea);
-    }
-
     /**
      * Returns the FO Tree bookmark node that created this.
      * @return The FO Tree bookmark.
@@ -164,14 +157,6 @@
         return this.getBookmarkTitle().traitGeneratedBy().traitFontStyle(null);
     }
 
-    /**
-     * Returns the parent of this bookmark.
-     * @return The parent of this bookmark.
-     */
-    public BookmarkParentArea getParent() {
-        return this.parent;
-    }
-
     @Override
     public String getAreaName() {
         return "bookmark";
@@ -188,11 +173,6 @@
     }
 
     @Override
-    public BookmarkArea areaNodeChildAt(final int childIndex) {
-        return this.children.get(childIndex);
-    }
-
-    @Override
     public Link<? extends Fo> getFoLink() {
         return getAreaTree().getFONodeLinkage(this.foLink);
     }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkParentArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkParentArea.java	2022-01-26 21:12:34 UTC (rev 12475)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkParentArea.java	2022-01-26 23:24:40 UTC (rev 12476)
@@ -29,12 +29,29 @@
 package org.foray.area;
 
 import org.axsl.fotree.fo.Bookmark;
+import org.axsl.galley.metadata.BookmarkParentG5;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Superclass for classes that can be parents of {@link BookmarkArea}s.
  */
-public abstract class BookmarkParentArea extends AreaNode4a {
+public abstract class BookmarkParentArea extends AreaNode4a implements BookmarkParentG5 {
 
+    /** The children of this node. */
+    private List<BookmarkArea> children = new ArrayList<BookmarkArea>();
+
+    @Override
+    public BookmarkArea areaNodeChildAt(final int childIndex) {
+        return this.children.get(childIndex);
+    }
+
+    @Override
+    public List<BookmarkArea> getChildren() {
+        return this.children;
+    }
+
     /**
      * Recursively lays out a bookmark.
      * @param bookmark The bookmark being laid out.
@@ -50,6 +67,8 @@
      * Adds a bookmark area as a child.
      * @param bookmarkArea The bookmark area to be added.
      */
-    protected abstract void addBookmarkAreaChild(BookmarkArea bookmarkArea);
+    protected void addBookmarkAreaChild(final BookmarkArea bookmarkArea) {
+        this.children.add(bookmarkArea);
+    }
 
 }

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java	2022-01-26 21:12:34 UTC (rev 12475)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BookmarkTreeArea.java	2022-01-26 23:24:40 UTC (rev 12476)
@@ -37,9 +37,6 @@
 import org.axsl.galley.GalleyVisitor;
 import org.axsl.galley.GalleyVisitorException;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A NonArea class for items generated by fo:bookmark-tree.
  */
@@ -51,9 +48,6 @@
     /** The parent of this node. */
     private AreaTree4a parent;
 
-    /** The children of this node. */
-    private List<BookmarkArea> children = new ArrayList<BookmarkArea>();
-
     /**
      * Private Constructor.
      * @param parentArea The parent area.
@@ -81,16 +75,6 @@
         return this.parent;
     }
 
-    @Override
-    public BookmarkArea areaNodeChildAt(final int childIndex) {
-        return this.children.get(childIndex);
-    }
-
-    @Override
-    protected void addBookmarkAreaChild(final BookmarkArea bookmarkArea) {
-        this.children.add(bookmarkArea);
-    }
-
     /**
      * Returns the FO Tree node that generated this bookmark tree.
      * @return The FO Tree node that generated this bookmark tree.
@@ -115,11 +99,6 @@
     }
 
     @Override
-    public List<? extends AreaNode4a> getChildren() {
-        return this.children;
-    }
-
-    @Override
     public Fo traitGeneratedBy() {
         return this.foLink;
     }

Added: trunk/foray/foray-areatree/src/main/java/org/foray/area/DocumentMetadata4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/DocumentMetadata4a.java	                        (rev 0)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/DocumentMetadata4a.java	2022-01-26 23:24:40 UTC (rev 12476)
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2022 The FOray Project.
+ *      http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.area;
+
+import org.foray.area.link.Link;
+import org.foray.common.MarkedIndexOutOfBoundsException;
+
+import org.axsl.area.AreaTreeException;
+import org.axsl.fotree.Fo;
+import org.axsl.galley.DocumentMetadataG5;
+import org.axsl.galley.GalleyVisitor;
+import org.axsl.galley.GalleyVisitorException;
+
+import java.util.Collections;
+import java.util.List;
+
+public class DocumentMetadata4a extends AreaNode4a implements DocumentMetadataG5 {
+
+    /** The parent area tree. */
+    private AreaTree4a parent;
+
+    public DocumentMetadata4a(final AreaTree4a parent) {
+        this.parent = parent;
+    }
+
+    @Override
+    public AreaTree4a getParent() {
+        return this.parent;
+    }
+
+    @Override
+    public String getAreaName() {
+        return "document-metadata";
+    }
+
+    @Override
+    public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+        return visitor.visit(this);
+    }
+
+    @Override
+    public void setParent(final AreaNode4a node) throws AreaTreeException {
+        this.parent = (AreaTree4a) node;
+    }
+
+    @Override
+    public List<? extends AreaNode4a> getChildren() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public AreaNode4a areaNodeChildAt(final int childIndex) {
+        throw new MarkedIndexOutOfBoundsException(childIndex, 0);
+    }
+
+    @Override
+    public Fo traitGeneratedBy() {
+        return this.traitGeneratedBy();
+    }
+
+    @Override
+    public Link<? extends Fo> getFoLink() {
+        return null;
+    }
+
+    @Override
+    protected boolean optimize() {
+        return false;
+    }
+
+    @Override
+    public String getTitle() {
+        return this.parent.traitGeneratedBy().getTitle();
+    }
+
+    @Override
+    public String getAuthor() {
+        return this.parent.traitGeneratedBy().getAuthor();
+    }
+
+    @Override
+    public String getSubject() {
+        return this.parent.traitGeneratedBy().getSubject();
+    }
+
+    @Override
+    public String getKeywords() {
+        return this.parent.traitGeneratedBy().getKeywords();
+    }
+
+}


Property changes on: trunk/foray/foray-areatree/src/main/java/org/foray/area/DocumentMetadata4a.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2022-01-26 21:12:34 UTC (rev 12475)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java	2022-01-26 23:24:40 UTC (rev 12476)
@@ -678,8 +678,8 @@
         pdfOutline = parent.createPdfOutlineItem(area.getTitleText(),
                 area.getInternalDestination(), color, italic, bold);
         // Recursively handle child bookmarks
-        for (int i = 0; i < area.getChildren().size(); i++) {
-            final BookmarkG5 child = area.getChildren().get(i);
+        for (int i = 0; i < area.qtyAreaNodeChildren(); i++) {
+            final BookmarkG5 child = area.areaNodeChildAt(i);
             renderBookmark(child, pdfOutline);
         }
     }

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





2006	Jan	Feb	Mar (139)	Apr (98)	May (250)	Jun (394)	Jul (84)	Aug (13)	Sep (420)	Oct (186)	Nov (1)	Dec (3)
2007	Jan (108)	Feb (202)	Mar (291)	Apr (247)	May (374)	Jun (227)	Jul (231)	Aug (60)	Sep (31)	Oct (45)	Nov (18)	Dec
2008	Jan (38)	Feb (71)	Mar (142)	Apr	May (59)	Jun (6)	Jul (10)	Aug	Sep	Oct	Nov	Dec
2009	Jan (12)	Feb (4)	Mar (88)	Apr (121)	May (17)	Jun (30)	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec
2010	Jan (11)	Feb (76)	Mar (11)	Apr	May (11)	Jun	Jul	Aug (44)	Sep (14)	Oct (7)	Nov	Dec
2011	Jan	Feb	Mar	Apr	May (9)	Jun	Jul	Aug	Sep	Oct (10)	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (4)	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (168)
2017	Jan (77)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr (6)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb (88)	Mar (118)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (141)
2021	Jan (170)	Feb (20)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct (62)	Nov (189)	Dec (162)
2022	Jan (201)	Feb (118)	Mar (8)	Apr	May (2)	Jun (47)	Jul (19)	Aug (14)	Sep (3)	Oct	Nov (28)	Dec (235)
2023	Jan (112)	Feb (23)	Mar (2)	Apr (2)	May	Jun (1)	Jul	Aug (70)	Sep (92)	Oct (20)	Nov (1)	Dec (1)
2024	Jan	Feb	Mar (1)	Apr (1)	May (14)	Jun (11)	Jul (1)	Aug	Sep	Oct	Nov	Dec
2025	Jan (10)	Feb (29)	Mar	Apr (162)	May (245)	Jun (83)	Jul	Aug (1)	Sep	Oct	Nov (3)	Dec

foray-commit Mailing List for FOray (Page 57)

Modular XSL-FO Implementation for Java.

foray-commit — FOray repository commit log messages