|
From: <vic...@us...> - 2006-06-13 00:24:01
|
Revision: 7550 Author: victormote Date: 2006-06-12 17:23:54 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7550&view=rev Log Message: ----------- Fix to the factory method for FOLinkage items. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-13 00:13:20 UTC (rev 7549) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-13 00:23:54 UTC (rev 7550) @@ -32,7 +32,6 @@ import org.axsl.foR.FOContext; import org.axsl.foR.FONode; import org.axsl.foR.FObj; -import org.axsl.foR.fo.Marker; import org.axsl.foR.fo.RetrieveMarker; import org.axsl.fontR.FontConsumer; import org.axsl.text.TextServer; @@ -68,7 +67,7 @@ // AreaTree has no parent with which to register getAreaNodeParent().getChildren().add(this); // Root can't do this because the AreaTreeControl isn't registered. - this.generatedBy = linkage(generatedBy); + this.generatedBy = linkage(generatedBy, retrieveMarker); FOLinkageNormal normalLinkage = this.getNormalLinkage(); normalLinkage.registerGeneratedArea(this); } @@ -96,7 +95,8 @@ this.children.remove(areaNode); } - public static FOLinkage linkage(FONode foNode) { + public static FOLinkage linkage(FONode foNode, + RetrieveMarker retrieveMarker) { if (foNode == null) { return null; } @@ -104,12 +104,12 @@ if (linkage != null) { return linkage; } - Marker marker = foNode.ancestorMarker(); - if (marker == null) { + if (retrieveMarker == null) { linkage = new FOLinkageNormal(foNode); } else { try { - linkage = new FOLinkageMarker(foNode); + FOLinkageMarker markerLinkage = new FOLinkageMarker(foNode); + markerLinkage.getNormalLinkage(retrieveMarker); } catch (AreaWException e) { /* Ignore this. It should never happen as we have already tested * for the condition that causes the exception, i.e. that foNode Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-06-13 00:13:20 UTC (rev 7549) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-06-13 00:23:54 UTC (rev 7550) @@ -80,7 +80,7 @@ * These registration steps must take place after the AreaTreeControl * has been stored. */ - this.generatedBy = linkage(root); + this.generatedBy = linkage(root, null); this.getNormalLinkage().registerGeneratedArea(this); } @@ -178,7 +178,7 @@ */ public Area firstNormalAreaReturned(String id) { FObj fobj = retrieveId(id); - FOLinkage linkage = linkage(fobj); + FOLinkage linkage = linkage(fobj, null); if (linkage instanceof FOLinkageNormal) { FOLinkageNormal normalLinkage = (FOLinkageNormal) linkage; return normalLinkage.firstNormalAreaReturned(); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-06-13 00:13:20 UTC (rev 7549) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-06-13 00:23:54 UTC (rev 7550) @@ -332,7 +332,7 @@ public org.axsl.areaW.SpanRA startingReferenceArea(FObj lastFObj, FObj nextFObj) throws AreaWException { if (lastFObj != null) { - FOLinkage linkage = linkage(lastFObj); + FOLinkage linkage = linkage(lastFObj, null); FOLinkageNormal normalLinkage = null; if (linkage instanceof FOLinkageNormal) { normalLinkage = (FOLinkageNormal) linkage; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-13 00:13:20 UTC (rev 7549) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-13 00:23:54 UTC (rev 7550) @@ -565,7 +565,7 @@ private FOLinkageNormal markerParentLinkage(Marker marker) { FObj parent = marker.parentFO(); - FOLinkage proxy = linkage(parent); + FOLinkage proxy = linkage(parent, null); if (proxy instanceof FOLinkageNormal) { return (FOLinkageNormal) proxy; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-13 00:12:58
|
Revision: 7547 Author: victormote Date: 2006-06-12 17:12:23 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7547&view=rev Log Message: ----------- 1. Change AreaNode constructors to take a RetrieveMarker as a parameter. 2. Conform to axsl changes regarding the same in factory methods. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.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-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -38,10 +38,6 @@ public abstract class AbstractInlineArea extends AreaFlexible implements GeneralInlineArea { - public AbstractInlineArea(FONode generatedBy, Area parentArea) { - super(generatedBy, parentArea); - } - public AbstractInlineArea(FONode generatedBy, Area parentArea, RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.foR.FObj; +import org.axsl.foR.fo.RetrieveMarker; /** * Abstract superclass for all of the areas that are normal-block areas, @@ -35,8 +36,9 @@ implements org.axsl.areaR.AbstractNormalBlockArea, org.axsl.areaW.AbstractNormalBlockArea { - public AbstractNormalBlockArea(FObj parentFObj, Area parentArea) { - super(parentFObj, parentArea); + public AbstractNormalBlockArea(FObj parentFObj, Area parentArea, + RetrieveMarker retrieveMarker) { + super(parentFObj, parentArea, retrieveMarker); } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -26,6 +26,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; +import org.axsl.foR.fo.RetrieveMarker; /** * Marks a place in the AreaTree, but does not have any area itself. @@ -33,8 +34,9 @@ */ public abstract class AbstractPlaceholder extends Area { - public AbstractPlaceholder(FObj generatedBy, Area parentArea) { - super(generatedBy, parentArea); + public AbstractPlaceholder(FObj generatedBy, Area parentArea, + RetrieveMarker retrieveMarker) { + super(generatedBy, parentArea, retrieveMarker); } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -26,17 +26,20 @@ import org.axsl.areaW.TableRowContainer; import org.axsl.foR.FObj; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.foR.fo.TableRow; public abstract class AbstractTableContainer extends GenericContainer implements org.axsl.areaW.AbstractTableContainer { - public AbstractTableContainer(FObj generatedBy, Area parentArea) { - super(generatedBy, parentArea); + public AbstractTableContainer(FObj generatedBy, Area parentArea, + RetrieveMarker retrieveMarker) { + super(generatedBy, parentArea, retrieveMarker); } - public TableRowContainer makeTableRowContainer(TableRow node) { - return new org.foray.area.TableRowContainer(node, this); + public TableRowContainer makeTableRowContainer(TableRow node, + RetrieveMarker retrieveMarker) { + return new org.foray.area.TableRowContainer(node, this, retrieveMarker); } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -55,10 +55,6 @@ * @param generatedBy * @param parentArea */ - public Area(FONode generatedBy, AreaNode parentArea) { - super(generatedBy, parentArea); - } - public Area(FONode generatedBy, AreaNode parentArea, RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); @@ -1168,22 +1164,27 @@ return true; } - public TableArea makeTableArea(Table table) { - return new org.foray.area.TableRA(table, this); + public TableArea makeTableArea(Table table, + RetrieveMarker retrieveMarker) { + return new org.foray.area.TableRA(table, this, retrieveMarker); } - public NormalBlockArea makeNormalBlockArea(Block block) { - return new org.foray.area.NormalBlockArea(block, this); + public NormalBlockArea makeNormalBlockArea(Block block, + RetrieveMarker retrieveMarker) { + return new org.foray.area.NormalBlockArea(block, this, retrieveMarker); } public BlockContainerRA makeBlockContainerArea( - BlockContainer blockContainer) { - return new org.foray.area.BlockContainerRA(blockContainer, this); + BlockContainer blockContainer, RetrieveMarker retrieveMarker) { + return new org.foray.area.BlockContainerRA(blockContainer, this, + retrieveMarker); } - public ListBlockArea makeListBlockArea(ListBlock listBlock) { - return new org.foray.area.ListBlockArea(listBlock, this); + public ListBlockArea makeListBlockArea(ListBlock listBlock, + RetrieveMarker retrieveMarker) { + return new org.foray.area.ListBlockArea(listBlock, this, + retrieveMarker); } public int traitTop() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.foR.FObj; +import org.axsl.foR.fo.RetrieveMarker; import java.util.List; @@ -37,8 +38,9 @@ */ public abstract class AreaFixed extends Area { - public AreaFixed(FObj generatedBy, AreaNode parentArea) { - super(generatedBy, parentArea); + public AreaFixed(FObj generatedBy, AreaNode parentArea, + RetrieveMarker retrieveMarker) { + super(generatedBy, parentArea, retrieveMarker); } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -52,10 +52,6 @@ */ private int anteriorSpace; - public AreaFlexible(FONode generatedBy, AreaNode parentArea) { - this(generatedBy, parentArea, null); - } - public AreaFlexible(FONode generatedBy, AreaNode parentArea, RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -59,11 +59,8 @@ * @param generatedBy The FObj instance that generated this Area. * @param parentArea The Area instance that is the newly-constructed Area's * parent in the AreaTree. + * @param retrieveMarker TODO */ - public AreaNode(FONode generatedBy, AreaNode parentArea) { - this(generatedBy, parentArea, null); - } - public AreaNode(FONode generatedBy, AreaNode parentArea, RetrieveMarker retrieveMarker) { super(parentArea); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -26,6 +26,7 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.foR.fo.BasicLink; +import org.axsl.foR.fo.RetrieveMarker; /** * Areas generated by the fo:basic-link object. @@ -34,8 +35,9 @@ implements org.axsl.areaR.BasicLinkArea, org.axsl.areaW.BasicLinkArea { - public BasicLinkArea(BasicLink generatedBy, Area parentArea) { - super(generatedBy, parentArea); + public BasicLinkArea(BasicLink generatedBy, Area parentArea, + RetrieveMarker retrieveMarker) { + super(generatedBy, parentArea, retrieveMarker); } public int crIPD() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -37,7 +37,7 @@ org.axsl.areaW.BeforeFloatRA { public BeforeFloatRA(FObj generatedBy, RegionRABody parentArea) { - super(generatedBy, parentArea); + super(generatedBy, parentArea, null); } public int crBPD() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.foR.FObj; +import org.axsl.foR.fo.RetrieveMarker; /** * Superclass for normal block-areas (NormalBlockArea) and line-areas @@ -32,8 +33,9 @@ */ public abstract class BlockArea extends AreaFlexible { - public BlockArea(FObj parentFObj, Area parentArea) { - super(parentFObj, parentArea); + public BlockArea(FObj parentFObj, Area parentArea, + RetrieveMarker retrieveMarker) { + super(parentFObj, parentArea, retrieveMarker); } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -28,6 +28,7 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.common.Constants; import org.axsl.foR.FObj; +import org.axsl.foR.fo.RetrieveMarker; /** * The container area for the contents of a block-container FO. @@ -35,8 +36,9 @@ public class BlockContainerRA extends ContainerRA implements BlockContainerArea, org.axsl.areaW.BlockContainerRA { - public BlockContainerRA(FObj generatedBy, Area parentArea) { - super(generatedBy, parentArea); + public BlockContainerRA(FObj generatedBy, Area parentArea, + RetrieveMarker retrieveMarker) { + super(generatedBy, parentArea, retrieveMarker); } public boolean isAbsolutelyPositioned() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -26,6 +26,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; +import org.axsl.foR.fo.RetrieveMarker; /** * Abstract superclass for areas that are primarily for collection and @@ -36,8 +37,9 @@ public abstract class ContainerRA extends AreaFlexible implements org.axsl.areaW.ContainerRA { - public ContainerRA(FObj generatedBy, Area parentArea) { - super(generatedBy, parentArea); + public ContainerRA(FObj generatedBy, Area parentArea, + RetrieveMarker retrieveMarker) { + super(generatedBy, parentArea, retrieveMarker); } public Area getOverflowArea(Area childRequesting) throws AreaWException { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -26,6 +26,7 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.foR.fo.ExternalGraphic; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.graphicR.Graphic; @@ -34,8 +35,8 @@ org.axsl.areaW.ExternalGraphicArea { public ExternalGraphicArea(ExternalGraphic generatedBy, Area parentArea, - int width) { - super(generatedBy, parentArea); + RetrieveMarker retrieveMarker, int width) { + super(generatedBy, parentArea, retrieveMarker); setProgressionDimension(width); // Adjust the bpd of the parent line-area. parentArea.setMinimumProgressionDimension(viewportBPD()); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -35,7 +35,7 @@ implements org.axsl.areaR.FootnoteArea, org.axsl.areaW.FootnoteRA { public FootnoteRA(FObj generatedBy, RegionRABody parentArea) { - super(generatedBy, parentArea); + super(generatedBy, parentArea, null); } public int crBPD() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -27,6 +27,7 @@ import org.axsl.areaR.RenderVisitor; import org.axsl.foR.ForeignXML; import org.axsl.foR.fo.InstreamForeignObject; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.foR.svg.SVGElement; public class ForeignObjectArea extends AbstractInlineArea @@ -34,8 +35,8 @@ org.axsl.areaW.ForeignObjectArea { public ForeignObjectArea(InstreamForeignObject generatedBy, - Area parentArea, int width) { - super(generatedBy, parentArea); + Area parentArea, RetrieveMarker retrieveMarker, int width) { + super(generatedBy, parentArea, retrieveMarker); setProgressionDimension(width); // Adjust the bpd of the parent line-area. parentArea.setMinimumProgressionDimension(viewportBPD()); @@ -43,7 +44,7 @@ // Create the reference area for the content. ForeignXML foreign = generatedBy.getForeignXML(); if (foreign instanceof SVGElement) { - new SVGArea((SVGElement) foreign, this); + new SVGArea((SVGElement) foreign, this, retrieveMarker); } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.foR.FObj; +import org.axsl.foR.fo.RetrieveMarker; public abstract class GenericContainer extends ContainerRA implements org.axsl.areaW.GenericContainer { @@ -32,8 +33,9 @@ int xPosition = 0; int yPosition = 0; - public GenericContainer(FObj generatedBy, Area parentArea) { - super(generatedBy, parentArea); + public GenericContainer(FObj generatedBy, Area parentArea, + RetrieveMarker retrieveMarker) { + super(generatedBy, parentArea, retrieveMarker); } public void setXPosition(int xPosition) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -32,6 +32,7 @@ import org.axsl.foR.fo.Leader; import org.axsl.foR.fo.PageNumber; import org.axsl.foR.fo.PageNumberCitation; +import org.axsl.foR.fo.RetrieveMarker; /** * Areas generated by the fo:inline object. @@ -40,8 +41,9 @@ implements org.axsl.areaR.InlineArea, org.axsl.areaW.InlineArea { - public InlineArea(Inline generatedBy, Area parentArea) { - super(generatedBy, parentArea); + public InlineArea(Inline generatedBy, Area parentArea, + RetrieveMarker retrieveMarker) { + super(generatedBy, parentArea, retrieveMarker); } /** @@ -52,28 +54,31 @@ } public org.axsl.areaW.ForeignObjectArea makeForeignObjectArea( - InstreamForeignObject ifo, int ipd) { - return LineArea.makeForeignObjectArea(ifo, this, ipd); + InstreamForeignObject ifo, int ipd, RetrieveMarker retrieveMarker) { + return LineArea.makeForeignObjectArea(ifo, this, ipd, retrieveMarker); } public org.axsl.areaW.ExternalGraphicArea makeExternalGraphicArea( - ExternalGraphic ifo, int ipd) { - return LineArea.makeExternalGraphicArea(ifo, this, ipd); + ExternalGraphic ifo, int ipd, RetrieveMarker retrieveMarker) { + return LineArea.makeExternalGraphicArea(ifo, this, ipd, retrieveMarker); } public org.axsl.areaW.LeaderArea makeLeaderArea( - Leader leader, int ipd) { - return LineArea.makeLeaderArea(leader, this, ipd); + Leader leader, int ipd, RetrieveMarker retrieveMarker) { + return LineArea.makeLeaderArea(leader, this, ipd, retrieveMarker); } public org.axsl.areaW.PageNumberArea makePageNumberArea( - PageNumber pageNumber, int ipd) { - return LineArea.makePageNumberArea(pageNumber, this, ipd); + PageNumber pageNumber, int ipd, RetrieveMarker retrieveMarker) { + return LineArea.makePageNumberArea(pageNumber, this, ipd, + retrieveMarker); } public org.axsl.areaW.PageNumberCitationArea makePageNumberCitationArea( - PageNumberCitation citation, int ipd) { - return LineArea.makePageNumberCitationArea(citation, this, ipd); + PageNumberCitation citation, int ipd, + RetrieveMarker retrieveMarker) { + return LineArea.makePageNumberCitationArea(citation, this, ipd, + retrieveMarker); } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -31,6 +31,7 @@ import org.axsl.foR.fo.Leader; import org.axsl.foR.fo.PageNumber; import org.axsl.foR.fo.PageNumberCitation; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.areaR.RenderVisitor; import org.axsl.common.Constants; @@ -63,8 +64,8 @@ org.axsl.areaW.LeaderArea { public LeaderArea(Leader generatedBy, Area parentArea, - int initialProgressionDimension) { - super(generatedBy, parentArea); + RetrieveMarker retrieveMarker, int initialProgressionDimension) { + super(generatedBy, parentArea, retrieveMarker); setProgressionDimension(initialProgressionDimension); } @@ -250,28 +251,31 @@ } public org.axsl.areaW.ForeignObjectArea makeForeignObjectArea( - InstreamForeignObject ifo, int ipd) { - return LineArea.makeForeignObjectArea(ifo, this, ipd); + InstreamForeignObject ifo, int ipd, RetrieveMarker retrieveMarker) { + return LineArea.makeForeignObjectArea(ifo, this, ipd, retrieveMarker); } public org.axsl.areaW.ExternalGraphicArea makeExternalGraphicArea( - ExternalGraphic ifo, int ipd) { - return LineArea.makeExternalGraphicArea(ifo, this, ipd); + ExternalGraphic ifo, int ipd, RetrieveMarker retrieveMarker) { + return LineArea.makeExternalGraphicArea(ifo, this, ipd, retrieveMarker); } public org.axsl.areaW.LeaderArea makeLeaderArea( - Leader leader, int ipd) { - return LineArea.makeLeaderArea(leader, this, ipd); + Leader leader, int ipd, RetrieveMarker retrieveMarker) { + return LineArea.makeLeaderArea(leader, this, ipd, retrieveMarker); } public org.axsl.areaW.PageNumberArea makePageNumberArea( - PageNumber pageNumber, int ipd) { - return LineArea.makePageNumberArea(pageNumber, this, ipd); + PageNumber pageNumber, int ipd, RetrieveMarker retrieveMarker) { + return LineArea.makePageNumberArea(pageNumber, this, ipd, + retrieveMarker); } public org.axsl.areaW.PageNumberCitationArea makePageNumberCitationArea( - PageNumberCitation citation, int ipd) { - return LineArea.makePageNumberCitationArea(citation, this, ipd); + PageNumberCitation citation, int ipd, + RetrieveMarker retrieveMarker) { + return LineArea.makePageNumberCitationArea(citation, this, ipd, + retrieveMarker); } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-12 23:26:56 UTC (rev 7546) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-13 00:12:23 UTC (rev 7547) @@ -49,8 +49,9 @@ // Whether the line has already had the leader sizes adjusted. private boolean optimized = false; - public LineArea(FObj generatedBy, NormalBlockArea parentArea) { - super(generatedBy, parentArea); + public LineArea(FObj generatedBy, NormalBlockArea parentArea, + RetrieveMarker retrieveMarker) { + super(generatedBy, parentArea, retrieveMarker); /* 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()); @@ -776,29 +777,35 @@ } public static org.axsl.areaW.ForeignObjectArea makeForeignObjectArea( - InstreamForeignObject ifo, Area parentArea, int ipd) { - return new ForeignObjectArea(ifo, parentArea, ipd); + InstreamForeignObject ifo, Area parentArea, int ipd, + RetrieveMarker retrieveMarker) { + return new ForeignObjectArea(ifo, parentArea, retrieveMarker, ipd); } public static org.axsl.areaW.ExternalGraphicArea makeExternalGraphicArea( - ExternalGraphic ifo, Area parentArea, int ipd) { - return new ExternalGraphicArea(ifo, parentArea, ipd); + ExternalGraphic ifo, Area parentArea, int ipd, + RetrieveMarker retrieveMarker) { + return new ExternalGraphicArea(ifo, parentArea, retrieveMarker, ipd); } public static org.axsl.areaW.LeaderArea makeLeaderArea( - Leader leader, Area parentArea, int ipd) { - return new LeaderArea(leader, parentArea, ipd); + Leader leader, Area parentArea, int ipd, + RetrieveMarker retrieveMarker) { + return new LeaderArea(leader, parentArea, retrieveMarker, ipd); } public static org.axsl.areaW.PageNumberArea makePageNumberArea( - PageNumber pageNumber, Area parentArea, int ipd) { - return new PageNumberArea(pageNumber, parentArea, ipd); + PageNumber pageNumber, Area parentArea, int ipd, + RetrieveMarker retrieveMarker) { + return new PageNumberArea(pageNumber, parentArea, retrieveMarker, ipd); } public static org.axsl.areaW.PageNumberCitationArea makePageNumberCitationArea( - PageNumberCitation citation, Area parentArea, int ipd) { - return new PageNumberCitationArea(citation, parentArea, ipd); + PageNumberCitation citation, Area parentArea, int ipd, + RetrieveMarker retrieveMarker) { + return new PageNumberCitationArea(citation, parentArea, retrieveMarker, + ipd); } public static org.axsl.areaW.TextArea makeTextArea(FOTextContent foText, @@ -832,28 +839,31 @@ } public org.axsl.areaW.ForeignObjectArea makeForeignObjectArea( - InstreamForeignObject ifo, int ipd) { - return LineArea.makeForeignObjectArea(ifo, this, ipd); + InstreamForeignObject ifo, int ipd, RetrieveMarker retrieveMarker) { + return LineArea.makeForeignObjectArea(ifo, this, ipd, retrieveMarker); } public org.axsl.areaW.ExternalGraphicArea makeExternalGraphicArea( - ExternalGraphic ifo, int ipd) { - return LineArea.makeExternalGraphicArea(ifo, this, ipd); + ExternalGraphic ifo, int ipd, RetrieveMarker retrieveMarker) { + return LineArea.makeExternalGraphicArea(ifo, this, ipd, retrieveMarker); } public org.axsl.areaW.LeaderArea makeLeaderArea( - ... [truncated message content] |
|
From: <vic...@us...> - 2006-06-13 04:21:44
|
Revision: 7553 Author: victormote Date: 2006-06-12 21:21:37 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7553&view=rev Log Message: ----------- 1. Push RetrieveMarker instance through the line-breaking system. 2. Conform to axsl changes regarding the same. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-13 03:19:56 UTC (rev 7552) +++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-13 04:21:37 UTC (rev 7553) @@ -86,10 +86,11 @@ */ public org.axsl.areaW.TextArea makeTextArea(FOText foText, int ipd, int startOffset, int sizeInChars, boolean hasDiscretionaryHyphen, - boolean hasFauxSmallCaps, boolean isLastItemOnLine) { + boolean hasFauxSmallCaps, boolean isLastItemOnLine, + RetrieveMarker retrieveMarker) { return LineArea.makeTextArea(foText, this, ipd, startOffset, sizeInChars, hasDiscretionaryHyphen, hasFauxSmallCaps, - isLastItemOnLine, this); + isLastItemOnLine, this, retrieveMarker); } public void render(RenderVisitor visitor) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-13 03:19:56 UTC (rev 7552) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-13 04:21:37 UTC (rev 7553) @@ -283,10 +283,11 @@ */ public org.axsl.areaW.TextArea makeTextArea(FOText foText, int ipd, int startOffset, int sizeInChars, boolean hasDiscretionaryHyphen, - boolean hasFauxSmallCaps, boolean isLastItemOnLine) { + boolean hasFauxSmallCaps, boolean isLastItemOnLine, + RetrieveMarker retrieveMarker) { return LineArea.makeTextArea(foText, this, ipd, startOffset, sizeInChars, hasDiscretionaryHyphen, hasFauxSmallCaps, - isLastItemOnLine, this); + isLastItemOnLine, this, retrieveMarker); } public void render(RenderVisitor visitor) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-13 03:19:56 UTC (rev 7552) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-13 04:21:37 UTC (rev 7553) @@ -812,7 +812,7 @@ Area parentArea, int ipd, int startOffset, int sizeInChars, boolean hasDiscretionaryHyphen, boolean hasFauxSmallCaps, boolean isLastItemOnLine, - FOContext context) { + FOContext context, RetrieveMarker retrieveMarker) { /* If the raw text is empty, don't create the TextArea. */ if (sizeInChars < 1) { @@ -833,7 +833,6 @@ } /* Go ahead and create*/ - RetrieveMarker retrieveMarker = parentArea.getRetrieveMarker(); return new TextArea(foText, parentArea, retrieveMarker, startOffset, sizeInChars, ipd, hasDiscretionaryHyphen, hasFauxSmallCaps); } @@ -871,10 +870,11 @@ */ public org.axsl.areaW.TextArea makeTextArea(FOText foText, int ipd, int startOffset, int sizeInChars, boolean hasDiscretionaryHyphen, - boolean hasFauxSmallCaps, boolean isLastItemOnLine) { + boolean hasFauxSmallCaps, boolean isLastItemOnLine, + RetrieveMarker retrieveMarker) { return LineArea.makeTextArea(foText, this, ipd, startOffset, sizeInChars, hasDiscretionaryHyphen, hasFauxSmallCaps, - isLastItemOnLine, this); + isLastItemOnLine, this, retrieveMarker); } public LineOutput asLineOutput() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-13 04:55:17
|
Revision: 7558 Author: victormote Date: 2006-06-12 21:55:11 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7558&view=rev Log Message: ----------- Fix more marker/retrieve-marker bugs. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-13 04:36:31 UTC (rev 7557) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-13 04:55:11 UTC (rev 7558) @@ -68,7 +68,8 @@ getAreaNodeParent().getChildren().add(this); // Root can't do this because the AreaTreeControl isn't registered. this.generatedBy = linkage(generatedBy, retrieveMarker); - FOLinkageNormal normalLinkage = this.getNormalLinkage(); + FOLinkageNormal normalLinkage = this.getNormalLinkage( + retrieveMarker); normalLinkage.registerGeneratedArea(this); } } @@ -134,6 +135,21 @@ return null; } + /* Use this overloaded version when we haven't yet gottent the + * RetrieveMarker instance stashed in the FOLinkageMarker, especially + * during AreaNode construction. */ + public FOLinkageNormal getNormalLinkage(RetrieveMarker retrieveMarker) { + if (this.generatedBy instanceof FOLinkageNormal) { + return (FOLinkageNormal) this.generatedBy; + } + if (this.generatedBy instanceof FOLinkageMarker) { + FOLinkageMarker linkageMarker = (FOLinkageMarker) this.generatedBy; + return linkageMarker.getNormalLinkage(retrieveMarker); + } + /* TODO: Consider throwing an Exception. This shouldn't happen. */ + return null; + } + protected org.axsl.areaW.AreaNode getPreviousChildOfGeneratedBy() { return this.getNormalLinkage().getPreviousGeneratedBy(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2006-06-13 04:36:31 UTC (rev 7557) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2006-06-13 04:55:11 UTC (rev 7558) @@ -101,7 +101,7 @@ FOLinkageNormal normalLinkage = (FOLinkageNormal) entrySet.getValue(); if (normalLinkage.contains(areaNode)) { - return (RetrieveMarker) entrySet.getValue(); + return (RetrieveMarker) entrySet.getKey(); } } return null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-16 00:38:18
|
Revision: 7642 Author: victormote Date: 2006-06-15 17:38:13 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7642&view=rev Log Message: ----------- Conform to axsl change: Remove unneeded parameter. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.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-06-16 00:37:58 UTC (rev 7641) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-06-16 00:38:13 UTC (rev 7642) @@ -1018,7 +1018,7 @@ } public int traitExtent() { - return traitGeneratedBy().traitExtent(this); + return traitGeneratedBy().traitExtent(); } public short traitWhiteSpaceTreatment() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-06-16 00:37:58 UTC (rev 7641) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-06-16 00:38:13 UTC (rev 7642) @@ -53,7 +53,7 @@ public int crBPD() { if (this.generatedBy.getFONode() instanceof RegionBefore || this.generatedBy.getFONode() instanceof RegionAfter) { - return traitGeneratedBy().traitExtent(this); + return traitGeneratedBy().traitExtent(); } return getParentArea().brBPD(); } @@ -61,7 +61,7 @@ public int crIPD() { if (this.generatedBy.getFONode() instanceof RegionStart || this.generatedBy.getFONode() instanceof RegionEnd) { - return traitGeneratedBy().traitExtent(this); + return traitGeneratedBy().traitExtent(); } return getParentArea().brIPD(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-16 01:00:44
|
Revision: 7645 Author: victormote Date: 2006-06-15 18:00:38 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7645&view=rev Log Message: ----------- Conform to axsl changes: Remove unneeded method parameters. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.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-06-16 01:00:22 UTC (rev 7644) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-06-16 01:00:38 UTC (rev 7645) @@ -886,11 +886,11 @@ } public int traitPageWidth() { - return traitGeneratedBy().traitPageWidth(this); + return traitGeneratedBy().traitPageWidth(); } public int traitPageHeight() { - return traitGeneratedBy().traitPageHeight(this); + return traitGeneratedBy().traitPageHeight(); } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-16 01:00:22 UTC (rev 7644) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-16 01:00:38 UTC (rev 7645) @@ -152,11 +152,11 @@ } public int getHeight() { - return traitGeneratedBy().traitPageHeight(this); + return traitGeneratedBy().traitPageHeight(); } public int getWidth() { - return traitGeneratedBy().traitPageWidth(this); + return traitGeneratedBy().traitPageWidth(); } public void registerMarker(Marker marker) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-16 22:49:47
|
Revision: 7654 Author: victormote Date: 2006-06-16 15:49:37 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7654&view=rev Log Message: ----------- Have each inline area notify its parent line area when it is added to the line. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -55,6 +55,7 @@ setProgressionDimension(width); // Adjust the bpd of the parent line-area. parentArea.setMinimumProgressionDimension(viewportBPD()); + this.ancestorLineArea().lineContentChanged(); } public Graphic getGraphic() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -58,6 +58,7 @@ if (foreign instanceof SVGElement) { new SVGArea((SVGElement) foreign, this, retrieveMarker); } + this.ancestorLineArea().lineContentChanged(); } public boolean traitIsReferenceArea() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -80,6 +80,7 @@ */ private void init(int initialProgressionDimension) { setProgressionDimension(initialProgressionDimension); + this.ancestorLineArea().lineContentChanged(); } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -981,4 +981,12 @@ visitor.render(this); } + /** + * Tell the LineArea that its content has changed, so that it can make any + * adjustments it thinks are necessary. + */ + public void lineContentChanged() { + this.verticalAlign(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -52,6 +52,7 @@ */ private void init(int width) { setProgressionDimension(width); + this.ancestorLineArea().lineContentChanged(); } public String resolve() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -50,6 +50,7 @@ */ private void init(int width) { setProgressionDimension(width); + this.ancestorLineArea().lineContentChanged(); } public String resolve() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -135,6 +135,7 @@ this.hasDiscretionaryHyphen = hasDiscretionaryHyphen; this.hasFauxSmallCaps = hasFauxSmallCaps; setProgressionDimension(progressionDimensionUsed); + this.ancestorLineArea().lineContentChanged(); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-16 23:18:02
|
Revision: 7657 Author: victormote Date: 2006-06-16 16:17:55 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7657&view=rev Log Message: ----------- Conform to axsl change: Remove unnecessary interface. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-06-16 22:57:51 UTC (rev 7656) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-06-16 23:17:55 UTC (rev 7657) @@ -33,7 +33,7 @@ * */ public abstract class AbstractNormalBlockArea extends BlockArea - implements org.axsl.areaR.AreaFlexible, + implements org.axsl.areaR.Area, org.axsl.areaW.AbstractNormalBlockArea { public AbstractNormalBlockArea(FObj parentFObj, Area parentArea, Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-16 22:57:51 UTC (rev 7656) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-16 23:17:55 UTC (rev 7657) @@ -34,8 +34,7 @@ * Subclasses are areas that need to store their own size and spacing * information. The opposite of AreaFlexible is {@link AreaFixed}. */ -public abstract class AreaFlexible extends Area - implements org.axsl.areaR.AreaFlexible { +public abstract class AreaFlexible extends Area { /** * See {@link #getProgressionDimension()} for a description of This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 00:35:45
|
Revision: 7660 Author: victormote Date: 2006-06-16 17:35:39 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7660&view=rev Log Message: ----------- Conform to axsl changes: 1. Remove TableBodyContainer, TableFooterContainer, and TableHeaderContainer interfaces. 2. Add BackgroundArea interface to replace these three. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-06-17 00:05:15 UTC (rev 7659) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-06-17 00:35:39 UTC (rev 7660) @@ -29,7 +29,7 @@ import org.axsl.foR.fo.RetrieveMarker; public class TableBodyContainer extends AbstractTableContainer - implements org.axsl.areaR.TableBodyContainer, + implements org.axsl.areaR.BackgroundArea, org.axsl.areaW.TableBodyContainer { public TableBodyContainer(FObj generatedBy, Area parentArea, Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-06-17 00:05:15 UTC (rev 7659) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-06-17 00:35:39 UTC (rev 7660) @@ -29,7 +29,7 @@ import org.axsl.foR.fo.RetrieveMarker; public class TableFooterContainer extends AbstractTableContainer - implements org.axsl.areaR.TableFooterContainer, + implements org.axsl.areaR.BackgroundArea, org.axsl.areaW.TableFooterContainer { public TableFooterContainer(FObj generatedBy, Area parentArea, Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-06-17 00:05:15 UTC (rev 7659) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-06-17 00:35:39 UTC (rev 7660) @@ -29,7 +29,7 @@ import org.axsl.foR.fo.RetrieveMarker; public class TableHeaderContainer extends AbstractTableContainer - implements org.axsl.areaR.TableHeaderContainer, + implements org.axsl.areaR.BackgroundArea, org.axsl.areaW.TableHeaderContainer { public TableHeaderContainer(FObj generatedBy, Area parentArea, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 20:59:59
|
Revision: 7683 Author: victormote Date: 2006-06-17 13:59:22 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7683&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.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-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.GeneralInlineArea; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2006 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 Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2006 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 Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaW.TableRowContainer; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaW.AreaWException; @@ -51,7 +51,7 @@ org.axsl.areaW.Area { /** - * + * * @param generatedBy * @param parentArea */ @@ -611,7 +611,7 @@ } return y; } - + /** * @return The inline-progression-dimension of the * normal-allocation-rectangle for this Area. @@ -825,7 +825,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitBPDimensionMin() { @@ -833,7 +833,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitBPDimensionOpt() { @@ -841,7 +841,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitBPDimensionMax() { @@ -858,7 +858,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitIPDimensionMin() { @@ -866,7 +866,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitIPDimensionOpt() { @@ -874,7 +874,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitIPDimensionMax() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -67,7 +67,7 @@ * factor in determining what absolute position the Area occupies. * This should not be used for items like start-indent, which are actually * inside the Area itself.</p> - * + * * <p>Systems that <em>compute</em> anteriorSpace need to consider * space-after and space-end constraints from previous Areas in that * computation, but only the resolved value needs to be stored in the Area @@ -77,11 +77,11 @@ * Area needs to know how much space to place before itself, but the last * Area does not need to know how much space to place after itself, i.e. * space after the last Area is a no op.</p> - * + * * <p>The value is stored in the AreaFlexible, and the AreaFlexible will * initialize it with some reasonable amount, but the Layout system is * responsible to compute and set its final value.</p> - * + * * @return Returns the anteriorSpace. */ public int getAnteriorSpace() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.foray.common.OrderedTreeNode; @@ -367,7 +367,7 @@ } /** - * @return The ancestor SpanRA, or null if there is none. + * @return The ancestor SpanRA, or null if there is none. */ public SpanRA ancestorSpanRA() { AreaNode parent = getAreaNodeParent(); @@ -378,7 +378,7 @@ } /** - * @return The ancestor LineArea, or null if there is none. + * @return The ancestor LineArea, or null if there is none. */ public LineArea ancestorLineArea() { AreaNode parent = getAreaNodeParent(); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.foR.FObj; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.BlockContainerArea; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -28,7 +28,7 @@ import org.axsl.foR.fo.BookmarkTitle; /** - * The AreaTree representation of an fo:bookmark-title object. + * The AreaTree representation of an fo:bookmark-title object. */ public class BookmarkTitleArea extends NonArea implements org.axsl.areaR.BookmarkTitleArea { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaW.AreaWException; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://... [truncated message content] |
|
From: <vic...@us...> - 2006-06-19 19:07:36
|
Revision: 7709 Author: victormote Date: 2006-06-19 12:07:26 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7709&view=rev Log Message: ----------- Conform to axsl change: Add and use interface for all AreaNodes that have a graphic attached. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-06-19 18:01:56 UTC (rev 7708) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-06-19 19:07:26 UTC (rev 7709) @@ -24,13 +24,16 @@ package org.foray.area; +import org.axsl.areaR.BackgroundArea; import org.axsl.areaW.TableRowContainer; import org.axsl.foR.FObj; import org.axsl.foR.fo.RetrieveMarker; import org.axsl.foR.fo.TableRow; +import org.axsl.graphicR.Graphic; public abstract class AbstractTableContainer extends GenericContainer - implements org.axsl.areaW.AbstractTableContainer { + implements BackgroundArea, + org.axsl.areaW.AbstractTableContainer { public AbstractTableContainer(FObj generatedBy, Area parentArea, RetrieveMarker retrieveMarker) { @@ -42,4 +45,8 @@ return new org.foray.area.TableRowContainer(node, this, retrieveMarker); } + public Graphic getGraphic() { + return this.traitBackgroundImage(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-19 18:01:56 UTC (rev 7708) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-19 19:07:26 UTC (rev 7709) @@ -29,6 +29,7 @@ import org.axsl.common.Constants; import org.axsl.foR.FObj; import org.axsl.foR.fo.RetrieveMarker; +import org.axsl.graphicR.Graphic; /** * The container area for the contents of a block-container FO. @@ -82,4 +83,8 @@ visitor.render(this); } + public Graphic getGraphic() { + return this.traitBackgroundImage(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-19 18:01:56 UTC (rev 7708) +++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-19 19:07:26 UTC (rev 7709) @@ -33,6 +33,7 @@ import org.axsl.foR.fo.PageNumber; import org.axsl.foR.fo.PageNumberCitation; import org.axsl.foR.fo.RetrieveMarker; +import org.axsl.graphicR.Graphic; /** * Areas generated by the fo:inline object. @@ -97,4 +98,8 @@ visitor.render(this); } + public Graphic getGraphic() { + return this.traitBackgroundImage(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-19 18:01:56 UTC (rev 7708) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-19 19:07:26 UTC (rev 7709) @@ -32,6 +32,7 @@ import org.axsl.foR.fo.ListItemLabel; import org.axsl.foR.fo.RegionBody; import org.axsl.foR.fo.RetrieveMarker; +import org.axsl.graphicR.Graphic; /** * This class represents a Block Area. @@ -182,4 +183,8 @@ visitor.render(this); } + public Graphic getGraphic() { + return this.traitBackgroundImage(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-06-19 18:01:56 UTC (rev 7708) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-06-19 19:07:26 UTC (rev 7709) @@ -31,6 +31,7 @@ import org.axsl.foR.fo.RegionBefore; import org.axsl.foR.fo.RegionEnd; import org.axsl.foR.fo.RegionStart; +import org.axsl.graphicR.Graphic; /** * This class is used to manage a region-reference-area. @@ -120,4 +121,8 @@ visitor.render(this); } + public Graphic getGraphic() { + return this.traitBackgroundImage(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-06-19 18:01:56 UTC (rev 7708) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-06-19 19:07:26 UTC (rev 7709) @@ -31,6 +31,7 @@ import org.axsl.common.Constants; import org.axsl.foR.fo.RegionBody; import org.axsl.foR.fo.SimplePageMaster; +import org.axsl.graphicR.Graphic; public class RegionRABody extends AreaFixed implements RegionBodyArea, org.axsl.areaW.RegionRABody { @@ -226,4 +227,8 @@ visitor.render(this); } + public Graphic getGraphic() { + return this.traitBackgroundImage(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-06-19 18:01:56 UTC (rev 7708) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-06-19 19:07:26 UTC (rev 7709) @@ -28,6 +28,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.fo.RetrieveMarker; import org.axsl.foR.svg.SVGElement; +import org.axsl.graphicR.Graphic; import org.w3c.dom.svg.SVGDocument; @@ -68,4 +69,8 @@ visitor.render(this); } + public Graphic getGraphic() { + return this.traitBackgroundImage(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-19 18:01:56 UTC (rev 7708) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-19 19:07:26 UTC (rev 7709) @@ -29,6 +29,7 @@ import org.axsl.common.Constants; import org.axsl.foR.fo.RetrieveMarker; import org.axsl.foR.fo.TableCell; +import org.axsl.graphicR.Graphic; public class TableCellRA extends ContainerRA implements TableCellArea, org.axsl.areaW.TableCellArea { @@ -165,4 +166,8 @@ visitor.render(this); } + public Graphic getGraphic() { + return this.traitBackgroundImage(); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-20 02:02:55
|
Revision: 7731 Author: victormote Date: 2006-06-19 19:02:39 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7731&view=rev Log Message: ----------- Split content-rectangle methods up so that they are easier to override. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.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-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -101,4 +101,18 @@ return traitGeneratedBy().traitBaselineShift(this); } + /** + * {@inheritDoc} + */ + public int crIPD() { + return this.progressionDimension; + } + + /** + * {@inheritDoc} + */ + public int crBPD() { + return crBPDInline(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -202,33 +202,27 @@ } /** - * {@inheritDoc} + * @return The IPD for a block area. */ - public int crIPD() { - if (isBlockArea()) { - int actual = 0; - int computed = this.traitIPDimensionOpt(); - if (computed < 0) { - actual = getParentArea().crIPD() - - traitBorderStartWidth() - - traitBorderEndWidth() - - traitPaddingStart() - - traitPaddingEnd(); - } else { - actual = computed; - } - return actual; + protected int crIPDBlockArea() { + int actual = 0; + int computed = this.traitIPDimensionOpt(); + if (computed < 0) { + actual = getParentArea().crIPD() + - traitBorderStartWidth() + - traitBorderEndWidth() + - traitPaddingStart() + - traitPaddingEnd(); + } else { + actual = computed; } - return this.progressionDimension; + return actual; } /** - * {@inheritDoc} + * @return The BPD for an inline area. */ - public int crBPD() { - if (isBlockArea()) { - return this.progressionDimension; - } + protected int crBPDInline() { int actual = 0; int computed = this.traitBPDimensionOpt(); if (computed < 0) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -87,4 +87,18 @@ return this.traitBackgroundImage(); } + /** + * {@inheritDoc} + */ + public int crIPD() { + return crIPDBlockArea(); + } + + /** + * {@inheritDoc} + */ + public int crBPD() { + 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-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -989,4 +989,11 @@ this.verticalAlign(); } + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -58,4 +58,11 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -48,4 +48,11 @@ return null; } + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -187,4 +187,11 @@ return this.traitBackgroundImage(); } + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -36,7 +36,8 @@ * An SVGArea represents the <em>reference </em> area that contains the * content that is in a {@link ForeignObjectArea} <em>viewport </em> area. */ -public class SVGArea extends AreaFlexible implements org.axsl.areaR.SVGArea { +public class SVGArea extends AbstractInlineArea + implements org.axsl.areaR.SVGArea { /** * Construct an SVG area. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -285,4 +285,18 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int crIPD() { + return crIPDBlockArea(); + } + + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -64,4 +64,18 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int crIPD() { + return crIPDBlockArea(); + } + + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -170,4 +170,18 @@ return this.traitBackgroundImage(); } + /** + * {@inheritDoc} + */ + public int crIPD() { + return crIPDBlockArea(); + } + + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -64,4 +64,18 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int crIPD() { + return crIPDBlockArea(); + } + + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -64,4 +64,18 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int crIPD() { + return crIPDBlockArea(); + } + + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -305,4 +305,11 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-06-20 00:37:56 UTC (rev 7730) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-06-20 02:02:39 UTC (rev 7731) @@ -77,4 +77,18 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int crIPD() { + return crIPDBlockArea(); + } + + /** + * {@inheritDoc} + */ + public int crBPD() { + return this.progressionDimension; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-20 04:42:08
|
Revision: 7733 Author: victormote Date: 2006-06-19 21:41:42 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7733&view=rev Log Message: ----------- Split progression-dimension methods up so that they are easier to override. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -131,13 +131,6 @@ } /** - * {@inheritDoc} - */ - public int getProgressionDimension() { - return this.progressionDimension; - } - - /** * See {@link #getProgressionDimension()} for a description of * "progression dimension". * @param progressionDimension The progressionDimension to set. Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -63,4 +63,11 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -101,4 +101,11 @@ return this.progressionDimension; } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -90,4 +90,11 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -94,4 +94,11 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -102,4 +102,11 @@ return this.traitBackgroundImage(); } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -308,4 +308,11 @@ visitor.render(this); } + /** + * {@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-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -996,4 +996,11 @@ return this.progressionDimension; } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -65,4 +65,11 @@ return this.progressionDimension; } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -55,4 +55,11 @@ return this.progressionDimension; } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -127,7 +127,7 @@ if (getAreaNodeParent().traitGeneratedBy() instanceof ListItem) { return listItemPD(); } - return super.getProgressionDimension(); + return this.progressionDimension; } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -117,4 +117,11 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -72,4 +72,11 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -86,4 +86,11 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -74,4 +74,11 @@ return this.traitBackgroundImage(); } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -299,4 +299,11 @@ return this.progressionDimension; } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -78,4 +78,11 @@ return this.progressionDimension; } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -78,4 +78,11 @@ return this.progressionDimension; } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -78,4 +78,11 @@ return this.progressionDimension; } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -312,4 +312,11 @@ return this.progressionDimension; } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -91,4 +91,11 @@ return this.progressionDimension; } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-06-20 02:57:29 UTC (rev 7732) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-06-20 04:41:42 UTC (rev 7733) @@ -568,4 +568,11 @@ visitor.render(this); } + /** + * {@inheritDoc} + */ + public int getProgressionDimension() { + return this.progressionDimension; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-07-22 19:17:15
|
Revision: 7807 Author: victormote Date: 2006-07-22 12:16:29 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7807&view=rev Log Message: ----------- Implement standard use of "final" modifier on local variables and parameters. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.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-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -44,8 +44,8 @@ * @param parentArea * @param retrieveMarker */ - public AbstractInlineArea(FONode generatedBy, LineArea parentArea, - RetrieveMarker retrieveMarker) { + public AbstractInlineArea(final FONode generatedBy, + final LineArea parentArea, final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -55,8 +55,9 @@ * @param parentArea * @param retrieveMarker */ - public AbstractInlineArea(FONode generatedBy, AbstractInlineArea parentArea, - RetrieveMarker retrieveMarker) { + public AbstractInlineArea(final FONode generatedBy, + final AbstractInlineArea parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -75,7 +76,8 @@ return Constants.AXIS_IP; } - public Area getOverflowArea(Area childRequesting) throws AreaWException { + public Area getOverflowArea(final Area childRequesting) + throws AreaWException { return getParentArea().getOverflowArea(this); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -36,8 +36,8 @@ implements org.axsl.areaR.Area, org.axsl.areaW.AbstractNormalBlockArea { - public AbstractNormalBlockArea(FObj parentFObj, Area parentArea, - RetrieveMarker retrieveMarker) { + public AbstractNormalBlockArea(final FObj parentFObj, final Area parentArea, + final RetrieveMarker retrieveMarker) { super(parentFObj, parentArea, retrieveMarker); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -34,8 +34,8 @@ */ public abstract class AbstractPlaceholder extends Area { - public AbstractPlaceholder(FObj generatedBy, Area parentArea, - RetrieveMarker retrieveMarker) { + public AbstractPlaceholder(final FObj generatedBy, final Area parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -77,7 +77,8 @@ /** * {@inheritDoc} */ - public Area getOverflowArea(Area childRequesting) throws AreaWException { + public Area getOverflowArea(final Area childRequesting) + throws AreaWException { return this.getParentArea().getOverflowArea(childRequesting); } @@ -98,21 +99,21 @@ /** * {@inheritDoc} */ - public void setProgressionDimension(int progressionDimension) { + public void setProgressionDimension(final int progressionDimension) { return; } /** * {@inheritDoc} */ - public void setMinimumProgressionDimension(int minimumPD) { + public void setMinimumProgressionDimension(final int minimumPD) { return; } /** * {@inheritDoc} */ - public void incrementProgressionDimension(int incrementAmount) { + public void incrementProgressionDimension(final int incrementAmount) { return; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -35,13 +35,13 @@ implements BackgroundArea, org.axsl.areaW.AbstractTableContainer { - public AbstractTableContainer(FObj generatedBy, Area parentArea, - RetrieveMarker retrieveMarker) { + public AbstractTableContainer(final FObj generatedBy, final Area parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } - public TableRowContainer makeTableRowContainer(TableRow node, - RetrieveMarker retrieveMarker) { + public TableRowContainer makeTableRowContainer(final TableRow node, + final RetrieveMarker retrieveMarker) { return new org.foray.area.TableRowContainer(node, this, retrieveMarker); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -55,8 +55,8 @@ * @param generatedBy * @param parentArea */ - public Area(FONode generatedBy, AreaNode parentArea, - RetrieveMarker retrieveMarker) { + public Area(final FONode generatedBy, final AreaNode parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -155,12 +155,12 @@ } public int traitEndIndent() { - int percentBase = this.getContainingReferenceArea().crIPD(); + final int percentBase = this.getContainingReferenceArea().crIPD(); return traitGeneratedBy().traitEndIndent(this, percentBase); } public int traitStartIndent() { - int percentBase = this.getContainingReferenceArea().crIPD(); + final int percentBase = this.getContainingReferenceArea().crIPD(); return traitGeneratedBy().traitStartIndent(this, percentBase); } @@ -175,7 +175,7 @@ return traitGeneratedBy().getPrimaryFont(this); } - public FontUse getSecondaryFont(int codePoint) { + public FontUse getSecondaryFont(final int codePoint) { return traitGeneratedBy().getSecondaryFont(this, codePoint); } @@ -223,7 +223,7 @@ if (getParent() == null) { return true; } - List siblings = getAreaNodeParent().getChildren(); + final List siblings = getAreaNodeParent().getChildren(); if (siblings == null) { return true; } @@ -237,7 +237,7 @@ if (getParent() == null) { return true; } - List siblings = getAreaNodeParent().getChildren(); + final List siblings = getAreaNodeParent().getChildren(); if (siblings == null) { return true; } @@ -256,17 +256,17 @@ return false; } - public int getWordWidth(String word) { - FontUse fontUse = getPrimaryFont(); - Font font = fontUse.getFont(); + public int getWordWidth(final String word) { + final FontUse fontUse = getPrimaryFont(); + final Font font = fontUse.getFont(); fontUse.registerCharsUsed(word); return font.width(word, traitFontSize(), traitLetterSpacingOpt(), traitWordSpacingOpt()); } - public int getCharWidth(char c) { - FontUse fontUse = getPrimaryFont(); - Font font = getPrimaryFont().getFont(); + public int getCharWidth(final char c) { + final FontUse fontUse = getPrimaryFont(); + final Font font = getPrimaryFont().getFont(); fontUse.registerCharUsed(c); return font.width(c, traitFontSize()) + traitLetterSpacingOpt(); } @@ -369,7 +369,7 @@ // Start at the padding-rectangle origin. int x = prOriginX(); if (this.getBPAxis() == Constants.AXIS_VERTICAL) { - boolean goingRight = (this.traitIPDirection() + final boolean goingRight = (this.traitIPDirection() == Constants.DIRECTION_LEFT_TO_RIGHT); if (goingRight) { x -= this.traitBorderStartWidth(); @@ -378,7 +378,7 @@ } } else { // Our BP Axis is horizontal - boolean goingRight = (this.traitBPDirection() + final boolean goingRight = (this.traitBPDirection() == Constants.DIRECTION_LEFT_TO_RIGHT); if (goingRight) { x -= this.traitBorderBeforeWidth(); @@ -398,7 +398,7 @@ // Start at the padding-rectangle origin. int y = prOriginY(); if (this.getBPAxis() == Constants.AXIS_VERTICAL) { - boolean goingDown = (this.traitBPDirection() + final boolean goingDown = (this.traitBPDirection() == Constants.DIRECTION_TOP_TO_BOTTOM); if (goingDown) { y += this.traitBorderBeforeWidth(); @@ -407,7 +407,7 @@ } } else { // Our BP Axis is horizontal - boolean goingUp = (this.traitIPDirection() + final boolean goingUp = (this.traitIPDirection() == Constants.DIRECTION_BOTTOM_TO_TOP); if (goingUp) { y -= this.traitBorderStartWidth(); @@ -467,7 +467,7 @@ // Start at the content-rectangle origin. int x = crOriginX(); if (this.getBPAxis() == Constants.AXIS_VERTICAL) { - boolean goingRight = (this.traitIPDirection() + final boolean goingRight = (this.traitIPDirection() == Constants.DIRECTION_LEFT_TO_RIGHT); if (goingRight) { x -= this.traitPaddingStart(); @@ -476,7 +476,7 @@ } } else { // Our BP Axis is horizontal - boolean goingRight = (this.traitBPDirection() + final boolean goingRight = (this.traitBPDirection() == Constants.DIRECTION_LEFT_TO_RIGHT); if (goingRight) { x -= this.traitPaddingBefore(); @@ -496,7 +496,7 @@ // Start at the content-rectangle origin. int y = crOriginY(); if (this.getBPAxis() == Constants.AXIS_VERTICAL) { - boolean goingDown = (this.traitBPDirection() + final boolean goingDown = (this.traitBPDirection() == Constants.DIRECTION_TOP_TO_BOTTOM); if (goingDown) { y += this.traitPaddingBefore(); @@ -505,7 +505,7 @@ } } else { // Our BP Axis is horizontal - boolean goingRight = (this.traitBPDirection() + final boolean goingRight = (this.traitBPDirection() == Constants.DIRECTION_LEFT_TO_RIGHT); if (goingRight) { y -= this.traitPaddingBefore(); @@ -797,13 +797,13 @@ } public int traitSpaceStartOptimum() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitSpaceStartOptimum(this, ancestor.crIPD()); } public int traitSpaceEndOptimum() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitSpaceEndOptimum(this, ancestor.crIPD()); } @@ -817,7 +817,7 @@ private int nearestBaseBPD() { int nearestBPD = -1; - Area nearest = this.ancestorGeneratedByBlockLevelFO(); + final Area nearest = this.ancestorGeneratedByBlockLevelFO(); if (nearest != null) { nearestBPD = nearest.crBPD(); } @@ -850,7 +850,7 @@ private int nearestBaseIPD() { int nearestIPD = -1; - Area nearest = this.ancestorGeneratedByBlockLevelFO(); + final Area nearest = this.ancestorGeneratedByBlockLevelFO(); if (nearest != null) { nearestIPD = nearest.crIPD(); } @@ -934,7 +934,7 @@ * the writing-mode. */ public byte contentStackingDirectionAbsolute() { - byte relative = contentStackingAxisRelative(); + final byte relative = contentStackingAxisRelative(); return getWritingMode().getAbsoluteDirFromRelativeAxis(relative); } @@ -1000,7 +1000,7 @@ } public short referenceOrientationCumulative() { - Area containingRA = this.getContainingReferenceArea(); + final Area containingRA = this.getContainingReferenceArea(); short cumulative = containingRA.traitReferenceOrientation(); /* * The FObj method from which the following line is derived returns @@ -1072,7 +1072,7 @@ * if there is none. */ public String destinationName() { - String id = traitId(); + final String id = traitId(); if (id == null || id.equals("")) { return null; } @@ -1096,7 +1096,7 @@ * of a link, returns {@link Constants#BASIC_LINK_INVALID}. */ public byte linkType() { - BasicLink link = this.traitGeneratedBy().getBasicLink(this); + final BasicLink link = this.traitGeneratedBy().getBasicLink(this); if (link == null) { return Constants.BASIC_LINK_INVALID; } @@ -1110,7 +1110,7 @@ * external-destination. */ public String linkDestination() { - BasicLink link = this.traitGeneratedBy().getBasicLink(this); + final BasicLink link = this.traitGeneratedBy().getBasicLink(this); if (link == null) { return null; } @@ -1118,7 +1118,7 @@ } public int getHyphenWidth() { - char hyphenChar = traitHyphenationCharacter(); + final char hyphenChar = traitHyphenationCharacter(); return getCharWidth(hyphenChar); } @@ -1160,46 +1160,47 @@ return true; } - public TableArea makeTableArea(Table table, - RetrieveMarker retrieveMarker) { + public TableArea makeTableArea(final Table table, + final RetrieveMarker retrieveMarker) { return new org.foray.area.TableRA(table, this, retrieveMarker); } - public NormalBlockArea makeNormalBlockArea(Block block, - RetrieveMarker retrieveMarker) { + public NormalBlockArea makeNormalBlockArea(final Block block, + final RetrieveMarker retrieveMarker) { return new org.foray.area.NormalBlockArea(block, this, retrieveMarker); } public BlockContainerRA makeBlockContainerArea( - BlockContainer blockContainer, RetrieveMarker retrieveMarker) { + final BlockContainer blockContainer, + final RetrieveMarker retrieveMarker) { return new org.foray.area.BlockContainerRA(blockContainer, this, retrieveMarker); } - public ListBlockArea makeListBlockArea(ListBlock listBlock, - RetrieveMarker retrieveMarker) { + public ListBlockArea makeListBlockArea(final ListBlock listBlock, + final RetrieveMarker retrieveMarker) { return new org.foray.area.ListBlockArea(listBlock, this, retrieveMarker); } public int traitTop() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitTop(this, ancestor.crBPD()); } public int traitBottom() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitBottom(this, ancestor.crBPD()); } public int traitLeft() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitLeft(this, ancestor.crIPD()); } public int traitRight() { - Area ancestor = this.ancestorBlockAreaNotALineArea(); + final Area ancestor = this.ancestorBlockAreaNotALineArea(); return traitGeneratedBy().traitRight(this, ancestor.crIPD()); } @@ -1234,7 +1235,7 @@ if (! this.isInNormalFlow()) { return false; } - Area parent = getParentArea(); + final Area parent = getParentArea(); if (parent instanceof LineArea) { /* LineArea children grow in the IPD, LineArea grows in the BPD. */ return false; @@ -1248,7 +1249,7 @@ } public org.axsl.areaW.MarkerContentArea makeMarkerContentArea( - RetrieveMarker retrieve, Marker marker) { + final RetrieveMarker retrieve, final Marker marker) { return new MarkerContentArea(retrieve, this, marker); } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -38,8 +38,8 @@ */ public abstract class AreaFixed extends Area { - public AreaFixed(FObj generatedBy, AreaNode parentArea, - RetrieveMarker retrieveMarker) { + public AreaFixed(final FObj generatedBy, final AreaNode parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); } @@ -48,10 +48,10 @@ */ public int progressionDimensionAvailable() { int dimension = brBPD(); - List children = getChildren(); + final List children = getChildren(); for (int i = 0; i < children.size(); i++) { if (children.get(i) instanceof AreaFlexible) { - AreaFlexible child = (AreaFlexible) children.get(i); + final AreaFlexible child = (AreaFlexible) children.get(i); dimension -= child.usedProgressionDimensionNormalFlow(); } } @@ -66,17 +66,17 @@ return 0; } - public void setProgressionDimension(int progressionDimension) { + public void setProgressionDimension(final int progressionDimension) { // No-op. Exists here to minimize casts. return; } - public void setMinimumProgressionDimension(int minPD) { + public void setMinimumProgressionDimension(final int minPD) { // No-op. Exists here to minimize casts. return; } - public void incrementProgressionDimension(int incrementAmount) { + public void incrementProgressionDimension(final int incrementAmount) { // No-op. Exists here to minimize casts. return; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-07-22 18:11:33 UTC (rev 7806) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-07-22 19:16:29 UTC (rev 7807) @@ -51,8 +51,8 @@ */ private int anteriorSpace; - public AreaFlexible(FONode generatedBy, AreaNode parentArea, - RetrieveMarker retrieveMarker) { + public AreaFlexible(final FONode generatedBy, final AreaNode parentArea, + final RetrieveMarker retrieveMarker) { super(generatedBy, parentArea, retrieveMarker); initializeProgressionDimension(); initializeAnteriorSpace(); @@ -93,14 +93,14 @@ * See {@link #getAnteriorSpace()} for a description of "anterior space". * @param anteriorSpace The anteriorSpace to set. */ - public void setAnteriorSpace(int anteriorSpace) { - Area parent = getParentArea(); + public void setAnteriorSpace(final int anteriorSpace) { + final Area parent = getParentArea(); if (parent instanceof AreaFlexible) { /* * A change to anteriorSpace does not affect the anteriorSpace * of the parent, but it does affects its progressionDimension. */ - AreaFlexible afParent = (AreaFlexible) parent; + final AreaFlexible afParent = (AreaFlexible) parent; int value = afParent.getProgressionDimension(); // Subtract the old value value -= this.getAnteriorSpace(); @@ -117,14 +117,14 @@ * See {@link #getAnteriorSpace()} for a description of "anterior space". * @param incrementAmount The amount to adjust the anteriorSpace. */ - public void incrementAnteriorSpace(int incrementAmount) { - Area parent = getParentArea(); + public void incrementAnteriorSpace(final int incrementAmount) { + final Area parent = getParentArea(); if (parent instanceof AreaFlexible) { /* * A change to anteriorSpace does not affect the anteriorSpace * of the parent, but it does affects its progressionDimension. */ - AreaFlexible afParent = (AreaFlexible) parent; + final AreaFlexible afParent = (AreaFlexible) parent; afParent.incrementProgressionDimension(incrementAmount); } this.anteriorSpace += incrementAmount; @@ -135,9 +135,9 @@ * "progression dimension". * @param progressionDimension The progressionDimension to set. */ - public void setProgressionDimension(int progressionDimension) { + public void setProgressionDimension(final int progressionDimension) { if (shouldAdjustParentPD()) { - Area parent = getParentArea(); + final Area parent = getParentArea(); /* The new value. */ int incrementAmount = progressionDimension; /* Subtract the old value. */ @@ -153,9 +153,9 @@ * "progression dimension". * @param incrementAmount The amount to adjust the progressionDimension. */ - public void incrementProgressionDimension(int incrementAmount) { + public void incrementProgressionDimension(final int incrementAmount) { if (shouldAdjustParentPD()) { - Area parent = getParentArea(); + final Area parent = getParentArea(); parent.incrementProgressionDimension(incrementAmount); } this.progressionDimension += incrementAmount; @@ -166,7 +166,7 @@ * progression dimension. * @param minPD */ - public void setMinimumProgressionDimension(int minPD) { + public void setMinimumProgressionDimension(final int minPD) { if (minPD <= this.progressionDimension) { return; } @@ -199,7 +199,7 @@ */ protected int crIPDBlockArea() { int actual = 0; - int computed = this.traitIPDimensionOpt(); + final int computed = this.traitIPDimensionOpt(); if (computed < 0) { actual = getParentArea().crIPD() - traitBorderStartWidth() @@ -217,7 +217,7 @@ */ protected int crBPDInline() { int actual = 0; - int computed = this.traitBPDimensionOpt(); + final int computed = this.traitBPDimensionOpt(); if (computed < 0) { actual = getParentArea().crBPD() - traitBorderBeforeWidth() @@ -234,7 +234,7 @@ * Computes the initial value of anteriorSpace for this Area. */ public void initializeAnteriorSpace() { - Area previous = getPreviousSiblingArea(); + final Area previous = getPreviousSiblingArea(); if (previous != null) { if (isBlockArea()) { this.setAnteriorSpace(previous.traitSpaceAfterOptimum()); @@ -257,15 +257,15 @@ /** * @param previous The previous sibling Area to this. */ - private void checkHalfLeading(Area previous) { + private void checkHalfLeading(final Area previous) { // This test different than isBlockArea() if (! (previous instanceof NormalBlockArea)) { return; } - NormalBlockArea ba = (NormalBlockArea) previous; - AreaNode lastChild = ba.getLastAreaNodeChild(); + final NormalBlockArea ba = (NormalBlockArea) previous; + final AreaNode lastChild = ba.getLastAreaNodeChild(); if (lastChild instanceof LineArea) { - LineArea lastLineArea = (LineArea) lastChild; + final LineArea lastLineArea = (LineArea) lastChild; this.incrementAnteriorSpace(lastLineArea.traitHalfLeadingOpt()); } } @@ -293,9 +293,9 @@ return getParentArea().progressionDimensionAvailable(); } - public void removeChild(AreaNode areaNode) { + public void removeChild(final AreaNode areaNode) { if (areaNode instanceof AreaFlexible) { - AreaFlexible af = (AreaFlexible) areaNode; + final AreaFlexible af = (AreaFlexible) areaNode; this.incrementProgressionDimension(- af.getProgressionDimension()); } super.removeChild(areaNode); @@ -303,11 +303,11 @@ public int pdUsedBySiblings() { int pdUsedBySiblings = 0; - int siblingIndex = siblingIndex(); - List siblings = getSiblings(); + final int siblingIndex = siblingIndex(); + final List siblings = getSiblings(); for (int i = 0; i < siblingIndex; i++) { if (siblings.get(i) instanceof AreaFlexible) { - AreaFlexible af = (AreaFlexible) siblings.get(i); + final AreaFlexible af = (AreaFlexible) siblings.get(i); if (af.isInNormalFlow()) { /* If the Area is not part of the normal flow, then its * progression d... [truncated message content] |
|
From: <vic...@us...> - 2006-08-28 00:46:37
|
Revision: 7841 Author: victormote Date: 2006-08-27 17:46:20 -0700 (Sun, 27 Aug 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7841&view=rev Log Message: ----------- Conform to axsl changes. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.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-08-27 23:55:08 UTC (rev 7840) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-08-28 00:46:20 UTC (rev 7841) @@ -117,4 +117,8 @@ return crBPDInline(); } + public org.axsl.areaR.LineArea getLineArea() { + return (org.axsl.areaR.LineArea) this.getParentOut(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-08-27 23:55:08 UTC (rev 7840) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-08-28 00:46:20 UTC (rev 7841) @@ -102,7 +102,7 @@ * ...Opt, and ...Max methods which return the constraints to be placed on * the computation returned by this method. */ - public int actualLetterSpacing() { + public int letterSpacing() { return traitLetterSpacingOpt(); } Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) +++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2006-08-28 00:46:20 UTC (rev 7841) @@ -402,7 +402,7 @@ */ public void render(final ForeignObjectArea area) { // if necessary need to scale and align the content - switch (area.traitTextAlign()) { + switch (area.getLineArea().traitTextAlign()) { case Constants.FOVAL_START: break; case Constants.FOVAL_END: 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-08-27 23:55:08 UTC (rev 7840) +++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2006-08-28 00:46:20 UTC (rev 7841) @@ -302,7 +302,7 @@ / 1000; getContentStream().setWordSpacing(wordSpacing); } - final float letterspacing = area.actualLetterSpacing() / 1000f; + final float letterspacing = area.letterSpacing() / 1000f; getContentStream().setCharacterSpacing(letterspacing); /* Position the cursor. */ Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-08-28 00:46:20 UTC (rev 7841) @@ -816,8 +816,8 @@ } String psString = null; - if (area.actualLetterSpacing() > 0) { - final float f = area.actualLetterSpacing(); + if (area.letterSpacing() > 0) { + final float f = area.letterSpacing(); psString = (new StringBuffer().append(f).append(" 0.0 (") .append(sb.toString()).append(") A")).toString(); } else { Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) +++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-08-28 00:46:20 UTC (rev 7841) @@ -402,7 +402,7 @@ */ public void render(final ForeignObjectArea area) { // if necessary need to scale and align the content - switch (area.traitTextAlign()) { + switch (area.getLineArea().traitTextAlign()) { case Constants.FOVAL_START: break; case Constants.FOVAL_END: Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-08-28 00:46:20 UTC (rev 7841) @@ -347,8 +347,6 @@ final StringBuffer buffer = new StringBuffer(); outputGeneratedBy(area, buffer); outputDimension(area, buffer); - outputAttribute(buffer, "start-indent", area.traitStartIndent()); - outputAttribute(buffer, "end-indent", area.traitEndIndent()); writeStartTag(area, buffer); outputAllRectangles(area); renderChildren(area); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
