foray-commit Mailing List for FOray (Page 69)

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

Revision: 12177
          http://sourceforge.net/p/foray/code/12177
Author:   victormote
Date:     2021-12-06 17:31:37 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
Progress on restricting Block4a children.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockDiscrete.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================

--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-06 16:09:56 UTC (rev 12176)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-06 17:31:37 UTC (rev 12177)
@@ -120,6 +120,7 @@
 import org.axsl.common.value.WhiteSpaceTreatment;
 import org.axsl.common.value.WrapOption;
 import org.axsl.fo.Fo;
+import org.axsl.fo.FoContentModelBlockOnly;
 import org.axsl.fo.FoContext;
 import org.axsl.fo.FoInlineContext;
 import org.axsl.fo.FoTreeException;
@@ -217,6 +218,11 @@
     @Override
     public abstract List<? extends FoObj> getChildren();
 
+    @Override
+    public FoObj getChildAt(final int childIndex) {
+        return getChildren().get(childIndex);
+    }
+
     /**
      * Return this node's effective parent, cast as an FoObj.
      * This differs from the value returned by
@@ -3927,4 +3933,22 @@
         return server.getOrthography(writingSystem);
     }
 
+    /**
+     * Indicates whether this object has an descendants that are block-level items.
+     * Instances of classes that <em>might</em> be block-level items, but that are not and have no descendants that are
+     * should not be counted as blocks for purposes of this method.
+     * @return True if and only if this object has at least one descendant block-level item.
+     */
+    public boolean hasDescendantBlocks() {
+        for (int index = 0; index < getChildCount(); index ++) {
+            final FoObj foobj = this.getChildAt(index);
+            if (foobj instanceof FoContentModelBlockOnly) {
+                return true;
+            } else if (foobj.hasDescendantBlocks()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockDiscrete.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockDiscrete.java	2021-12-06 16:09:56 UTC (rev 12176)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockDiscrete.java	2021-12-06 17:31:37 UTC (rev 12177)
@@ -26,137 +26,129 @@
  * $LastChangedBy$
  */
 
-//package org.foray.fotree.fo.obj;
-//
-//import org.foray.fotree.FoObj;
-//import org.foray.fotree.Namespace;
-//import org.foray.fotree.PropertyList;
-//
-//import org.axsl.fo.Fo;
-//import org.axsl.fo.FoContentModelBlock;
-//import org.axsl.fo.FoContentModelText;
-//import org.axsl.fo.FoContext;
-//import org.axsl.fo.FoTreeException;
-//import org.axsl.fo.ProxyFactory;
-//import org.axsl.font.FontUse;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * A container for pure text and inline items.
-// * This is a pass-thru pseudo-element that is always a child of a {@link Block4a} and that has no
-// * {@link FoContentModelBlock} descendants.
-// * In other words, it is content that can be laid out as a discrete paragraph.
-// */
-//public class BlockDiscrete extends FoObj {
-//
-//    /** The parent of this node. */
-//    private Block4a parent;
-//    /** The children of this object. */
-//    private List<FoObj> children = new ArrayList<FoObj>();
-//
-//    /**
-//     * Constructor.
-//     * @param parent The parent FoObj.
-//     */
-//    public BlockDiscrete(final Block4a parent) {
-//        super(parent);
-//        this.parent = parent;
-//    }
-//
-//    @Override
-//    public Fo getChildAt(int childIndex) {
-//        // TODO Auto-generated method stub
-//        return null;
-//    }
-//
-//    @Override
-//    public Object acceptProxyFactory(ProxyFactory factory) {
-//        // TODO Auto-generated method stub
-//        return null;
-//    }
-//
-//    @Override
-//    public boolean isValid() {
-//        // TODO Auto-generated method stub
-//        return false;
-//    }
-//
-//    @Override
-//    public FontUse getPrimaryFont(final FoContext context) {
-//        return this.parent.getPrimaryFont(context);
-//    }
-//
-//    @Override
-//    public Block4a getParent() {
-//        return this.parent;
-//    }
-//
-//    @Override
-//    public List<? extends FoObj> getChildren() {
-//        return this.children;
-//    }
-//
-//    @Override
-//    protected void validateAncestry() throws FoTreeException {
-//    }
-//
-//    @Override
-//    protected void validateProperties() throws FoTreeException {
-//    }
-//
-//    @Override
-//    protected void setup() throws FoTreeException {
-//    }
-//
-//    @Override
-//    protected void validateDescendants() throws FoTreeException {
-//    }
-//
-//    @Override
-//    protected void end() throws FoTreeException {
-//    }
-//
-//    @Override
-//    public void addChild(final FoObj child) throws FoTreeException {
-//        // TODO Auto-generated method stub
-//        if (child instanceof FoContentModelText
-//                || child instanceof FoContent) {
-//            this.children.add(child);
-//        }
-//
-//    }
-//
-//    @Override
-//    public Namespace getNamespace() {
-//        return this.parent.getNamespace();
-//    }
-//
-//    @Override
-//    public boolean isContentBlock() {
-//        return true;
-//    }
-//
-//    @Override
-//    public boolean isContentInline() {
-//        return false;
-//    }
-//
-//    @Override
-//    public boolean isContentPcdata() {
-//        return false;
-//    }
-//
-//    @Override
-//    public String getName() {
-//        return "block-discrete-(pseudo)";
-//    }
-//
-//    @Override
-//    public PropertyList getPropertyList() {
-//        return this.parent.getPropertyList();
-//    }
-//
-//
-//}
+package org.foray.fotree.fo.obj;
+
+import org.foray.fotree.FoObj;
+import org.foray.fotree.Namespace;
+import org.foray.fotree.PropertyList;
+
+import org.axsl.fo.FoContentModelInlineOnly;
+import org.axsl.fo.FoContentModelText;
+import org.axsl.fo.FoContext;
+import org.axsl.fo.FoTreeException;
+import org.axsl.fo.ProxyFactory;
+import org.axsl.font.FontUse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A container for only text and inline items.
+ * This is a pass-thru pseudo-element that is always a child of a {@link Block4a} and that has no
+ * {@link org.axsl.fo.FoContentModelBlock} descendants.
+ * In other words, it is content that can be laid out as a discrete paragraph, uninterrupted by other blocks.
+ */
+public class BlockDiscrete extends FoObj {
+
+    /** The parent of this node. */
+    private Block4a parent;
+
+    /** The children of this object. */
+    private List<FoObj> children = new ArrayList<FoObj>();
+
+    /**
+     * Constructor.
+     * @param parent The parent FoObj.
+     */
+    public BlockDiscrete(final Block4a parent) {
+        super(parent);
+        this.parent = parent;
+    }
+
+    @Override
+    public Object acceptProxyFactory(final ProxyFactory factory) {
+        return null;
+    }
+
+    @Override
+    public boolean isValid() {
+        return true;
+    }
+
+    @Override
+    public FontUse getPrimaryFont(final FoContext context) {
+        return this.parent.getPrimaryFont(context);
+    }
+
+    @Override
+    public Block4a getParent() {
+        return this.parent;
+    }
+
+    @Override
+    public List<? extends FoObj> getChildren() {
+        return this.children;
+    }
+
+    @Override
+    protected void validateAncestry() throws FoTreeException {
+    }
+
+    @Override
+    protected void validateProperties() throws FoTreeException {
+    }
+
+    @Override
+    protected void setup() throws FoTreeException {
+    }
+
+    @Override
+    protected void validateDescendants() throws FoTreeException {
+    }
+
+    @Override
+    protected void end() throws FoTreeException {
+    }
+
+    @Override
+    public void addChild(final FoObj child) throws FoTreeException {
+        if (child instanceof FoContentModelText
+                || child instanceof FoContentModelInlineOnly) {
+            this.children.add(child);
+        } else {
+            throw new IllegalStateException("Cannot add item to " + this.getClass().getName());
+        }
+    }
+
+    @Override
+    public Namespace getNamespace() {
+        return this.parent.getNamespace();
+    }
+
+    @Override
+    public boolean isContentBlock() {
+        return true;
+    }
+
+    @Override
+    public boolean isContentInline() {
+        return false;
+    }
+
+    @Override
+    public boolean isContentPcdata() {
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return "block-discrete-(pseudo)";
+    }
+
+    @Override
+    public PropertyList getPropertyList() {
+        return this.parent.getPropertyList();
+    }
+
+
+}

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 (4)	Dec

foray-commit Mailing List for FOray (Page 69)

Modular XSL-FO Implementation for Java.

foray-commit — FOray repository commit log messages