|
From: <vic...@us...> - 2006-05-09 00:56:20
|
Revision: 7187 Author: victormote Date: 2006-05-07 17:08:45 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7187&view=rev Log Message: ----------- Conform to new axsl methods. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-07 23:40:33 UTC (rev 7186) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-08 00:08:45 UTC (rev 7187) @@ -95,6 +95,10 @@ return footnoteReferenceArea; } + public org.axsl.areaW.FootnoteRA getWritableFootnoteReferenceArea() { + return footnoteReferenceArea; + } + public int getFootnoteState() { return footnoteState; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-29 18:33:57
|
Revision: 7303 Author: victormote Date: 2006-05-29 11:33:48 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7303&view=rev Log Message: ----------- Remove unneeded instance variables. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-29 18:30:34 UTC (rev 7302) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-29 18:33:48 UTC (rev 7303) @@ -44,10 +44,6 @@ private int dimensionFootnoteRA; private int dimensionBeforeFloatRA; - // reference area yPositions - private int mainYPosition; - private int footnoteYPosition; - // keeps track of footnote state for multiple layouts private int footnoteState = 0; @@ -90,12 +86,11 @@ } public boolean needsFootnoteAdjusting() { - footnoteYPosition = footnoteReferenceArea.crOriginY(); + int footnoteYPosition = footnoteReferenceArea.crOriginY(); switch (footnoteState) { case 0: if (footnoteReferenceArea.crBPD() > 0 - && mainYPosition + mainReferenceArea.crBPD() - > footnoteYPosition) { + && mainReferenceArea.crBPD() > footnoteYPosition) { return true; } case 1: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-29 19:13:52
|
Revision: 7307 Author: victormote Date: 2006-05-29 12:13:45 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7307&view=rev Log Message: ----------- Clean up unneeded comments. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-29 18:55:44 UTC (rev 7306) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-29 19:13:45 UTC (rev 7307) @@ -44,9 +44,6 @@ private int dimensionFootnoteRA; private int dimensionBeforeFloatRA; - // keeps track of footnote state for multiple layouts -// private int footnoteState = 0; - public RegionRABody(RegionBody generatedBy, PageRA parentArea, int xPosition, int yPosition) { super(generatedBy, parentArea); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-29 22:34:55
|
Revision: 7316 Author: victormote Date: 2006-05-29 15:34:48 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7316&view=rev Log Message: ----------- Conform to renamed axsl method. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-29 22:34:40 UTC (rev 7315) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-29 22:34:48 UTC (rev 7316) @@ -70,7 +70,7 @@ return this.beforeFloatReferenceArea; } - public org.axsl.areaW.FootnoteRA getWritableFootnoteReferenceArea() { + public org.axsl.areaW.FootnoteRA getWritableFootnoteRA() { return footnoteReferenceArea; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-31 17:51:39
|
Revision: 7338 Author: victormote Date: 2006-05-31 10:51:30 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7338&view=rev Log Message: ----------- Remove unused method. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-31 17:39:26 UTC (rev 7337) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-31 17:51:30 UTC (rev 7338) @@ -31,8 +31,6 @@ import org.axsl.foR.fo.RegionBody; import org.axsl.foR.fo.SimplePageMaster; -import java.util.List; - public class RegionRABody extends AreaFixed implements RegionBodyArea, org.axsl.areaW.RegionRABody { @@ -74,17 +72,6 @@ return footnoteReferenceArea; } - protected static void resetMaxHeight(Area ar, int change) { - List childs = ar.getChildren(); - for (int i = 0; i < childs.size(); i++) { - Object obj = childs.get(i); - if (obj instanceof Area) { - Area childArea = (Area)obj; - resetMaxHeight(childArea, change); - } - } - } - public byte getAreaType() { return AreaNode.AREATYPE_BODY_AREA_CONTAINER; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-06 20:25:03
|
Revision: 7427 Author: victormote Date: 2006-06-06 12:09:52 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7427&view=rev Log Message: ----------- Conform to and use new axsl method: Add method returning the Region's page. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-06-06 18:42:43 UTC (rev 7426) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-06-06 19:09:52 UTC (rev 7427) @@ -115,12 +115,16 @@ - getDimensionFootnoteRA(); } + public SimplePageMaster getPageMaster() { + // Cast verified at construction. + RegionBody rb = (RegionBody) traitGeneratedBy(); + return rb.getPage(); + } + public int brOriginX() { // Start at the parent's content origin. int x = getParentArea().crOriginX(); - // Cast verified at construction. - RegionBody rb = (RegionBody) traitGeneratedBy(); - SimplePageMaster spm = (SimplePageMaster) rb.parentFO(); + SimplePageMaster spm = getPageMaster(); switch (getParentArea().contentStackingDirectionAbsolute()) { case Constants.DIRECTION_TOP_TO_BOTTOM: case Constants.DIRECTION_BOTTOM_TO_TOP: { @@ -142,9 +146,7 @@ public int brOriginY() { // Start at the parent's content origin. int y = getParentArea().crOriginY(); - // Cast verified at construction. - SimplePageMaster spm = (SimplePageMaster) - traitGeneratedBy().parentFO(); + SimplePageMaster spm = getPageMaster(); switch (getWritingMode().getAbsoluteDirFromRelativeAxis( Constants.AXIS_BP)) { case Constants.DIRECTION_TOP_TO_BOTTOM: { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
