Create penalty only once and store it in WhitespaceManagementPenalty

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

2 files changed, 5 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
index 8b8cc4982..db849a40f 100644
--- a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
+++ b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
@@ -600,7 +600,7 @@ class PageBreakingAlgorithm extends BreakingAlgorithm {
     private int handleWhitespaceManagementPenalty(KnuthPageNode activeNode,
             WhitespaceManagementPenalty penalty, int elementIndex) {
         for (Variant var : penalty.getVariants()) {
-            int difference = computeDifference(activeNode, var.toPenalty(), elementIndex);
+            int difference = computeDifference(activeNode, var.getPenalty(), elementIndex);
             double r = computeAdjustmentRatio(activeNode, difference);
             if (r >= -1.0) {
                 activeNode.addVariant(var);
diff --git a/src/java/org/apache/fop/layoutmgr/WhitespaceManagementPenalty.java b/src/java/org/apache/fop/layoutmgr/WhitespaceManagementPenalty.java
index 20c83d205..e34d24b9a 100644
--- a/src/java/org/apache/fop/layoutmgr/WhitespaceManagementPenalty.java
+++ b/src/java/org/apache/fop/layoutmgr/WhitespaceManagementPenalty.java
@@ -36,14 +36,16 @@ public class WhitespaceManagementPenalty extends KnuthPenalty {
 
         public final List<ListElement> knuthList;
         public final int width;
+        private final KnuthPenalty penalty;
 
         public Variant(List<ListElement> knuthList, int width) {
             this.knuthList = knuthList;
             this.width = width;
+            this.penalty = new KnuthPenalty(width, 0, false, null, false);
         }
 
-        public KnuthElement toPenalty() {
-            return new KnuthPenalty(width, 0, false, null, false);
+        public KnuthElement getPenalty() {
+            return penalty;
         }
 
         public WhitespaceManagementPenalty getWhitespaceManagementPenalty() {