[FOray-commit] SF.net SVN: foray: [9908] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [9908] trunk/foray
|
From: <vic...@us...> - 2007-07-02 18:22:28
|
Revision: 9908
http://svn.sourceforge.net/foray/?rev=9908&view=rev
Author: victormote
Date: 2007-07-02 11:22:30 -0700 (Mon, 02 Jul 2007)
Log Message:
-----------
Conform to axsl method name changes.
Modified Paths:
--------------
trunk/foray/foray-app/src/javatest/org/foray/app/area/AbstractAreaTreeTest.java
trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java
trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBorder.java
trunk/foray/foray-app/src/javatest/org/foray/app/area/TestGraphicArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/AbstractListItemContent.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/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/FootnoteRA.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/NormalBlockArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.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-pioneer/src/java/org/foray/pioneer/FlowPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.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/svg/SVGRenderer.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-app/src/javatest/org/foray/app/area/AbstractAreaTreeTest.java
===================================================================
--- trunk/foray/foray-app/src/javatest/org/foray/app/area/AbstractAreaTreeTest.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-app/src/javatest/org/foray/app/area/AbstractAreaTreeTest.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -57,7 +57,7 @@
final PageCollection pageCollection = getPageCollection(areaTree, 1);
final PageRA firstPage = getPage(pageCollection, 1);
final RegionRABody regionBody = firstPage.getRegionBody();
- final MainRA main = regionBody.getMainRA();
+ final MainRA main = regionBody.getMainRefArea();
AreaNode node = main.getChildAt(0);
assertTrue(node instanceof SpanRA);
final SpanRA span = (SpanRA) node;
Modified: trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java
===================================================================
--- trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -62,7 +62,7 @@
assertEquals(720000, outerBlockArea.crOriginY());
/* Page is 8 inches wide, with 2 inches total margin.
* 6 * 72,000 = 432,000. */
- assertEquals(432000, outerBlockArea.crIPD());
+ assertEquals(432000, outerBlockArea.crIpd());
/* The first child of the outer block area is a line-area. */
node = outerBlockArea.getChildAt(0);
@@ -79,9 +79,9 @@
* 720,000 - 1,200 = 718,800. */
assertEquals(718800, lineArea.crOriginY());
/* Same as parent. */
- assertEquals(432000, lineArea.crIPD());
+ assertEquals(432000, lineArea.crIpd());
/* Default font-size is 12 points. */
- assertEquals(12000, lineArea.crBPD());
+ assertEquals(12000, lineArea.crBpd());
/* The second child of the outer block area is a block-area. */
node = outerBlockArea.getChildAt(1);
@@ -97,9 +97,9 @@
* 718,800 - 12,000 - 1,200 = 705,600. */
assertEquals(705600, insideBlockArea.crOriginY());
/* Same as parent. */
- assertEquals(432000, insideBlockArea.crIPD());
+ assertEquals(432000, insideBlockArea.crIpd());
/* Height of 0, as it has no content. */
- assertEquals(0, insideBlockArea.crBPD());
+ assertEquals(0, insideBlockArea.crBpd());
/* The third child of the outer block area is another line-area. */
node = outerBlockArea.getChildAt(2);
@@ -114,9 +114,9 @@
* 705,600 - 1,200 = 704,400. */
assertEquals(704400, lineArea.crOriginY());
/* Same as parent. */
- assertEquals(432000, lineArea.crIPD());
+ assertEquals(432000, lineArea.crIpd());
/* Same as the first line. */
- assertEquals(12000, lineArea.crBPD());
+ assertEquals(12000, lineArea.crBpd());
/* The fourth child of the outer block area is another line-area. */
node = outerBlockArea.getChildAt(3);
@@ -133,9 +133,9 @@
* 704,400 - 12,000 - 1,200 - 1,200 = 690,000. */
assertEquals(690000, lineArea.crOriginY());
/* Same as parent. */
- assertEquals(432000, lineArea.crIPD());
+ assertEquals(432000, lineArea.crIpd());
/* Same as the other lines. */
- assertEquals(12000, lineArea.crBPD());
+ assertEquals(12000, lineArea.crBpd());
}
/**
Modified: trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBorder.java
===================================================================
--- trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBorder.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBorder.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -55,15 +55,15 @@
final NormalBlockArea blockArea = (NormalBlockArea) node;
assertEquals(72000, blockArea.brOriginX());
assertEquals(720000, blockArea.brOriginY());
- assertEquals(432000, blockArea.brIPD());
+ assertEquals(432000, blockArea.brIpd());
assertEquals(72500, blockArea.prOriginX());
assertEquals(719500, blockArea.prOriginY());
- assertEquals(431000, blockArea.prIPD());
+ assertEquals(431000, blockArea.prIpd());
assertEquals(72500, blockArea.crOriginX());
assertEquals(719500, blockArea.crOriginY());
- assertEquals(431000, blockArea.crIPD());
+ assertEquals(431000, blockArea.crIpd());
}
}
Modified: trunk/foray/foray-app/src/javatest/org/foray/app/area/TestGraphicArea.java
===================================================================
--- trunk/foray/foray-app/src/javatest/org/foray/app/area/TestGraphicArea.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-app/src/javatest/org/foray/app/area/TestGraphicArea.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -73,7 +73,7 @@
/* First test the size of the viewport. */
final ExternalGraphicArea ega = (ExternalGraphicArea) node;
- final int width = ega.crIPD();
+ final int width = ega.crIpd();
/* 200 pixels @ 96 pixels per inch = (200 / 96) * 72,000 millipoints
* = 150,000 millipoints. */
assertEquals(150000, width);
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -131,14 +131,14 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
return this.getProgressionDimension();
}
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return crBPDInline();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractListItemContent.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractListItemContent.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractListItemContent.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -176,7 +176,7 @@
for (Area area : this.children) {
/* TODO: This is not right. We need the space-before, etc.
* considered also. */
- pd += area.brBPD();
+ pd += area.brBpd();
}
return pd;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -189,7 +189,7 @@
* @see Fo#traitEndIndent(FoContext, int)
*/
public int traitEndIndent() {
- final int percentBase = this.getContainingReferenceArea().crIPD();
+ final int percentBase = this.getContainingReferenceArea().crIpd();
return traitGeneratedBy().traitEndIndent(this, percentBase);
}
@@ -200,7 +200,7 @@
*/
public int traitStartIndent() {
final Area containingRA = this.getContainingReferenceArea();
- final int percentBase = containingRA.crIPD();
+ final int percentBase = containingRA.crIpd();
return traitGeneratedBy().traitStartIndent(this, percentBase);
}
@@ -473,15 +473,15 @@
/**
* {@inheritDoc}
*/
- public int brIPD() {
- return prIPD() + traitBorderStartWidth() + traitBorderEndWidth();
+ public int brIpd() {
+ return prIpd() + traitBorderStartWidth() + traitBorderEndWidth();
}
/**
* {@inheritDoc}
*/
- public int brBPD() {
- return prBPD() + traitBorderBeforeWidth() + traitBorderAfterWidth();
+ public int brBpd() {
+ return prBpd() + traitBorderBeforeWidth() + traitBorderAfterWidth();
}
/**
@@ -571,8 +571,8 @@
* @return The inline-progression-dimension of the padding-rectangle for
* this Area.
*/
- public int prIPD() {
- return crIPD() + traitPaddingStart() + traitPaddingEnd();
+ public int prIpd() {
+ return crIpd() + traitPaddingStart() + traitPaddingEnd();
}
/**
@@ -580,8 +580,8 @@
* @return The block-progression-dimension of the padding-rectangle for
* this Area.
*/
- public int prBPD() {
- return crBPD() + traitPaddingBefore() + traitPaddingAfter();
+ public int prBpd() {
+ return crBpd() + traitPaddingBefore() + traitPaddingAfter();
}
/**
@@ -670,12 +670,12 @@
/**
* {@inheritDoc}
*/
- public abstract int crIPD();
+ public abstract int crIpd();
/**
* {@inheritDoc}
*/
- public abstract int crBPD();
+ public abstract int crBpd();
/**
* The difference, in millipoints, between the page-viewport-area's
@@ -781,9 +781,9 @@
*/
public int narIPD() {
if (isBlockArea()) {
- return crIPD() + traitStartIndent() + traitEndIndent();
+ return crIpd() + traitStartIndent() + traitEndIndent();
}
- return brIPD();
+ return brIpd();
}
/**
@@ -793,9 +793,9 @@
*/
public int narBPD() {
if (isBlockArea()) {
- return brBPD();
+ return brBpd();
}
- return crBPD();
+ return crBpd();
}
/**
@@ -823,7 +823,7 @@
*/
public int larIPD() {
// LAR is the same as the BR
- return brIPD();
+ return brIpd();
}
/**
@@ -833,7 +833,7 @@
*/
public int larBPD() {
// LAR is the same as the BR
- return brBPD();
+ return brBpd();
}
/**
@@ -1027,7 +1027,7 @@
public int traitSpaceStartOptimum() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
return traitGeneratedBy().traitSpaceStartOptimum(this,
- ancestor.crIPD());
+ ancestor.crIpd());
}
/**
@@ -1055,7 +1055,7 @@
*/
public int traitSpaceEndOptimum() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
- return traitGeneratedBy().traitSpaceEndOptimum(this, ancestor.crIPD());
+ return traitGeneratedBy().traitSpaceEndOptimum(this, ancestor.crIpd());
}
/**
@@ -1550,8 +1550,8 @@
return new Rectangle2D.Float(
crOriginX() / WKConstants.MILLIPOINTS_PER_POINT,
crOriginY() / WKConstants.MILLIPOINTS_PER_POINT,
- crIPD() / WKConstants.MILLIPOINTS_PER_POINT,
- crBPD() / WKConstants.MILLIPOINTS_PER_POINT);
+ crIpd() / WKConstants.MILLIPOINTS_PER_POINT,
+ crBpd() / WKConstants.MILLIPOINTS_PER_POINT);
}
/**
@@ -1562,8 +1562,8 @@
return new Rectangle2D.Float(
brOriginX() / WKConstants.MILLIPOINTS_PER_POINT,
brOriginY() / WKConstants.MILLIPOINTS_PER_POINT,
- brIPD() / WKConstants.MILLIPOINTS_PER_POINT,
- brBPD() / WKConstants.MILLIPOINTS_PER_POINT);
+ brIpd() / WKConstants.MILLIPOINTS_PER_POINT,
+ brBpd() / WKConstants.MILLIPOINTS_PER_POINT);
}
/**
@@ -1601,7 +1601,7 @@
*/
public int traitTop() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
- return traitGeneratedBy().traitTop(this, ancestor.crBPD());
+ return traitGeneratedBy().traitTop(this, ancestor.crBpd());
}
/**
@@ -1611,7 +1611,7 @@
*/
public int traitBottom() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
- return traitGeneratedBy().traitBottom(this, ancestor.crBPD());
+ return traitGeneratedBy().traitBottom(this, ancestor.crBpd());
}
/**
@@ -1621,7 +1621,7 @@
*/
public int traitLeft() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
- return traitGeneratedBy().traitLeft(this, ancestor.crIPD());
+ return traitGeneratedBy().traitLeft(this, ancestor.crIpd());
}
/**
@@ -1631,7 +1631,7 @@
*/
public int traitRight() {
final Area ancestor = this.ancestorBlockAreaNotALineArea();
- return traitGeneratedBy().traitRight(this, ancestor.crIPD());
+ return traitGeneratedBy().traitRight(this, ancestor.crIpd());
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -49,7 +49,7 @@
* {@inheritDoc}
*/
public int pdAvailable() {
- int dimension = brBPD();
+ int dimension = brBpd();
final List<AreaNode> children = getChildren();
for (int i = 0; i < children.size(); i++) {
if (children.get(i) instanceof AreaFlexible) {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -186,7 +186,7 @@
int actual = 0;
final int computed = this.traitIPDimensionOpt();
if (computed < 0) {
- actual = ancestorArea().crIPD()
+ actual = ancestorArea().crIpd()
- traitBorderStartWidth()
- traitBorderEndWidth()
- traitPaddingStart()
@@ -205,7 +205,7 @@
int actual = 0;
final int computed = this.traitBPDimensionOpt();
if (computed < 0) {
- actual = ancestorArea().crBPD()
+ actual = ancestorArea().crBpd()
- traitBorderBeforeWidth()
- traitBorderAfterWidth()
- traitPaddingBefore()
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -376,11 +376,11 @@
/**
* {@inheritDoc}
*/
- public Area nearestGeneratedByBlockLevelFO() {
+ public Area nearestGeneratedByBlockLevelFo() {
if (this instanceof Area && traitGeneratedBy().isBlockLevelFO()) {
return (Area) this;
}
- return getParent().nearestGeneratedByBlockLevelFO();
+ return getParent().nearestGeneratedByBlockLevelFo();
}
/**
@@ -662,7 +662,7 @@
* Also, consider renaming the method, both here and in aXSL, depending
* on the clarification. */
final Area area = this.ancestorRaOrGenByBlockFo();
- return area.crIPD();
+ return area.crIpd();
}
/**
@@ -674,7 +674,7 @@
* Also, consider renaming the method, both here and in aXSL, depending
* on the clarification. */
final Area area = this.ancestorRaOrGenByBlockFo();
- return area.crBPD();
+ return area.crBpd();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -78,16 +78,16 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return ((RegionRABody) ancestorArea()).getDimensionBeforeFloatRA();
}
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
// Same as its parent's.
- return ancestorArea().crIPD();
+ return ancestorArea().crIpd();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -43,9 +43,9 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
final Area containingReferenceArea = this.getContainingReferenceArea();
- int result = containingReferenceArea.crIPD();
+ int result = containingReferenceArea.crIpd();
result -= this.traitStartIndent();
result -= this.traitEndIndent();
result -= this.traitBorderStartWidth();
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -115,7 +115,7 @@
if (bottom != Fo.ABSOLUTE_POSITION_AUTO) {
/* If "bottom" is specified, */
final Area parentArea = this.getAreaParent();
- return parentArea.crBPD() - bottom
+ return parentArea.crBpd() - bottom
- this.getProgressionDimension();
}
}
@@ -148,14 +148,14 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
return crIPDBlockArea();
}
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return getProgressionDimension();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -76,16 +76,16 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return ((RegionRABody) ancestorArea()).getDimensionFootnoteRA();
}
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
// Same as its parent's.
- return ancestorArea().crIPD();
+ return ancestorArea().crIpd();
}
/**
@@ -101,7 +101,7 @@
*/
public int crOriginBPDOffset() {
// The bpd of the main-reference-area ...
- int offset = ancestorArea().crBPD();
+ int offset = ancestorArea().crBpd();
// ... less the size of the footnote-reference-area
offset -= getRegionBodyArea().getDimensionFootnoteRA();
return offset;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -222,7 +222,7 @@
*/
public int traitLeaderPatternWidth() {
return traitGeneratedBy().traitLeaderPatternWidth(
- this, ancestorArea().crIPD());
+ this, ancestorArea().crIpd());
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -535,8 +535,8 @@
final Object o = getChildren().get(i);
if (o instanceof AbstractInlineArea) {
final AbstractInlineArea ia = (AbstractInlineArea) o;
- if (ia.crBPD() > maxHeight) {
- maxHeight = ia.crBPD();
+ if (ia.crBpd() > maxHeight) {
+ maxHeight = ia.crBpd();
}
}
}
@@ -637,7 +637,7 @@
* @return The amount of unused space on the line.
*/
public int totalAlignmentAdjustment() {
- return this.crIPD() - lineContentLengthUsed();
+ return this.crIpd() - lineContentLengthUsed();
}
/**
@@ -679,7 +679,7 @@
*/
public int pdAvailable() {
// First, get the total usable line length.
- int dimension = crIPD();
+ int dimension = crIpd();
// Now, subtract the amount already used by children.
dimension -= lineContentLengthUsed();
return dimension;
@@ -872,7 +872,7 @@
}
final Area ancestorBlockAreaNotALineArea
= this.ancestorBlockAreaNotALineArea();
- final int percentBase = ancestorBlockAreaNotALineArea.crIPD();
+ final int percentBase = ancestorBlockAreaNotALineArea.crIpd();
return traitGeneratedBy().traitTextIndent(this, percentBase);
}
@@ -886,7 +886,7 @@
}
final Area ancestorBlockAreaNotALineArea
= this.ancestorBlockAreaNotALineArea();
- final int percentBase = ancestorBlockAreaNotALineArea.crIPD();
+ final int percentBase = ancestorBlockAreaNotALineArea.crIpd();
return traitGeneratedBy().traitLastLineEndIndent(this, percentBase);
}
@@ -924,7 +924,7 @@
* {@inheritDoc}
*/
public int capacityTotal() {
- return crIPD();
+ return crIpd();
}
/**
@@ -1230,7 +1230,7 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return getProgressionDimension();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -121,16 +121,16 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return getProgressionDimension();
}
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
/* TODO: This is probably not right. */
- return this.ancestorArea().crIPD();
+ return this.ancestorArea().crIpd();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -113,16 +113,16 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return getProgressionDimension();
}
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
/* TODO: This is probably not right. */
- return this.ancestorArea().crIPD();
+ return this.ancestorArea().crIpd();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -265,16 +265,16 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return ((RegionRABody) ancestorArea()).getDimensionMainRA();
}
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
// Same as its parent's.
- return ancestorArea().brIPD();
+ return ancestorArea().brIpd();
}
/**
@@ -299,7 +299,7 @@
throws WritableAreaException {
final RegionRABody bodyRegion = (RegionRABody) ancestorArea()
.getOverflowArea(this);
- return bodyRegion.getMainRA();
+ return bodyRegion.getMainRefArea();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -202,7 +202,7 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return this.getProgressionDimension();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -121,14 +121,14 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
- return ancestorArea().crBPD();
+ public int crBpd() {
+ return ancestorArea().crBpd();
}
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
return getParent().getColumnWidth();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -334,7 +334,7 @@
* that was generated by a block-level FO.
* @return Always returns null (override of method in Area).
*/
- public Area nearestGeneratedByBlockLevelFO() {
+ public Area nearestGeneratedByBlockLevelFo() {
return null;
}
@@ -392,7 +392,7 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
if (getWritingMode().getIpAxis() == AbsoluteAxis.HORIZONTAL) {
return traitPageWidth() - getMarginLeft() - getMarginRight();
}
@@ -402,7 +402,7 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
if (getWritingMode().getBpAxis() == AbsoluteAxis.VERTICAL) {
return traitPageHeight() - getMarginTop() - getMarginBottom();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -103,23 +103,23 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
if (this.traitGeneratedBy() instanceof RegionBefore
|| this.traitGeneratedBy() instanceof RegionAfter) {
return traitGeneratedBy().traitExtent();
}
- return ancestorArea().brBPD();
+ return ancestorArea().brBpd();
}
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
if (this.traitGeneratedBy() instanceof RegionStart
|| this.traitGeneratedBy() instanceof RegionEnd) {
return traitGeneratedBy().traitExtent();
}
- return ancestorArea().brIPD();
+ return ancestorArea().brIpd();
}
/**
@@ -136,7 +136,7 @@
return 0;
}
if (traitGeneratedBy() instanceof RegionEnd) {
- return ancestorArea().crIPD() - traitExtent();
+ return ancestorArea().crIpd() - traitExtent();
}
return 0;
}
@@ -149,7 +149,7 @@
return 0;
}
if (traitGeneratedBy() instanceof RegionAfter) {
- return ancestorArea().crBPD() - traitExtent();
+ return ancestorArea().crBpd() - traitExtent();
}
if (traitGeneratedBy() instanceof RegionStart) {
return ((PageRA) ancestorArea()).getRegionBefore().traitExtent();
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -117,29 +117,29 @@
/**
* {@inheritDoc}
*/
- public MainRA getMainRA() {
+ public MainRA getMainRefArea() {
return mainReferenceArea;
}
/**
* {@inheritDoc}
*/
- public org.axsl.areaW.BeforeFloatRefArea getBeforeFloatRA() {
+ public org.axsl.areaW.BeforeFloatRefArea getBeforeFloatRefArea() {
return this.beforeFloatReferenceArea;
}
/**
* {@inheritDoc}
*/
- public org.axsl.areaW.FootnoteRefArea getFootnoteRA() {
+ public org.axsl.areaW.FootnoteRefArea getFootnoteRefArea() {
return footnoteReferenceArea;
}
/**
* {@inheritDoc}
*/
- public int crBPD() {
- int dimension = ancestorArea().brBPD();
+ public int crBpd() {
+ int dimension = ancestorArea().brBpd();
if (this.getBPAxis() == AbsoluteAxis.VERTICAL) {
dimension -= getMarginTop();
dimension -= getMarginBottom();
@@ -153,8 +153,8 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
- int dimension = ancestorArea().brIPD();
+ public int crIpd() {
+ int dimension = ancestorArea().brIpd();
if (this.getBPAxis() == AbsoluteAxis.VERTICAL) {
dimension -= getMarginLeft();
dimension -= getMarginRight();
@@ -186,7 +186,7 @@
* @return The size of the main reference area.
*/
public int getDimensionMainRA() {
- return this.brBPD()
+ return this.brBpd()
- getDimensionBeforeFloatRA()
- getDimensionFootnoteRA();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -78,7 +78,7 @@
/**
* {@inheritDoc}
*/
- public SvgGraphic getSVGGraphic() {
+ public SvgGraphic getSvgGraphic() {
final SvgElement generatedBy = traitGeneratedBy();
return generatedBy.getSVGGraphic();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -109,7 +109,7 @@
public int getColumnWidth() {
final int columnCount = traitColumnCount();
final int columnGap = traitColumnGap();
- final int width = crIPD();
+ final int width = crIpd();
final int columnWidth = (width - columnGap * (columnCount - 1))
/ columnCount;
return columnWidth;
@@ -147,7 +147,7 @@
int totalContentHeight = 0;
for (AreaNode child : this.getChildren()) {
final NormalFlowRA nf = (NormalFlowRA) child;
- totalContentHeight += nf.crBPD();
+ totalContentHeight += nf.crBpd();
}
return totalContentHeight;
}
@@ -161,8 +161,8 @@
int maxContentHeight = 0;
for (AreaNode child : this.getChildren()) {
final NormalFlowRA nf = (NormalFlowRA) child;
- if (nf.crBPD() > maxContentHeight) {
- maxContentHeight = nf.crBPD();
+ if (nf.crBpd() > maxContentHeight) {
+ maxContentHeight = nf.crBpd();
}
}
return maxContentHeight;
@@ -342,14 +342,14 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
return crIPDBlockArea();
}
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return getProgressionDimension();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -92,14 +92,14 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
return crIPDBlockArea();
}
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return getProgressionDimension();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -269,7 +269,7 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
/* See XSL-FO 1.1, Section 6.7.10, Subsection "Constraints" where the
* table-cell content-rectangle is defined. */
final TableRA tableRA = this.ancestorTableArea();
@@ -290,7 +290,7 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
/* Table cell is inside a row container, which keeps track of the BPD
* for all (non-spanning) cells in the row. */
int bpd = 0;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -92,14 +92,14 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
return crIPDBlockArea();
}
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return getProgressionDimension();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -92,14 +92,14 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
return crIPDBlockArea();
}
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return getProgressionDimension();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -105,7 +105,7 @@
final int numColumns = generatedBy.numberOfColumns();
newTable.resolvedColumnWidth = new int[numColumns];
newTable.crOriginX = new int[numColumns];
- newTable.calcColumnWidths(newTable.ancestorArea().crIPD());
+ newTable.calcColumnWidths(newTable.ancestorArea().crIpd());
newTable.calcColumnOrigins();
return newTable;
}
@@ -498,14 +498,14 @@
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return getProgressionDimension();
}
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
/* TODO: This does not consider borders and padding, but the spec seems
* to be unclear about how those work wrt columns. */
int width = 0;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -135,14 +135,14 @@
/**
* {@inheritDoc}
*/
- public int crIPD() {
+ public int crIpd() {
return crIPDBlockArea();
}
/**
* {@inheritDoc}
*/
- public int crBPD() {
+ public int crBpd() {
return this.getProgressionDimension();
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -80,10 +80,10 @@
for (int i = getProgress(); i < numChildren; i++) {
final Fo fo = (Fo) getFONode().getChildAt(i);
- if (bac.getMainRA().isBalancingRequired(fo)) {
+ if (bac.getMainRefArea().isBalancingRequired(fo)) {
// reset the the just-done span area in preparation
// for a backtrack for balancing
- bac.getMainRA().resetSpanArea();
+ bac.getMainRefArea().resetSpanArea();
rollback(getProgressSnapshot());
// one less because of the "continue"
@@ -91,8 +91,8 @@
continue;
}
// current column area
- final Area currentArea = bac.getMainRA().getNormalFlow(fo);
- if (bac.getMainRA().isNewSpanArea()) {
+ final Area currentArea = bac.getMainRefArea().getNormalFlow(fo);
+ if (bac.getMainRefArea().isNewSpanArea()) {
setProgress(i);
setProgressSnapshot(getProgressSnapshot(new
ArrayList<Integer>()));
@@ -114,7 +114,7 @@
// should probably return AREA_FULL_NONE if first
// or perhaps an entirely new status code
}
- if (bac.getMainRA().isLastColumn()) {
+ if (bac.getMainRefArea().isLastColumn()) {
if (getStatus() == Status.FORCE_COLUMN_BREAK) {
setProgress(i);
// same thing
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnoteBodyPL.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -93,7 +93,7 @@
public boolean layoutFootnote(final PageArea p,
final GraftingPoint graftingPoint) {
final RegionBodyRefArea bac = p.getRegionBody();
- final FootnoteRefArea footArea = bac.getFootnoteRA();
+ final FootnoteRefArea footArea = bac.getFootnoteRefArea();
try {
layoutFootnoteSeparator(bac, footArea);
final Status status = layout(footArea, graftingPoint);
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -74,7 +74,7 @@
* @return The allocation height of the cell area.
*/
public int getHeight(final FoContext context) {
- return areaContainer.crBPD()
+ return areaContainer.crBpd()
+ this.node.traitBorderSeparationBPD(context)
- (this.node.traitBorderBeforeWidth(context, true)
+ this.node.traitBorderAfterWidth(context, true))
Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -91,8 +91,8 @@
final int rx = area.brOriginX() + Math.round(startWidth / 2);
final int ry = area.brOriginY() - Math.round(beforeWidth / 2);
- final int w = area.brIPD() - Math.round((startWidth + endWidth) / 2);
- final int h = area.brBPD() - Math.round((beforeWidth + afterWidth) / 2);
+ final int w = area.brIpd() - Math.round((startWidth + endWidth) / 2);
+ final int h = area.brBpd() - Math.round((beforeWidth + afterWidth) / 2);
if (beforeWidth != 0) {
@@ -125,7 +125,7 @@
protected void renderGenericSpace(final GeneralInlineArea area) {
final int startX = area.crOriginX();
int startY;
- final int endX = area.crOriginX() + area.crIPD();
+ final int endX = area.crOriginX() + area.crIpd();
final Font font = area.getPrimaryFont().getFont();
if (area.traitUnderlineScore()) {
startY = getUnderlineYPosition(area);
@@ -204,7 +204,7 @@
}
final int rx = area.crOriginX();
final int ry = area.crOriginY();
- final int w = area.crIPD();
+ final int w = area.crIpd();
final int th = area.traitRuleThickness();
final RuleStyle st = area.traitRuleStyle();
Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -153,8 +153,8 @@
*/
final int x = area.prOriginX();
final int y = area.prOriginY();
- final int w = area.prIPD();
- final int h = area.prBPD();
+ final int w = area.prIpd();
+ final int h = area.prBpd();
if (h == 0 || w == 0) {
return;
@@ -178,8 +178,8 @@
*/
final int x = area.prOriginX();
final int y = area.prOriginY();
- final int w = area.prIPD();
- final int h = area.prBPD();
+ final int w = area.prIpd();
+ final int h = area.prBpd();
if (h == 0 || w == 0) {
return;
@@ -459,7 +459,7 @@
return;
}
final Rectangle contentRect = new Rectangle(area.crOriginX(),
- area.crOriginY(), area.crIPD(), area.crBPD());
+ area.crOriginY(), area.crIpd(), area.crBpd());
drawGraphic(area, graphic, contentRect, null);
}
Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -441,8 +441,8 @@
protected void markBorder(final Area area) {
final int rx = area.brOriginX();
final int ry = area.brOriginY();
- final int w = area.brIPD();
- final int h = area.brBPD();
+ final int w = area.brIpd();
+ final int h = area.brBpd();
if (area.traitBorderBeforeWidth() != 0) {
drawLine(rx, ry, rx + w, ry, -area.traitBorderBeforeWidth(),
@@ -480,8 +480,8 @@
public void render(final ExternalGraphicArea area) {
final int x = area.crOriginX();
final int y = area.crOriginY();
- final int w = area.crIPD();
- final int h = area.crBPD();
+ final int w = area.crIpd();
+ final int h = area.crBpd();
final Graphic img = area.getGraphic();
@@ -514,7 +514,7 @@
if (img instanceof SvgGraphic) {
final SvgGraphic svg = (SvgGraphic) img;
final Rectangle contentRect = new Rectangle(area.crOriginX(),
- area.crOriginY(), area.crIPD(), area.crBPD());
+ area.crOriginY(), area.crIpd(), area.crBpd());
renderSVGDocument(svg,
Renderer.convertMillipointRectangle(contentRect), null);
} else {
@@ -682,7 +682,7 @@
public void render(final LeaderArea area) {
final int rx = area.crOriginX();
final int ry = area.crOriginY();
- final int w = area.crIPD();
+ final int w = area.crIpd();
final int th = area.traitRuleThickness();
final float r = colorToFloat(area.traitColor().getRed());
final float g = colorToFloat(area.traitColor().getGreen());
@@ -714,8 +714,8 @@
public void render(final SvgArea area) {
final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
toPoints(area.crOriginX()), toPoints(area.crOriginY()),
- toPoints(area.crIPD()), toPoints(area.crBPD()));
- renderSVGDocument(area.getSVGGraphic(), contentRectangle, null);
+ toPoints(area.crIpd()), toPoints(area.crBpd()));
+ renderSVGDocument(area.getSvgGraphic(), contentRectangle, null);
}
/**
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 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -523,8 +523,8 @@
public void render(final ExternalGraphicArea area) {
final int x = area.crOriginX();
final int y = area.crOriginY();
- final int w = area.crIPD();
- final int h = area.crBPD();
+ final int w = area.crIpd();
+ final int h = area.crBpd();
final Graphic img = area.getGraphic();
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 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -298,8 +298,8 @@
public void render(final SvgArea area) {
final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
toPoints(area.crOriginX()), toPoints(area.crOriginY()),
- toPoints(area.crIPD()), toPoints(area.crBPD()));
- final SvgGraphic svgGraphic = area.getSVGGraphic();
+ toPoints(area.crIpd()), toPoints(area.crBpd()));
+ final SvgGraphic svgGraphic = area.getSvgGraphic();
getContentStream().drawGraphic(svgGraphic,
contentRectangle, null, this.getFontConsumer(),
getStrokeSVGText());
@@ -506,7 +506,7 @@
externalLink = true;
}
final Rectangle rectangle = new Rectangle(area.brOriginX(),
- area.brOriginY(), area.brIPD(), area.brBPD());
+ area.brOriginY(), area.brIpd(), area.brBpd());
this.currentPage.makeLink(rectangle, area.linkDestination(),
externalLink);
}
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 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -503,8 +503,8 @@
public void render(final SvgArea area) {
final Rectangle2D.Float contentRectangle = new Rectangle2D.Float(
toPoints(area.crOriginX()), toPoints(area.crOriginY()),
- toPoints(area.crIPD()), toPoints(area.crBPD()));
- renderSVGDocument(area.getSVGGraphic(), contentRectangle, area);
+ toPoints(area.crIpd()), toPoints(area.crBpd()));
+ renderSVGDocument(area.getSvgGraphic(), contentRectangle, area);
}
/**
@@ -961,7 +961,7 @@
public void render(final LeaderArea area) {
final int rx = area.crOriginX();
final int ry = area.crOriginY();
- final int w = area.crIPD();
+ final int w = area.crIpd();
byte divisor = 1;
final int ruleThickness = area.traitRuleThickness();
divisor ++;
@@ -1058,7 +1058,7 @@
getLogger().error("Leader use-content: Not yet implemented");
break;
}
- write(area.crIPD() + " 0 RM");
+ write(area.crIpd() + " 0 RM");
}
/**
@@ -1074,8 +1074,8 @@
protected void markBorder(final Area area) {
final int rx = area.brOriginX();
final int ry = area.brOriginY();
- final int w = area.crIPD();
- final int h = area.crBPD();
+ final int w = area.crIpd();
+ final int h = area.crBpd();
if (area.traitBorderBeforeWidth() != 0) {
write("newpath");
Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -345,8 +345,8 @@
protected void markBorder(final Area area) {
final int rx = area.brOriginX();
final int ry = area.brOriginY();
- final int w = area.crIPD();
- final int h = area.crBPD();
+ final int w = area.crIpd();
+ final int h = area.crBpd();
if (area.traitBorderBeforeWidth() != 0) {
drawLine(rx, ry, rx + w, ry, area.traitBorderBeforeWidth(),
@@ -376,7 +376,7 @@
*/
protected Rectangle2D getBounds(final Area area) {
return new Rectangle2D.Double(area.crOriginX(), area.crOriginY(),
- area.crIPD(), area.crBPD());
+ area.crIpd(), area.crBpd());
}
/**
@@ -401,8 +401,8 @@
public void render(final ExternalGraphicArea area) {
final int x = area.crOriginX();
final int y = area.crOriginY();
- final int w = area.crIPD();
- final int h = area.crBPD();
+ final int w = area.crIpd();
+ final int h = area.crBpd();
final Graphic img = area.getGraphic();
@@ -562,7 +562,7 @@
public void render(final SvgArea area) {
final float x = toPoints(area.crOriginX());
final float y = this.pageHeight - toPoints(area.crOriginY());
- final SvgGraphic svgGraphic = area.getSVGGraphic();
+ final SvgGraphic svgGraphic = area.getSvgGraphic();
renderSVGDocument(svgGraphic, x, y);
}
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 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -487,8 +487,8 @@
public void render(final ExternalGraphicArea area) {
final int x = area.crOriginX();
final int y = area.crOriginY();
- final int w = area.crIPD();
- final int h = area.crBPD();
+ final int w = area.crIpd();
+ final int h = area.crBpd();
final Graphic img = area.getGraphic();
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 2007-07-02 17:36:55 UTC (rev 9907)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2007-07-02 18:22:30 UTC (rev 9908)
@@ -648,8 +648,8 @@
final StringBuilder buffer = new StringBuilder();
outputAttribute(buffer, "x", area.brOriginX());
outputAttribute(buffer, "y", area.brOriginY());
- outputAttribute(buffer, "ipd", area.brIPD());
- outputAttribute(buffer, "bpd", area.brBPD());
+ outputAttribute(buffer, "ipd", area.brIpd());
+ outputAttribute(buffer, "bpd", area.brBpd());
this.writeEmptyElement("border-rectangle", buffer);
}
@@ -666,8 +666,8 @@
final StringBuilder buffer = new StringBuilder();
outputAttribute(buffer, "x", backgroundArea.prOriginX());
outputAttribute(buffer, "y", backgroundArea.prOriginY());
- outputAttribute(buffer, "ipd", backgroundArea.prIPD());
- outputAttribute(buffer, "bpd", backgroundArea.prBPD());
+ outputAttribute(buffer, "ipd", backgroundArea.prIpd());
+ outputAttribute(buffer, "bpd", backgroundArea.prBpd());
this.writeEmptyElement("padding-rectangle", buffer);
}
@@ -680,8 +680,8 @@
final StringBuilder buffer = new StringBuilder();
outputAttribute(buffer, "x", area.crOriginX());
outputAttribute(buffer, "y", area.crOriginY());
- outputAttribute(buffer, "ipd", area.crIPD());
- outputAttribute(buffer, "bpd", area.crBPD());
+ outputAttribute(buffer, "ipd", area.crIpd());
+ outputAttribute(buffer, "bpd", area.crBpd());
this.writeEmptyElement("content-rectangle", buffer);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
