Phase 3 (last) of bug 26434.

- Move the property classes to fop.fo.properties.

PR: 26434


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

1 files changed, 159 insertions, 0 deletions

diff --git a/src/java/org/apache/fop/fo/properties/NumberProperty.java b/src/java/org/apache/fop/fo/properties/NumberProperty.java
new file mode 100644
index 000000000..cccb86ddf
--- /dev/null
+++ b/src/java/org/apache/fop/fo/properties/NumberProperty.java
@@ -0,0 +1,159 @@
+/*
+ * $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 <jtauber@jtauber.com>. For more information on the Apache
+ * Software Foundation, please see <http://www.apache.org/>.
+ */
+package org.apache.fop.fo.properties;
+
+import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.PropertyList;
+import org.apache.fop.fo.expr.NumericProperty;
+
+/**
+ * Class for handling numeric properties
+ */
+public class NumberProperty extends Property {
+
+    /**
+     * Inner class for making NumberProperty objects
+     */
+    public static class Maker extends PropertyMaker {
+
+        /**
+         * Constructor for NumberProperty.Maker
+         * @param propName the name of the property
+         */
+        public Maker(int propId) {
+            super(propId);
+        }
+
+        /**
+         * @see Property.Maker#convertProperty
+         */
+        public Property convertProperty(Property p,
+                                        PropertyList propertyList, FObj fo) {
+            if (p instanceof NumberProperty) {
+                return p;
+            }
+            Number val = p.getNumber();
+            if (val != null) {
+                return new NumberProperty(val);
+            }
+            return convertPropertyDatatype(p, propertyList, fo);
+        }
+
+    }
+
+    private Number number;
+
+    /**
+     * Constructor for Number input
+     * @param num Number object value for property
+     */
+    public NumberProperty(Number num) {
+        this.number = num;
+    }
+
+    /**
+     * Constructor for double input
+     * @param num double numeric value for property
+     */
+    public NumberProperty(double num) {
+        this.number = new Double(num);
+    }
+
+    /**
+     * Constructor for integer input
+     * @param num integer numeric value for property
+     */
+    public NumberProperty(int num) {
+        this.number = new Integer(num);
+    }
+
+    /**
+     * @return this.number cast as a Number
+     */
+    public Number getNumber() {
+        return this.number;
+    }
+
+    /**
+     * public Double getDouble() {
+     * return new Double(this.number.doubleValue());
+     * }
+     * public Integer getInteger() {
+     * return new Integer(this.number.intValue());
+     * }
+     */
+
+    /**
+     * @return this.number cast as an Object
+     */
+    public Object getObject() {
+        return this.number;
+    }
+
+    /**
+     * Convert NumberProperty to Numeric object
+     * @return Numeric object corresponding to this
+     */
+    public NumericProperty getNumeric() {
+        return new NumericProperty(this.number);
+    }
+
+    /**
+     * Convert NumberProperty to a ColorType. Not sure why this is needed.
+     * @return ColorType that corresponds to black
+     */
+    public ColorTypeProperty getColorType() {
+        // Convert numeric value to color ???
+        // Convert to hexadecimal and then try to make it into a color?
+        return new ColorTypeProperty((float)0.0, (float)0.0, (float)0.0);
+    }
+
+}