1 files changed, 64 insertions, 18 deletions

diff --git a/src/org/apache/fop/layout/BorderAndPadding.java b/src/org/apache/fop/layout/BorderAndPadding.java
index 3c3719d5d..09fc1467f 100644
--- a/src/org/apache/fop/layout/BorderAndPadding.java
+++ b/src/org/apache/fop/layout/BorderAndPadding.java
@@ -1,10 +1,53 @@
 /*
  * $Id$
- * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
- * For details on use and redistribution please refer to the
- * LICENSE file included with these sources.
- */
-
+ * ============================================================================
+ *                    The Apache Software License, Version 1.1
+ * ============================================================================
+ * 
+ * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * 3. The end-user documentation included with the redistribution, if any, must
+ *    include the following acknowledgment: "This product includes software
+ *    developed by the Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself, if
+ *    and wherever such third-party acknowledgments normally appear.
+ * 
+ * 4. The names "FOP" and "Apache Software Foundation" must not be used to
+ *    endorse or promote products derived from this software without prior
+ *    written permission. For written permission, please contact
+ *    apache@apache.org.
+ * 
+ * 5. Products derived from this software may not be called "Apache", nor may
+ *    "Apache" appear in their name, without prior written permission of the
+ *    Apache Software Foundation.
+ * 
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ============================================================================
+ * 
+ * This software consists of voluntary contributions made by many individuals
+ * on behalf of the Apache Software Foundation and was originally created by
+ * James Tauber <jtauber@jtauber.com>. For more information on the Apache
+ * Software Foundation, please see <http://www.apache.org/>.
+ */ 
 package org.apache.fop.layout;
 
 import org.apache.fop.datatypes.ColorType;
@@ -24,12 +67,12 @@ public class BorderAndPadding implements Cloneable {
     public static final int RIGHT = END;
 
     private static class ResolvedCondLength implements Cloneable {
-        int iLength; // Resolved length value
-        boolean bDiscard;
+        private int iLength; // Resolved length value
+        private boolean bDiscard;
 
-        ResolvedCondLength(CondLength length) {
+        public ResolvedCondLength(CondLength length) {
             bDiscard = length.isDiscard();
-            iLength = length.mvalue();
+            iLength = length.getLengthValue();
         }
 
         public Object clone() throws CloneNotSupportedException {
@@ -80,7 +123,8 @@ public class BorderAndPadding implements Cloneable {
     private BorderInfo[] borderInfo = new BorderInfo[4];
     private ResolvedCondLength[] padding = new ResolvedCondLength[4];
 
-    public BorderAndPadding() {}
+    public BorderAndPadding() {
+    }
 
     public void setBorder(int side, int style, CondLength width,
                           ColorType color) {
@@ -133,9 +177,9 @@ public class BorderAndPadding implements Cloneable {
 
 
     public int getBorderWidth(int side, boolean bDiscard) {
-        if ((borderInfo[side] == null) ||
-                (borderInfo[side].mStyle == Constants.NONE) ||
-                (bDiscard && borderInfo[side].mWidth.bDiscard)) {
+        if ((borderInfo[side] == null)
+                || (borderInfo[side].mStyle == Constants.NONE)
+                || (bDiscard && borderInfo[side].mWidth.bDiscard)) {
             return 0;
         } else {
             return borderInfo[side].mWidth.iLength;
@@ -145,23 +189,25 @@ public class BorderAndPadding implements Cloneable {
     public ColorType getBorderColor(int side) {
         if (borderInfo[side] != null) {
             return borderInfo[side].mColor;
-        } else
+        } else {
             return null;
+        }
     }
 
     public int getBorderStyle(int side) {
         if (borderInfo[side] != null) {
             return borderInfo[side].mStyle;
-        } else
+        } else {
             return 0;
+        }
     }
 
     public int getPadding(int side, boolean bDiscard) {
-        if ((padding[side] == null) ||
-                (bDiscard && padding[side].bDiscard)) {
+        if ((padding[side] == null) || (bDiscard && padding[side].bDiscard)) {
             return 0;
-        } else
+        } else {
             return padding[side].iLength;
+        }
     }
 
 }