From c3abce87cd7b4c2b37534f7c1516dfb9417faa10 Mon Sep 17 00:00:00 2001 From: Finn Bock Date: Thu, 26 Feb 2004 15:39:15 +0000 Subject: [PATCH] Made redundant by the expresion tree. PR: 26778 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197381 13f79535-47bb-0310-9956-ffa450edef68 --- .../properties/LinearCombinationLength.java | 99 ------------ .../apache/fop/fo/properties/MixedLength.java | 150 ------------------ 2 files changed, 249 deletions(-) delete mode 100644 src/java/org/apache/fop/fo/properties/LinearCombinationLength.java delete mode 100644 src/java/org/apache/fop/fo/properties/MixedLength.java diff --git a/src/java/org/apache/fop/fo/properties/LinearCombinationLength.java b/src/java/org/apache/fop/fo/properties/LinearCombinationLength.java deleted file mode 100644 index 898bf45ee..000000000 --- a/src/java/org/apache/fop/fo/properties/LinearCombinationLength.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * $Id$ - * ============================================================================ - * 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 . For more information on the Apache - * Software Foundation, please see . - */ -package org.apache.fop.fo.properties; - -import java.util.Vector; - -import org.apache.fop.datatypes.Length; - -/** - * Class modelling lengths that are build up by combining other lengths - */ -public class LinearCombinationLength extends LengthProperty { - - /** Collection of factors (1-1 correspondence with {@link #lengths} */ - protected Vector factors; - /** Collection of Length objects (1-1 correspondence with {@link #factors} */ - protected Vector lengths; - - /** - * Constructor. Creates no content. Use {link #addTerm} to build content. - */ - public LinearCombinationLength() { - factors = new Vector(); - lengths = new Vector(); - } - - /** - * Add an item to this - * @param factor the factor to be added - * @param length the Length to be added - */ - public void addTerm(double factor, LengthProperty length) { - factors.addElement(new Double(factor)); - lengths.addElement(length); - } - - /** - * Sets the computed value in millipoints. - */ - protected void computeValue() { - int result = 0; - int numFactors = factors.size(); - for (int i = 0; i < numFactors; ++i) { - result += - (int)(((Double)factors.elementAt(i)).doubleValue() - * (double)((Length)lengths.elementAt(i)).getValue()); - } - setComputedValue(result); - } - -} diff --git a/src/java/org/apache/fop/fo/properties/MixedLength.java b/src/java/org/apache/fop/fo/properties/MixedLength.java deleted file mode 100644 index 971991121..000000000 --- a/src/java/org/apache/fop/fo/properties/MixedLength.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * $Id$ - * ============================================================================ - * 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 . For more information on the Apache - * Software Foundation, please see . - */ -package org.apache.fop.fo.properties; - -import java.util.Enumeration; -import java.util.Vector; - -import org.apache.fop.fo.expr.NumericProperty; -import org.apache.fop.fo.expr.PropertyException; - -/** - * A length quantity in XSL which is specified with a mixture - * of absolute and relative and/or percent components. - * The actual value may not be computable before layout is done. - */ -public class MixedLength extends LengthProperty { - - /** The collection of Length objects comprising this MixedLength object */ - private Vector lengths ; - - /** - * Constructor - * @param lengths the collection of Length objects which comprise the new - * MixedLength object - */ - public MixedLength(Vector lengths) { - this.lengths = lengths; - } - - /** - * Iterates through each internal component, computing and - * summarizing the values, then setting the value for this - */ - protected void computeValue() { - int computedValue = 0; - boolean bAllComputed = true; - Enumeration e = lengths.elements(); - while (e.hasMoreElements()) { - LengthProperty l = (LengthProperty) e.nextElement(); - computedValue += l.getValue(); - if (!l.isComputed()) { - bAllComputed = false; - } - } - setComputedValue(computedValue, bAllComputed); - } - - - public double getTableUnits() { - double tableUnits = 0.0; - Enumeration e = lengths.elements(); - while (e.hasMoreElements()) { - tableUnits += ((LengthProperty) e.nextElement()).getTableUnits(); - } - return tableUnits; - } - - public void resolveTableUnit(double dTableUnit) { - Enumeration e = lengths.elements(); - while (e.hasMoreElements()) { - ((LengthProperty) e.nextElement()).resolveTableUnit(dTableUnit); - } - } - - /** - * @return String equivalent of this - */ - public String toString() { - StringBuffer sbuf = new StringBuffer(); - Enumeration e = lengths.elements(); - while (e.hasMoreElements()) { - if (sbuf.length() > 0) { - sbuf.append('+'); - } - sbuf.append(e.nextElement().toString()); - } - return sbuf.toString(); - } - - /** - * @return Numeric equivalent of this - */ - public NumericProperty asNumeric() { - NumericProperty numeric = null; - for (Enumeration e = lengths.elements(); e.hasMoreElements();) { - LengthProperty l = (LengthProperty) e.nextElement(); - if (numeric == null) { - numeric = l.asNumeric(); - } else { - try { - NumericProperty sum = numeric.add(l.asNumeric()); - numeric = sum; - } catch (PropertyException pe) { - System.err.println( - "Can't convert MixedLength to Numeric: " + pe); - } - } - } - return numeric; - } -} - -- 2.39.5