Third phase of performance improvement.

- Functionality moved into CommonBorderPaddingBackground.

PR: 31699


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

1 files changed, 0 insertions, 204 deletions

diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java b/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java
deleted file mode 100644
index 244749586..000000000
--- a/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.fo.properties;
-
-import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.fo.Constants;
-
-/**
- * Stores all common border and padding properties.
- * See Sec. 7.7 of the XSL-FO Standard.
- */
-public class CommonBorderAndPadding implements Cloneable {
-
-    public static final int BEFORE = 0;
-    public static final int AFTER = 1;
-    public static final int START = 2;
-    public static final int END = 3;
-
-/*  TODO: need new definitions (below relations not always the same, 
-    also unsure if direct access of absolute properties needed; 
-    resolution of absolute & relative properties--Spec 5.3.1--can 
-    possibly be done within this class alone)
-    public static final int TOP = BEFORE;
-    public static final int BOTTOM = AFTER;
-    public static final int LEFT = START;
-    public static final int RIGHT = END;
-*/
-    private static class ResolvedCondLength implements Cloneable {
-        private int iLength; // Resolved length value
-        private boolean bDiscard;
-
-        public ResolvedCondLength(CondLengthProperty length) {
-            bDiscard = length.isDiscard();
-            iLength = length.getLengthValue();
-        }
-
-        public Object clone() throws CloneNotSupportedException {
-            return super.clone();
-        }
-
-    }
-
-    /**
-     * Return a full copy of the BorderAndPadding information. This clones all
-     * padding and border information.
-     * @see java.lang.Object#clone()
-     */
-    public Object clone() throws CloneNotSupportedException {
-        CommonBorderAndPadding bp = (CommonBorderAndPadding) super.clone();
-        bp.padding = (ResolvedCondLength[]) padding.clone();
-        bp.borderInfo = (BorderInfo[]) borderInfo.clone();
-        for (int i = 0; i < padding.length; i++) {
-            if (padding[i] != null) {
-                bp.padding[i] = (ResolvedCondLength) padding[i].clone();
-            }
-            if (borderInfo[i] != null) {
-                bp.borderInfo[i] = (BorderInfo) borderInfo[i].clone();
-            }
-        }
-        return bp;
-    }
-
-    public static class BorderInfo implements Cloneable {
-        private int mStyle; // Enum for border style
-        private ColorType mColor; // Border color
-        private ResolvedCondLength mWidth;
-
-        BorderInfo(int style, CondLengthProperty width, ColorType color) {
-            mStyle = style;
-            mWidth = new ResolvedCondLength(width);
-            mColor = color;
-        }
-
-        public Object clone() throws CloneNotSupportedException {
-            BorderInfo bi = (BorderInfo) super.clone();
-            bi.mWidth = (ResolvedCondLength) mWidth.clone();
-            // do we need to clone the Color too???
-            return bi;
-        }
-    }
-
-    private BorderInfo[] borderInfo = new BorderInfo[4];
-    private ResolvedCondLength[] padding = new ResolvedCondLength[4];
-
-    public void setBorder(int side, int style, CondLengthProperty width,
-                          ColorType color) {
-        borderInfo[side] = new BorderInfo(style, width, color);
-    }
-
-    public void setPadding(int side, CondLengthProperty width) {
-        padding[side] = new ResolvedCondLength(width);
-    }
-
-    public void setPaddingLength(int side, int iLength) {
-        padding[side].iLength = iLength;
-    }
-
-    public void setBorderLength(int side, int iLength) {
-        borderInfo[side].mWidth.iLength = iLength;
-    }
-
-    public int getBorderStartWidth(boolean bDiscard) {
-        return getBorderWidth(START, bDiscard);
-    }
-
-    public int getBorderEndWidth(boolean bDiscard) {
-        return getBorderWidth(END, bDiscard);
-    }
-
-    public int getBorderBeforeWidth(boolean bDiscard) {
-        return getBorderWidth(BEFORE, bDiscard);
-    }
-
-    public int getBorderAfterWidth(boolean bDiscard) {
-        return getBorderWidth(AFTER, bDiscard);
-    }
-
-    public int getPaddingStart(boolean bDiscard) {
-        return getPadding(START, bDiscard);
-    }
-
-    public int getPaddingEnd(boolean bDiscard) {
-        return getPadding(END, bDiscard);
-    }
-
-    public int getPaddingBefore(boolean bDiscard) {
-        return getPadding(BEFORE, bDiscard);
-    }
-
-    public int getPaddingAfter(boolean bDiscard) {
-        return getPadding(AFTER, bDiscard);
-    }
-
-    public int getBorderWidth(int side, boolean bDiscard) {
-        if ((borderInfo[side] == null)
-                || (borderInfo[side].mStyle == Constants.NONE)
-                || (bDiscard && borderInfo[side].mWidth.bDiscard)) {
-            return 0;
-        } else {
-            return borderInfo[side].mWidth.iLength;
-        }
-    }
-
-    public ColorType getBorderColor(int side) {
-        if (borderInfo[side] != null) {
-            return borderInfo[side].mColor;
-        } else {
-            return null;
-        }
-    }
-
-    public int getBorderStyle(int side) {
-        if (borderInfo[side] != null) {
-            return borderInfo[side].mStyle;
-        } else {
-            return 0;
-        }
-    }
-
-    public int getPadding(int side, boolean bDiscard) {
-        if ((padding[side] == null) || (bDiscard && padding[side].bDiscard)) {
-            return 0;
-        } else {
-            return padding[side].iLength;
-        }
-    }
-
-    /**
-     * Return all the border and padding height in the block progression 
-     * dimension.
-     * @param bDiscard the discard flag.
-     * @return all the padding and border height.
-     */
-    public int getBPPaddingAndBorder(boolean bDiscard) {
-        return getPaddingBefore(bDiscard) + getPaddingAfter(bDiscard) +
-               getBorderBeforeWidth(bDiscard) + getBorderAfterWidth(bDiscard);        
-    }
-
-    public String toString() {
-        return "CommonBordersAndPadding (Before, After, Start, End):\n" +
-        "Borders: (" + getBorderBeforeWidth(false) + ", " + getBorderAfterWidth(false) + ", " +
-        getBorderStartWidth(false) + ", " + getBorderEndWidth(false) + ")\n" +
-        "Border Colors: (" + getBorderColor(BEFORE) + ", " + getBorderColor(AFTER) + ", " +
-        getBorderColor(START) + ", " + getBorderColor(END) + ")\n" +
-        "Padding: (" + getPaddingBefore(false) + ", " + getPaddingAfter(false) + ", " +
-        getPaddingStart(false) + ", " + getPaddingEnd(false) + ")\n";
-    }
-}