Fourth phase of performance improvement.

- fix temporary renamed property getter method.

PR: 31699

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

diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java
index c6cdf15b6a162a68e7cb3aa102e02124570c8483..2650937cfaab3108c17946314b87c6f121a0da9e 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Leader.java
+++ b/src/java/org/apache/fop/fo/flow/Leader.java
@@ -155,18 +155,10 @@ public class Leader extends FObjMixed {
         return length;
     }
 
-    public int getRuleThickness() {
-        return ruleThickness.getValue();
-    }
-
     public Font getFontState() {
         return commonFont.getFontState(getFOEventHandler().getFontInfo());
     }
 
-    public int getPatternWidth() {
-        return leaderPatternWidth.getValue();
-    }
-
     /**
      * Return the Common Font Properties.
      */
@@ -190,9 +182,8 @@ public class Leader extends FObjMixed {
 
     /**
      * Return the "rule-thickness" property.
-     * TODO: 31699
      */
-    public Length ___getRuleThickness() {
+    public Length getRuleThickness() {
         return ruleThickness;
     }
 

diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java
index 439f1888792461dacc5f4133aeeac936009776d1..5da858d953f7826023a51e26864a4d4a3762b19d 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableRow.java
+++ b/src/java/org/apache/fop/fo/flow/TableRow.java
@@ -151,9 +151,8 @@ public class TableRow extends FObj {
 
     /**
      * Return the "keep-with-previous" property.
-     * TODO: 31699
      */
-    public KeepProperty ___getKeepWithPrevious() {
+    public KeepProperty getKeepWithPrevious() {
         return keepWithPrevious;
     }
 

diff --git a/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java b/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
index eedbd568c412eb4c7275e992b47154a522900fc3..554c8877a89b318918c4a5fd5b8c0becc3bbd998 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
@@ -75,7 +75,7 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager {
             org.apache.fop.area.inline.Leader leader = 
                 new org.apache.fop.area.inline.Leader();
             leader.setRuleStyle(fobj.getRuleStyle());
-            leader.setRuleThickness(fobj.getRuleThickness());
+            leader.setRuleThickness(fobj.getRuleThickness().getValue());
             leaderArea = leader;
         } else if (fobj.getLeaderPattern() == LeaderPattern.SPACE) {
             leaderArea = new Space();
@@ -90,10 +90,10 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager {
             t.setOffset(font.getAscender());
             int width = font.getCharWidth(dot);
             Space spacer = null;
-            if (fobj.getPatternWidth() > width) {
+            if (fobj.getLeaderPatternWidth().getValue() > width) {
                 spacer = new Space();
-                spacer.setIPD(fobj.getPatternWidth() - width);
-                width = fobj.getPatternWidth();
+                spacer.setIPD(fobj.getLeaderPatternWidth().getValue() - width);
+                width = fobj.getLeaderPatternWidth().getValue();
             }
             FilledArea fa = new FilledArea();
             fa.setUnitWidth(width);
@@ -127,10 +127,10 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager {
             clm.fillArea(lm);
             int width = clm.getStackingSize();
             Space spacer = null;
-            if (fobj.getPatternWidth() > width) {
+            if (fobj.getLeaderPatternWidth().getValue() > width) {
                 spacer = new Space();
-                spacer.setIPD(fobj.getPatternWidth() - width);
-                width = fobj.getPatternWidth();
+                spacer.setIPD(fobj.getLeaderPatternWidth().getValue() - width);
+                width = fobj.getLeaderPatternWidth().getValue();
             }
             fa.setUnitWidth(width);
             if (spacer != null) {