|
From: <vic...@us...> - 2006-05-08 23:51:40
|
Revision: 7200 Author: victormote Date: 2006-05-08 10:50:36 -0700 (Mon, 08 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7200&view=rev Log Message: ----------- Conform to axsl changes. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-08 17:41:39 UTC (rev 7199) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-08 17:50:36 UTC (rev 7200) @@ -65,7 +65,7 @@ * * @param la the LineArea to add */ - public void addLineArea(LineArea la) { + public void addLineArea(org.axsl.areaW.LineArea la) { if (!la.isEmpty()) { la.verticalAlign(); } 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:17:48
|
Revision: 7300 Author: victormote Date: 2006-05-29 11:17:42 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7300&view=rev Log Message: ----------- Correct computation of remaining space in area. Was double-counting the space already used. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-29 17:51:49 UTC (rev 7299) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-29 18:17:42 UTC (rev 7300) @@ -105,11 +105,12 @@ */ public org.axsl.areaW.LineArea createNextLineArea() { /* The size of the next line does not need to consider the half-leading - * that follows the line. */ + * that follows the line. That half-leading will be automatically + * handled if the line is actually created, but can safely be ignored + * for purposes of deciding whether the line will fit. */ int sizeNextLineArea = this.traitFontSize() + this.traitHalfLeadingOpt(); - if (this.getProgressionDimension() - + sizeNextLineArea + if (sizeNextLineArea > this.progressionDimensionAvailable()) { return null; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-30 18:30:27
|
Revision: 7320 Author: victormote Date: 2006-05-30 11:30:17 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7320&view=rev Log Message: ----------- Conform to axsl change: Remove more footnote-related logic from interface. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-30 18:30:08 UTC (rev 7319) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-30 18:30:17 UTC (rev 7320) @@ -26,7 +26,6 @@ import org.axsl.areaW.AreaWException; import org.axsl.foR.FObj; -import org.axsl.foR.fo.FootnoteBody; import org.axsl.foR.fo.ListItem; import org.axsl.foR.fo.ListItemBody; import org.axsl.foR.fo.ListItemLabel; @@ -131,13 +130,6 @@ this.currentLineArea = null; } - public void addFootnote(FootnoteBody fb) { - if (pendingFootnotes == null) { - pendingFootnotes = new ArrayList(); - } - pendingFootnotes.add(fb); - } - public byte getAreaType() { return AreaNode.AREATYPE_BLOCK; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-30 18:42:16
|
Revision: 7322 Author: victormote Date: 2006-05-30 11:42:11 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7322&view=rev Log Message: ----------- Conform to axsl change: Remove more footnote-related logic from interface. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-30 18:42:03 UTC (rev 7321) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-30 18:42:11 UTC (rev 7322) @@ -31,9 +31,6 @@ import org.axsl.foR.fo.ListItemLabel; import org.axsl.foR.fo.RegionBody; -import java.util.ArrayList; -import java.util.List; - /** * This class represents a Block Area. * A block area is made up of a sequence of Line Areas. @@ -51,9 +48,6 @@ /* TODO: This is a layout concept and should not be in AreaTree? */ private LineArea currentLineArea; - /* TODO: This is a layout concept and should not be in AreaTree? */ - private ArrayList pendingFootnotes = null; - public NormalBlockArea(FObj parentFObj, Area parentArea) { super(parentFObj, parentArea); } @@ -212,22 +206,6 @@ return Math.max(labelBPD, bodyBPD); } - public List getPendingFootnotes() { - return this.pendingFootnotes; - } - - public void setPendingFootnotes(List newFootnotes) { - if (newFootnotes == null) { - this.pendingFootnotes = null; - return; - } - if (newFootnotes instanceof ArrayList) { - this.pendingFootnotes = (ArrayList) newFootnotes; - return; - } - this.pendingFootnotes = new ArrayList(newFootnotes); - } - public LineArea getPreviousLineArea(LineArea lineArea) { if (this.children == null) { return null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-30 20:10:53
|
Revision: 7324 Author: victormote Date: 2006-05-30 13:10:49 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7324&view=rev Log Message: ----------- Conform to axsl changes: Remove unneeded method. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-30 20:10:42 UTC (rev 7323) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-30 20:10:49 UTC (rev 7324) @@ -53,20 +53,6 @@ } /** - * Add a Line Area to this block area. - * Used internally to add a completed line area to this block area - * when either a new line area is created or this block area is - * completed. - * - * @param la the LineArea to add - */ - public void addLineArea(org.axsl.areaW.LineArea la) { - if (!la.isEmpty()) { - la.verticalAlign(); - } - } - - /** * Get the current line area in this block area. * This is used to get the current line area for adding * inline objects. @@ -120,7 +106,7 @@ if (this.currentLineArea == null) { return; } - this.addLineArea(this.currentLineArea); + this.currentLineArea.verticalAlign(); this.currentLineArea = null; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-30 22:30:15
|
Revision: 7328 Author: victormote Date: 2006-05-30 15:30:09 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7328&view=rev Log Message: ----------- Conform to axsl changes: Remove layout-related items from interface. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-30 22:29:58 UTC (rev 7327) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-30 22:30:09 UTC (rev 7328) @@ -45,34 +45,11 @@ implements org.axsl.areaR.NormalBlockArea, org.axsl.areaW.NormalBlockArea { - /* TODO: This is a layout concept and should not be in AreaTree? */ - private LineArea currentLineArea; - public NormalBlockArea(FObj parentFObj, Area parentArea) { super(parentFObj, parentArea); } /** - * Get the current line area in this block area. - * This is used to get the current line area for adding - * inline objects. - * This will return null if there is not enough room left - * in the block area to accomodate the line area. - * - * @return the line area to be used to add inline objects - */ - public LineArea getCurrentLineArea() { - if (this.currentLineArea == null) { - return (LineArea) createNextLineArea(); - } - return this.currentLineArea; - } - - public org.axsl.areaW.LineArea getWritableCurrentLineArea() { - return getCurrentLineArea(); - } - - /** * Create a new line area to add inline objects. * This should be called after getting the current line area * and discovering that the inline object will not fit inside the current @@ -93,23 +70,9 @@ > this.progressionDimensionAvailable()) { return null; } - this.currentLineArea = new LineArea(traitGeneratedBy(), this); - return this.currentLineArea; + return new LineArea(traitGeneratedBy(), this); } - /** - * Notify this block that the area has completed layout. - * Indicates the the block has been fully laid out, this will - * add (if any) the current line area. - */ - public void completeCurrentLine() { - if (this.currentLineArea == null) { - return; - } - this.currentLineArea.verticalAlign(); - this.currentLineArea = null; - } - public byte getAreaType() { return AreaNode.AREATYPE_BLOCK; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-30 23:10:28
|
Revision: 7330 Author: victormote Date: 2006-05-30 16:10:18 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7330&view=rev Log Message: ----------- Conform to axsl changes: Allow the AreaTree to overflow to a new page if the client app wants it to. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-30 23:10:09 UTC (rev 7329) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-30 23:10:18 UTC (rev 7330) @@ -50,16 +50,10 @@ } /** - * Create a new line area to add inline objects. - * This should be called after getting the current line area - * and discovering that the inline object will not fit inside the current - * line. This method will create a new line area to place the inline - * object into. - * This will return null if the new line cannot fit into the block area. - * - * @return the new current line area, which will be empty. + * {@inheritDoc} */ - public org.axsl.areaW.LineArea createNextLineArea() { + public org.axsl.areaW.LineArea createNextLineArea(boolean allowOverflow) + throws AreaWException { /* The size of the next line does not need to consider the half-leading * that follows the line. That half-leading will be automatically * handled if the line is actually created, but can safely be ignored @@ -68,7 +62,13 @@ + this.traitHalfLeadingOpt(); if (sizeNextLineArea > this.progressionDimensionAvailable()) { - return null; + if (allowOverflow) { + NormalBlockArea newArea = (NormalBlockArea) + this.getOverflowArea(this); + return newArea.createNextLineArea(allowOverflow); + } else { + return null; + } } return new LineArea(traitGeneratedBy(), this); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
