vmote 2003/07/17 00:21:08
Modified: src/java/org/apache/fop/fo LengthPairProperty.java
LengthProperty.java LengthRangeProperty.java
ListProperty.java NumberProperty.java
Log:
style changes only
Revision Changes Path
1.2 +28 -10 xml-fop/src/java/org/apache/fop/fo/LengthPairProperty.java
Index: LengthPairProperty.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/LengthPairProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LengthPairProperty.java 11 Mar 2003 13:05:19 -0000 1.1
+++ LengthPairProperty.java 17 Jul 2003 07:21:08 -0000 1.2
@@ -3,34 +3,34 @@
* ============================================================================
* 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
* [EMAIL PROTECTED]
- *
+ *
* 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
@@ -42,20 +42,29 @@
* (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 <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
- */
+ */
package org.apache.fop.fo;
import org.apache.fop.datatypes.LengthPair;
+/**
+ * Superclass for properties wrapping a LengthPair value
+ */
public class LengthPairProperty extends Property {
+ /**
+ * Inner class for creating instances of LengthPairProperty
+ */
public static class Maker extends LengthProperty.Maker {
+ /**
+ * @param name name of property for which this Maker should be created
+ */
protected Maker(String name) {
super(name);
}
@@ -64,14 +73,23 @@
private LengthPair lengthPair;
+ /**
+ * @param lengthPair the LengthPair object to be wrapped in this Property
+ */
public LengthPairProperty(LengthPair lengthPair) {
this.lengthPair = lengthPair;
}
+ /**
+ * @return this.lengthPair
+ */
public LengthPair getLengthPair() {
return this.lengthPair;
}
+ /**
+ * @return this.lengthPair cast as an Object
+ */
public Object getObject() {
return this.lengthPair;
}
1.2 +37 -10 xml-fop/src/java/org/apache/fop/fo/LengthProperty.java
Index: LengthProperty.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/LengthProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LengthProperty.java 11 Mar 2003 13:05:19 -0000 1.1
+++ LengthProperty.java 17 Jul 2003 07:21:08 -0000 1.2
@@ -3,34 +3,34 @@
* ============================================================================
* 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
* [EMAIL PROTECTED]
- *
+ *
* 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
@@ -42,12 +42,12 @@
* (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 <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
- */
+ */
package org.apache.fop.fo;
import org.apache.fop.datatypes.Length;
@@ -55,10 +55,19 @@
import org.apache.fop.fo.expr.Numeric;
import org.apache.fop.apps.FOPException;
+/**
+ * Superclass for properties wrapping a Length value.
+ */
public class LengthProperty extends Property {
+ /**
+ * Inner class for making instances of LengthProperty
+ */
public static class Maker extends Property.Maker {
+ /**
+ * @param name name of property for which Maker should be created
+ */
public /* protected */ Maker(String name) {
super(name);
}
@@ -72,10 +81,16 @@
* }
*/
+ /**
+ * @return false (auto-length is not allowed for Length values)
+ */
protected boolean isAutoLengthAllowed() {
return false;
}
+ /**
+ * @see Property#convertProperty
+ */
public Property convertProperty(Property p,
PropertyList propertyList,
FObj fo) throws FOPException {
@@ -109,19 +124,31 @@
*/
private Length length;
+ /**
+ * @param length Length object to wrap in this
+ */
public LengthProperty(Length length) {
this.length = length;
// System.err.println("Set LengthProperty: " + length.toString());
}
+ /**
+ * @return this.lenght cast as a Numeric
+ */
public Numeric getNumeric() {
return length.asNumeric() ;
}
+ /**
+ * @return this.length
+ */
public Length getLength() {
return this.length;
}
+ /**
+ * @return this.length cast as an Object
+ */
public Object getObject() {
return this.length;
}
1.2 +28 -10 xml-fop/src/java/org/apache/fop/fo/LengthRangeProperty.java
Index: LengthRangeProperty.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/LengthRangeProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LengthRangeProperty.java 11 Mar 2003 13:05:19 -0000 1.1
+++ LengthRangeProperty.java 17 Jul 2003 07:21:08 -0000 1.2
@@ -3,34 +3,34 @@
* ============================================================================
* 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
* [EMAIL PROTECTED]
- *
+ *
* 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
@@ -42,20 +42,29 @@
* (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 <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
- */
+ */
package org.apache.fop.fo;
import org.apache.fop.datatypes.LengthRange;
+/**
+ * Superclass for properties that contain LengthRange values
+ */
public class LengthRangeProperty extends Property {
+ /**
+ * Inner class for a Maker for LengthProperty objects
+ */
public static class Maker extends LengthProperty.Maker {
+ /**
+ * @param name name of property for which to create Maker
+ */
protected Maker(String name) {
super(name);
}
@@ -64,14 +73,23 @@
private LengthRange lengthRange;
+ /**
+ * @param lengthRange LengthRange object to wrap in this
+ */
public LengthRangeProperty(LengthRange lengthRange) {
this.lengthRange = lengthRange;
}
+ /**
+ * @return this.lengthRange
+ */
public LengthRange getLengthRange() {
return this.lengthRange;
}
+ /**
+ * @return this.lengthRange cast as an Object
+ */
public Object getObject() {
return this.lengthRange;
}
1.2 +36 -10 xml-fop/src/java/org/apache/fop/fo/ListProperty.java
Index: ListProperty.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/ListProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ListProperty.java 11 Mar 2003 13:05:19 -0000 1.1
+++ ListProperty.java 17 Jul 2003 07:21:08 -0000 1.2
@@ -3,34 +3,34 @@
* ============================================================================
* 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
* [EMAIL PROTECTED]
- *
+ *
* 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
@@ -42,24 +42,36 @@
* (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 <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
- */
+ */
package org.apache.fop.fo;
import java.util.Vector;
+/**
+ * Superclass for properties that are lists of other properties
+ */
public class ListProperty extends Property {
+ /**
+ * Inner class for creating instances of ListProperty
+ */
public static class Maker extends Property.Maker {
+ /**
+ * @param name name of property for which Maker should be created
+ */
public Maker(String name) {
super(name);
}
+ /**
+ * @see Property#convertProperty
+ */
public Property convertProperty(Property p,
PropertyList propertyList, FObj fo) {
if (p instanceof ListProperty) {
@@ -71,21 +83,35 @@
}
+ /** Vector containing the list of sub-properties */
protected Vector list;
+ /**
+ * @param prop the first Property to be added to the list
+ */
public ListProperty(Property prop) {
list = new Vector();
list.addElement(prop);
}
+ /**
+ * Add a new property to the list
+ * @param prop Property to be added to the list
+ */
public void addProperty(Property prop) {
list.addElement(prop);
}
+ /**
+ * @return this.list
+ */
public Vector getList() {
return list;
}
+ /**
+ * @return this.list cast as an Object
+ */
public Object getObject() {
return list;
}
1.2 +49 -10 xml-fop/src/java/org/apache/fop/fo/NumberProperty.java
Index: NumberProperty.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/NumberProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NumberProperty.java 11 Mar 2003 13:05:19 -0000 1.1
+++ NumberProperty.java 17 Jul 2003 07:21:08 -0000 1.2
@@ -3,34 +3,34 @@
* ============================================================================
* 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
* [EMAIL PROTECTED]
- *
+ *
* 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
@@ -42,25 +42,38 @@
* (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 <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
- */
+ */
package org.apache.fop.fo;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.expr.Numeric;
+/**
+ * Class for handling numeric properties
+ */
public class NumberProperty extends Property {
+ /**
+ * Inner class for making NumberProperty objects
+ */
public static class Maker extends Property.Maker {
+ /**
+ * Constructor for NumberProperty.Maker
+ * @param propName the name of the property
+ */
public Maker(String propName) {
super(propName);
}
+ /**
+ * @see Property#convertProperty
+ */
public Property convertProperty(Property p,
PropertyList propertyList, FObj fo) {
if (p instanceof NumberProperty) {
@@ -77,18 +90,33 @@
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;
}
@@ -102,14 +130,25 @@
* }
*/
+ /**
+ * @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 Numeric getNumeric() {
return new Numeric(this.number);
}
+ /**
+ * Convert NumberProperty to a ColorType. Not sure why this is needed.
+ * @return ColorType that corresponds to black
+ */
public ColorType getColorType() {
// Convert numeric value to color ???
// Convert to hexadecimal and then try to make it into a color?
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
