[FOray-commit] SF.net SVN: foray: [9140] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [9140] trunk/foray
|
From: <vic...@us...> - 2007-04-07 22:04:40
|
Revision: 9140
http://svn.sourceforge.net/foray/?rev=9140&view=rev
Author: victormote
Date: 2007-04-07 15:04:34 -0700 (Sat, 07 Apr 2007)
Log Message:
-----------
Conform to axsl changes removing an interface.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-04-07 20:24:23 UTC (rev 9139)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-04-07 22:04:34 UTC (rev 9140)
@@ -955,10 +955,10 @@
if (enumProperty != null) {
switch(enumProperty.getValue(context, fobj)) {
case AUTO: {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
case AVOID: {
- return org.axsl.foR.Keep.ALWAYS;
+ return Integer.MAX_VALUE;
}
}
}
@@ -1018,19 +1018,19 @@
if (enumProperty != null) {
switch(enumProperty.getValue(context, fobj)) {
case AUTO: {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
case ALWAYS: {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
case AVOID: {
- return org.axsl.foR.Keep.ALWAYS;
+ return Integer.MAX_VALUE;
}
case LEFT: {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
case RIGHT: {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
}
}
@@ -1090,19 +1090,19 @@
if (enumProperty != null) {
switch(enumProperty.getValue(context, fobj)) {
case AUTO: {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
case ALWAYS: {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
case AVOID: {
- return org.axsl.foR.Keep.ALWAYS;
+ return Integer.MAX_VALUE;
}
case LEFT: {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
case RIGHT: {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
}
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java 2007-04-07 20:24:23 UTC (rev 9139)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java 2007-04-07 22:04:34 UTC (rev 9140)
@@ -121,10 +121,10 @@
subProperty, fobj);
}
case AUTO: {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
case ALWAYS: {
- return org.axsl.foR.Keep.ALWAYS;
+ return Integer.MAX_VALUE;
}
}
}
@@ -152,7 +152,7 @@
final FObj fobj) {
// keep-together is inherited, the others are not
if (propertyType != FoProperty.KEEP_TOGETHER) {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
return getValueInherited(context, propertyType, subProperty, fobj);
}
@@ -162,7 +162,7 @@
final FObj fobj) {
final FObj parent = fobj.effectiveParent(context);
if (parent == null) {
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
switch (propertyType) {
case KEEP_TOGETHER: {
@@ -205,7 +205,7 @@
}
}
}
- return org.axsl.foR.Keep.AUTO;
+ return Integer.MIN_VALUE;
}
protected FoValue[] getValidKeywords() {
@@ -252,12 +252,12 @@
switch (kwIndex) {
case AUTO: {
setComponent(keepDT, subPropertyName,
- org.axsl.foR.Keep.AUTO);
+ Integer.MIN_VALUE);
return keepDT;
}
case ALWAYS: {
setComponent(keepDT, subPropertyName,
- org.axsl.foR.Keep.ALWAYS);
+ Integer.MAX_VALUE);
return keepDT;
}
default: {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java 2007-04-07 20:24:23 UTC (rev 9139)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java 2007-04-07 22:04:34 UTC (rev 9140)
@@ -28,8 +28,6 @@
package org.foray.fotree.value;
-import org.axsl.foR.Keep;
-
/**
* A keep datatype in XSL. Used for the XSL-FO properties keep-together,
* keep-with-next, and keep-with-previous. This datatype is
@@ -80,7 +78,8 @@
* @return A new, default SpaceDT instance.
*/
public static DtKeep createKeepDT() {
- return new DtKeep(Keep.AUTO, Keep.AUTO, Keep.AUTO);
+ return new DtKeep(Integer.MIN_VALUE, Integer.MIN_VALUE,
+ Integer.MIN_VALUE);
}
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2007-04-07 20:24:23 UTC (rev 9139)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2007-04-07 22:04:34 UTC (rev 9140)
@@ -33,7 +33,6 @@
import org.axsl.areaW.AreaWException;
import org.axsl.areaW.TableRowContainer;
import org.axsl.foR.fo.FoValue;
-import org.axsl.foR.Keep;
import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.foR.fo.TableCell;
import org.axsl.foR.fo.TableRow;
@@ -102,7 +101,8 @@
final int rowSpan = cell.traitNumberRowsSpanned();
final Status status = cellPL.layout(rowContainer, retrieveMarker);
if (status.isIncomplete()) {
- if ((this.node.traitKeepTogetherWithinColumn(area) == Keep.ALWAYS
+ if ((this.node.traitKeepTogetherWithinColumn(area)
+ == Integer.MAX_VALUE
&& ignoreKeepTogether == false)
|| (status == Status.AREA_FULL_NONE)
|| rowSpan > 1) {
@@ -157,7 +157,7 @@
setProgress(FONodePL.BREAK_AFTER);
return Status.FORCE_COLUMN_BREAK;
}
- if (this.node.traitKeepWithNextWithinColumn(area) > Keep.AUTO) {
+ if (this.node.traitKeepWithNextWithinColumn(area) > Integer.MIN_VALUE) {
return Status.KEEP_WITH_NEXT;
}
return Status.OK;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
