You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by gm...@apache.org on 2004/01/17 23:02:03 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AddLMVisitor.java
gmazza 2004/01/17 14:02:03
Modified: src/java/org/apache/fop/datatypes Keep.java LengthPair.java
src/java/org/apache/fop/fo/flow Leader.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
Bug 25873 (from Finn Bock): Minor code cleanup issues.
Revision Changes Path
1.7 +1 -1 xml-fop/src/java/org/apache/fop/datatypes/Keep.java
Index: Keep.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Keep.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Keep.java 7 Jan 2004 21:10:36 -0000 1.6
+++ Keep.java 17 Jan 2004 22:02:03 -0000 1.7
@@ -51,7 +51,7 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.Property;
-import org.apache.fop.fo.Constants;
+
/**
* XSL FO Keep Property datatype (keep-together, etc)
1.6 +1 -1 xml-fop/src/java/org/apache/fop/datatypes/LengthPair.java
Index: LengthPair.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/LengthPair.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LengthPair.java 7 Jan 2004 21:10:37 -0000 1.5
+++ LengthPair.java 17 Jan 2004 22:02:03 -0000 1.6
@@ -51,7 +51,7 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.Property;
-import org.apache.fop.fo.Constants;
+
/**
* Models a pair of lengths, one specifiying the dimensions for the
1.21 +1 -3 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Leader.java 17 Jan 2004 19:29:46 -0000 1.20
+++ Leader.java 17 Jan 2004 22:02:03 -0000 1.21
@@ -62,7 +62,6 @@
import org.apache.fop.fo.properties.CommonBorderAndPadding;
import org.apache.fop.fo.properties.CommonMarginInline;
import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.fo.properties.FOPropertyMapping;
import org.apache.fop.fonts.Font;
/**
@@ -163,9 +162,8 @@
}
- public int getLength(String prop, int dim) {
+ public int getLength(int propId, int dim) {
int length;
- int propId = FOPropertyMapping.getPropertyId(prop);
Length maxlength = propertyList.get(propId).getLength();
if (maxlength instanceof PercentLength) {
length = (int)(((PercentLength)maxlength).value()
1.29 +4 -4 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- AddLMVisitor.java 17 Jan 2004 19:29:46 -0000 1.28
+++ AddLMVisitor.java 17 Jan 2004 22:02:03 -0000 1.29
@@ -356,9 +356,9 @@
public MinOptMax getLeaderAllocIPD(Leader node, int ipd) {
// length of the leader
- int opt = node.getLength("leader-length.optimum", ipd);
- int min = node.getLength("leader-length.minimum", ipd);
- int max = node.getLength("leader-length.maximum", ipd);
+ int opt = node.getLength(Constants.PR_LEADER_LENGTH | Constants.CP_OPTIMUM, ipd);
+ int min = node.getLength(Constants.PR_LEADER_LENGTH | Constants.CP_MINIMUM, ipd);
+ int max = node.getLength(Constants.PR_LEADER_LENGTH | Constants.CP_MAXIMUM, ipd);
return new MinOptMax(min, opt, max);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org