[FOray-commit] SF.net SVN: foray: [9037] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
|
From: <vic...@us...> - 2007-03-27 22:14:04
|
Revision: 9037
http://svn.sourceforge.net/foray/?rev=9037&view=rev
Author: victormote
Date: 2007-03-27 15:14:04 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Conform to axsl change renaming method.
Modified Paths:
--------------
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/FootnoteRA.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-areatree/src/java/org/foray/area/SpanRA.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.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-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -1220,7 +1220,7 @@
/**
* {@inheritDoc}
*/
- public abstract int progressionDimensionAvailable();
+ public abstract int pdAvailable();
/**
* {@inheritDoc}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -48,7 +48,7 @@
/**
* {@inheritDoc}
*/
- public int progressionDimensionAvailable() {
+ public int pdAvailable() {
int dimension = brBPD();
final List<AreaNode> children = getChildren();
for (int i = 0; i < children.size(); i++) {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -292,8 +292,8 @@
/**
* {@inheritDoc}
*/
- public int progressionDimensionAvailable() {
- return getParentArea().progressionDimensionAvailable();
+ public int pdAvailable() {
+ return getParentArea().pdAvailable();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -118,11 +118,11 @@
/**
* {@inheritDoc}
*/
- public int progressionDimensionAvailable() {
+ public int pdAvailable() {
/* The amount of space available to the footnote area is what is
* available in the body region. */
final Area parentArea = this.getParentArea();
- return parentArea.progressionDimensionAvailable();
+ return parentArea.pdAvailable();
}
/**
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-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -121,9 +121,9 @@
case START:
return 0;
case END:
- return this.progressionDimensionAvailable();
+ return this.pdAvailable();
case CENTER:
- return this.progressionDimensionAvailable() / 2;
+ return this.pdAvailable() / 2;
case JUSTIFY:
return 0;
case NOT_A_KEYWORD: {
@@ -208,7 +208,7 @@
* as possible.
*/
private void optimizeLeaders() {
- final int unusedSpace = this.progressionDimensionAvailable();
+ final int unusedSpace = this.pdAvailable();
// If line is already justified, no optimization possible.
if (unusedSpace == 0) {
return;
@@ -303,7 +303,7 @@
* Optimize the specified word-spacing.
*/
private void optimizeSpecifiedWordSpacing() {
- final int unusedSpace = this.progressionDimensionAvailable();
+ final int unusedSpace = this.pdAvailable();
// If line is already justified, no optimization possible.
if (unusedSpace == 0) {
return;
@@ -388,7 +388,7 @@
* Optimize the specified word-spacing.
*/
private void optimizeSpecifiedLetterSpacing() {
- final int unusedSpace = this.progressionDimensionAvailable();
+ final int unusedSpace = this.pdAvailable();
// If line is already justified, no optimization possible.
if (unusedSpace == 0) {
return;
@@ -474,7 +474,7 @@
* Optimize this line for implied word-spacing.
*/
private void optimizeImpliedWordSpacing() {
- final int unusedSpace = this.progressionDimensionAvailable();
+ final int unusedSpace = this.pdAvailable();
// If line is already justified, no optimization possible.
if (unusedSpace == 0) {
return;
@@ -658,7 +658,7 @@
* What LineArea needs to report here is its own content rectangle IPD
* less the amount used by its children.
*/
- public int progressionDimensionAvailable() {
+ public int pdAvailable() {
// First, get the total usable line length.
int dimension = crIPD();
// Now, subtract the amount already used by children.
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-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -107,7 +107,7 @@
final int sizeNextLineArea = this.traitFontSize()
+ this.traitHalfLeadingOpt();
if (sizeNextLineArea
- > this.progressionDimensionAvailable()) {
+ > this.pdAvailable()) {
if (allowOverflow) {
final NormalBlockArea newArea = (NormalBlockArea)
this.getOverflowArea(this);
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -280,7 +280,7 @@
+ blockArea.traitGeneratedBy().traitHalfLeadingOpt(this);
if (nf.bpdUsedByChildren()
+ sizeNextLine
- <= this.progressionDimensionAvailable()) {
+ <= this.pdAvailable()) {
return true;
}
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -67,7 +67,7 @@
area.nearestGeneratedByBlockLevelFO();
final int height = realFONode.viewportBPD(area,
parentForDimensions.crBPD());
- if (area.progressionDimensionAvailable()
+ if (area.pdAvailable()
< (height + realFONode.traitSpaceBeforeOptimum(area))) {
return Status.AREA_FULL_NONE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|