[FOray-commit] SF.net SVN: foray: [8780] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [8780] trunk/foray
|
From: <vic...@us...> - 2007-03-10 03:53:41
|
Revision: 8780
http://svn.sourceforge.net/foray/?rev=8780&view=rev
Author: victormote
Date: 2007-03-09 19:53:42 -0800 (Fri, 09 Mar 2007)
Log Message:
-----------
Conform to axsl changes renaming methods.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java
trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -83,9 +83,9 @@
}
public BlockContainerRA getNearestAncestorAreaContainer() {
- AreaNode areaNode = this.getAreaNodeParent();
+ AreaNode areaNode = this.getParent();
while (areaNode != null && !(areaNode instanceof BlockContainerRA)) {
- areaNode = areaNode.getAreaNodeParent();
+ areaNode = areaNode.getParent();
}
return (BlockContainerRA) areaNode;
}
@@ -206,7 +206,7 @@
if (getParent() == null) {
return true;
}
- final List<AreaNode> siblings = getAreaNodeParent().getChildren();
+ final List<AreaNode> siblings = getParent().getChildren();
if (siblings == null) {
return true;
}
@@ -220,7 +220,7 @@
if (getParent() == null) {
return true;
}
- final List<AreaNode> siblings = getAreaNodeParent().getChildren();
+ final List<AreaNode> siblings = getParent().getChildren();
if (siblings == null) {
return true;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -31,7 +31,6 @@
import org.foray.common.OrderedTreeNode;
import org.axsl.areaW.AreaWException;
-import org.axsl.areaW.PageArea;
import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
import org.axsl.foR.FONode;
@@ -74,7 +73,7 @@
this.parent = parentArea;
if (! (this instanceof AreaTree)) {
// AreaTree has no parent with which to register
- getAreaNodeParent().getChildren().add(this);
+ getParent().getChildren().add(this);
// Root can't do this because the AreaTreeControl isn't registered.
this.generatedBy = linkage(generatedBy, retrieveMarker);
final FOLinkageNormal normalLinkage = this.getNormalLinkage(
@@ -117,7 +116,7 @@
*/
public void remove() {
// Remove from the Area Tree
- getAreaNodeParent().removeChild(this);
+ getParent().removeChild(this);
// Remove from the FO-Area Tree cross-reference.
this.getNormalLinkage().unregisterGeneratedArea(this);
}
@@ -200,23 +199,11 @@
}
public AreaTree getAreaTree() {
- return getAreaNodeParent().getAreaTree();
+ return getParent().getAreaTree();
}
- public AreaNode getAreaNodeParent() {
- return (AreaNode) getParent();
- }
-
- public org.axsl.areaW.AreaNode getWritableParent() {
- return (org.axsl.areaW.AreaNode) getParent();
- }
-
- public org.axsl.areaW.Area getWritableParentArea() {
- return getParentArea();
- }
-
public Area getParentArea() {
- final AreaNode parent = getAreaNodeParent();
+ final AreaNode parent = getParent();
if (parent == null) {
return null;
}
@@ -238,7 +225,7 @@
}
public Area ancestorBlockAreaNotALineArea() {
- final AreaNode parent = getAreaNodeParent();
+ final AreaNode parent = getParent();
if (parent == null) {
return null;
}
@@ -253,7 +240,7 @@
}
public NormalBlockArea ancestorNormalBlockArea() {
- final AreaNode parent = getAreaNodeParent();
+ final AreaNode parent = getParent();
if (parent == null) {
return null;
}
@@ -276,23 +263,19 @@
}
public PageRA getPage() {
- return getAreaNodeParent().getPage();
+ return getParent().getPage();
}
- public PageArea getWritablePage() {
- return getAreaNodeParent().getPage();
- }
-
public FontConsumer getFontConsumer() {
- return getAreaNodeParent().getFontConsumer();
+ return getParent().getFontConsumer();
}
public TextServer getTextServer() {
- return getAreaNodeParent().getTextServer();
+ return getParent().getTextServer();
}
public Log getLogger() {
- return getAreaNodeParent().getLogger();
+ return getParent().getLogger();
}
/**
@@ -304,7 +287,7 @@
if (this instanceof Area && traitGeneratedBy().isBlockLevelFO()) {
return (Area) this;
}
- return getAreaNodeParent().nearestGeneratedByBlockLevelFO();
+ return getParent().nearestGeneratedByBlockLevelFO();
}
/**
@@ -406,7 +389,7 @@
* @return The ancestor SpanRA, or null if there is none.
*/
public SpanRA ancestorSpanRA() {
- final AreaNode parent = getAreaNodeParent();
+ final AreaNode parent = getParent();
if (parent == null) {
return null;
}
@@ -418,7 +401,7 @@
* @return The ancestor LineArea, or null if there is none.
*/
public LineArea ancestorLineArea() {
- final AreaNode parent = getAreaNodeParent();
+ final AreaNode parent = getParent();
if (parent == null) {
return null;
}
@@ -434,7 +417,7 @@
* implementation instead of the interface (for internal AreaTree use).
*/
public TableRA ancestorTableRA() {
- final AreaNode parent = getAreaNodeParent();
+ final AreaNode parent = getParent();
if (parent == null) {
return null;
}
@@ -449,7 +432,7 @@
}
public PageCollection ancestorPageCollection() {
- final AreaNode parent = getAreaNodeParent();
+ final AreaNode parent = getParent();
if (parent == null) {
return null;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -54,7 +54,7 @@
}
public void registerGeneratedArea(final AreaNode areaNode) {
- final AreaNode parent = areaNode.getAreaNodeParent();
+ final AreaNode parent = areaNode.getParent();
if (parent != null) {
/*
* If the parent was generated by the same FObj, then we shouldn't
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -457,7 +457,7 @@
if (! this.isFirstChildOfParent()) {
return false;
}
- if (! getAreaNodeParent().isFirstChildOfGeneratedBy()) {
+ if (! getParent().isFirstChildOfGeneratedBy()) {
return false;
}
return true;
@@ -473,7 +473,7 @@
if (! this.isLastChildOfParent()) {
return false;
}
- if (! getAreaNodeParent().isLastChildOfGeneratedBy()) {
+ if (! getParent().isLastChildOfGeneratedBy()) {
return false;
}
return true;
@@ -681,7 +681,7 @@
public void cleanup() {
resetChildren();
setProgressionDimension(0);
- this.getAreaNodeParent().removeChild(this);
+ this.getParent().removeChild(this);
}
public int rrIPD() {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -129,7 +129,7 @@
* {@inheritDoc}
*/
public int getProgressionDimension() {
- if (getAreaNodeParent().traitGeneratedBy() instanceof ListItem) {
+ if (getParent().traitGeneratedBy() instanceof ListItem) {
return listItemPD();
}
return getRawProgressionDimension();
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -162,7 +162,7 @@
// I don't much like exposing this. (AHS 001217)
final NormalFlowRA column = (NormalFlowRA) currentArea;
// Cast verified at construction.
- final SpanRA span = (SpanRA) column.getWritableParent();
+ final SpanRA span = (SpanRA) column.getParent();
span.setCurrentColumn(span.getCurrentColumn() + 1);
i--;
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -104,7 +104,7 @@
Area area = inputArea;
Area parent = null;
- while ((parent = area.getWritableParentArea()) != null &&
+ while ((parent = area.getParentArea()) != null &&
parent.hasChildren() == false) {
// The area will be the first non-space child in its parent
// Note: it's not added yet!
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -229,7 +229,7 @@
}
// It did not fit on the line. Create new line & try again.
final NormalBlockArea blockArea
- = (NormalBlockArea) lineArea.getWritableParentArea();
+ = (NormalBlockArea) lineArea.getParentArea();
lineArea = blockArea.createNextLineArea(false);
final BlockPL blockPL = this.layout.getBlockPL(blockArea);
blockPL.setCurrentLineArea(lineArea);
@@ -259,7 +259,7 @@
if (area instanceof NormalBlockArea) {
blockArea = (NormalBlockArea) area;
} else {
- blockArea = area.ancestorWritableNormalBlockArea();
+ blockArea = area.ancestorNormalBlockArea();
}
if (blockArea == null) {
final FONode foNode = this.getFONode();
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -83,7 +83,7 @@
if (la == null) {
return start;
}
- final NormalBlockArea ba = la.ancestorWritableNormalBlockArea();
+ final NormalBlockArea ba = la.ancestorNormalBlockArea();
start = addTextItemToLine(la, lineText, start, end, retrieveMarker);
while (start != -1) {
final BlockPL blockPL = getLayout().getBlockPL(ba);
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -98,7 +98,7 @@
if (footArea.hasChildren()) {
return;
}
- final PageSequence pageSeq = bac.getWritablePage()
+ final PageSequence pageSeq = bac.getPage()
.getWritablePageCollection().getPageSequence();
final StaticContent separator = pageSeq.getFootnoteSeparator();
if (separator == null) {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -67,7 +67,7 @@
/* Layout the FootnoteBody. */
final FootnoteBody fbody = this.node.getFootnoteBody();
final FootnoteBodyPL fbPL = (FootnoteBodyPL) getLayoutProxy(fbody);
- final PageArea page = area.getWritablePage();
+ final PageArea page = area.getPage();
/* If the footnote cannot be entirely laid out on the current page,
* it will be added to the list of pending footnotes. */
fbPL.layoutFootnote(page, retrieveMarker);
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/MarkerPL.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -48,7 +48,7 @@
public int layout(final Area area, final RetrieveMarker retrieveMarker) {
// no layout action desired
- area.getWritablePage().registerMarker(this.node);
+ area.getPage().registerMarker(this.node);
return Status.OK;
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -255,7 +255,7 @@
// if first ColumnArea, empty, _and_ in odd page,
// return OK
if (!colArea.hasChildren() && (colArea.siblingIndex() == 0)
- && (colArea.getWritablePage().getNumber() % 2 != 0)) {
+ && (colArea.getPage().getNumber() % 2 != 0)) {
return Status.OK;
}
return Status.FORCE_PAGE_BREAK_ODD;
@@ -264,7 +264,7 @@
// if first ColumnArea, empty, _and_ in even page,
// return OK
if (!colArea.hasChildren() && (colArea.siblingIndex() == 0)
- && (colArea.getWritablePage().getNumber() % 2 == 0)) {
+ && (colArea.getPage().getNumber() % 2 == 0)) {
return Status.OK;
}
return Status.FORCE_PAGE_BREAK_EVEN;
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2007-03-10 03:40:16 UTC (rev 8779)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2007-03-10 03:53:42 UTC (rev 8780)
@@ -54,7 +54,7 @@
/* RetrieveMarker can only exist in static content, so we don't care
* about tracking or setting progress at all. It either fits or it
* doesn't. */
- final PageArea containingPage = area.getWritablePage();
+ final PageArea containingPage = area.getPage();
final Marker bestMarker = containingPage.bestMarker(this.node);
if (bestMarker == null) {
return Status.OK;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
