Bug 25873 (from Finn Bock): Minor code cleanup issues.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197214 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/datatypes/Keep.java b/src/java/org/apache/fop/datatypes/Keep.java
index 3c68ad5e66e151ea9f49d14176f3decc9560e141..09fb3148392ec9721b9db5482d3ce8d7f4627906 100644 (file)
--- a/src/java/org/apache/fop/datatypes/Keep.java
+++ b/src/java/org/apache/fop/datatypes/Keep.java
@@ -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)

diff --git a/src/java/org/apache/fop/datatypes/LengthPair.java b/src/java/org/apache/fop/datatypes/LengthPair.java
index ac2de9c8b84d95ff481f8ee13bd50201ffdefe9c..aeb7e1e45d76a9534e2675ecfe29922d607f5e49 100644 (file)
--- a/src/java/org/apache/fop/datatypes/LengthPair.java
+++ b/src/java/org/apache/fop/datatypes/LengthPair.java
@@ -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

diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java
index 55cb47fb6bf2b8256816d4c12ada605cae6b6a1d..bcb745399c36f03d3dabefebdc062ce37afd64c4 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Leader.java
+++ b/src/java/org/apache/fop/fo/flow/Leader.java
@@ -62,7 +62,6 @@ import org.apache.fop.fo.properties.CommonBackground;
 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 class Leader extends FObjMixed {
 
     }
 
-    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()

diff --git a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
index dc3ac02acdd0a4b862bbbaf0d99012e3907550fe..c854c163529cacb1d066d0027bd8d10e64ced7d5 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
+++ b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
@@ -356,9 +356,9 @@ public class AddLMVisitor implements FOTreeVisitor {
 
      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);
      }