foray-commit Mailing List for FOray (Page 68)

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

Revision: 12202
          http://sourceforge.net/p/foray/code/12202
Author:   victormote
Date:     2021-12-10 13:03:10 +0000 (Fri, 10 Dec 2021)
Log Message:
-----------
Move BlockDiscrete logic from FoContainerComplex to Block4a.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoContainerComplex.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java

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

--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoContainerComplex.java	2021-12-10 12:54:33 UTC (rev 12201)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoContainerComplex.java	2021-12-10 13:03:10 UTC (rev 12202)
@@ -74,43 +74,7 @@
 
     @Override
     public void addChild(final FoObj fobj) throws FoTreeException {
-//        if (fobj instanceof FoContentModelBlockOnly) {
-            children.add(fobj);
-//            return;
-//        }
-//        if (fobj instanceof AbstractCharacterSequence) {
-//            addBlockDiscreteContent(fobj);
-//            return;
-//        }
-//        if (fobj instanceof FoContentModelInlineOnly) {
-//            addBlockDiscreteContent(fobj);
-//            return;
-//        }
-//        if (fobj instanceof FoContentModelAny) {
-//            /* If it is capable of containing block-level elements, but does not, it can be a child. */
-//            if (! fobj.hasDescendantBlocks()) {
-//                addBlockDiscreteContent(fobj);
-//            } else {
-//                children.add(fobj);
-//            }
-//            return;
-//        }
-//        throwException("Unable to handle this kind of mixed content.");
+        children.add(fobj);
     }
 
-//    private void addBlockDiscreteContent(final FoObj fobj) throws FoTreeException {
-//        final FoObj lastChild = this.getLastChild();
-//        BlockDiscrete4a discrete = null;
-//        if (lastChild == null) {
-//            discrete = new BlockDiscrete4a(this);
-//            getChildren().add(discrete);
-//        } else if (lastChild instanceof BlockDiscrete4a) {
-//            discrete = (BlockDiscrete4a) lastChild;
-//        } else {
-//            discrete = new BlockDiscrete4a(this);
-//            getChildren().add(discrete);
-//        }
-//        discrete.addChild(fobj);
-//    }
-
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java	2021-12-10 12:54:33 UTC (rev 12201)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java	2021-12-10 13:03:10 UTC (rev 12202)
@@ -173,4 +173,45 @@
         return true;
     }
 
+//    @Override
+//    public void addChild(final FoObj fobj) throws FoTreeException {
+//        if (fobj instanceof FoContentModelBlockOnly) {
+//            children.add(fobj);
+//            return;
+//        }
+//        if (fobj instanceof AbstractCharacterSequence) {
+//            addBlockDiscreteContent(fobj);
+//            return;
+//        }
+//        if (fobj instanceof FoContentModelInlineOnly) {
+//            addBlockDiscreteContent(fobj);
+//            return;
+//        }
+//        if (fobj instanceof FoContentModelAny) {
+//            /* If it is capable of containing block-level elements, but does not, it can be a child. */
+//            if (! fobj.hasDescendantBlocks()) {
+//                addBlockDiscreteContent(fobj);
+//            } else {
+//                children.add(fobj);
+//            }
+//            return;
+//        }
+//        throwException("Unable to handle this kind of mixed content.");
+//    }
+
+//    private void addBlockDiscreteContent(final FoObj fobj) throws FoTreeException {
+//        final FoObj lastChild = this.getLastChild();
+//        BlockDiscrete4a discrete = null;
+//        if (lastChild == null) {
+//            discrete = new BlockDiscrete4a(this);
+//            getChildren().add(discrete);
+//        } else if (lastChild instanceof BlockDiscrete4a) {
+//            discrete = (BlockDiscrete4a) lastChild;
+//        } else {
+//            discrete = new BlockDiscrete4a(this);
+//            getChildren().add(discrete);
+//        }
+//        discrete.addChild(fobj);
+//    }
+
 }

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 68)

Modular XSL-FO Implementation for Java.

foray-commit — FOray repository commit log messages