pbwest 2002/11/29 08:46:21
Modified: src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
ColorCommon.java
Log:
Added refineParsing() and getColor() methods.
Corrected spelling of fuchsia.
Revision Changes Path
No revision
No revision
1.1.2.2 +118 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/ColorCommon.java
Index: ColorCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColorCommon.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ColorCommon.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ ColorCommon.java 29 Nov 2002 16:46:21 -0000 1.1.2.2
@@ -1,9 +1,16 @@
package org.apache.fop.fo.properties;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.FONode;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.properties.Property;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.NCName;
import org.apache.fop.datastructs.ROStringArray;
import org.apache.fop.datatypes.Ints;
+import org.apache.fop.messaging.MessageHandler;
/**
* Pseudo-property class for common color values occurring in a
@@ -33,7 +40,7 @@
,"aqua"
,"black"
,"blue"
- ,"fuschia"
+ ,"fuchsia"
,"gray"
,"green"
,"lime"
@@ -48,6 +55,116 @@
,"yellow"
,"transparent"
};
+
+ /**
+ * Return the ColorType derived from the argument.
+ * The argument must be either a ColorType already, in which case
+ * it is returned unchanged, or an NCName whose string value is a
+ * standard color or 'transparent'.
+ * @param value <tt>PropertyValue</tt>
+ * @return <tt>ColorValue</tt> equivalent of the argument
+ * @exception <tt>PropertyException</tt>
+ */
+ protected static ColorType getColor(PropertyValue value)
+ throws PropertyException
+ {
+ int property = value.getProperty();
+ int type = value.getType();
+ if (type == PropertyValue.COLOR_TYPE) return (ColorType)value;
+ // Must be a color enum
+ if (type != PropertyValue.NCNAME)
+ throw new PropertyException
+ (value.getClass().getName() + " instead of color for "
+ + PropNames.getPropertyName(property));
+ // We have an NCName - hope it''s a color
+ NCName ncname = (NCName)value;
+ // Must be a standard color
+ EnumType enum = null;
+ ColorType color = null;
+ String name = ncname.getNCName();
+ try {
+ try {
+ enum = new EnumType(property, name);
+ } catch (PropertyException e) {
+ System.out.println("PropertyException: " + e.getMessage());
+ MessageHandler.logln(name +
+ " is not a standard color for '"
+ + PropNames.getPropertyName(property)
+ + "'. Trying as a system-color.");
+ }
+ if (enum != null)
+ color = new ColorType(property, enum.getEnumValue());
+ else
+ color = new ColorType(property, name);
+ } catch (PropertyException e) {
+ throw new PropertyException
+ (name + " not a standard or system color for "
+ + PropNames.getPropertyName(property));
+ }
+ return color;
+ }
+
+ /**
+ * 'value' is a PropertyValue.
+ *
+ * It must contain
+ * either
+ * a ColorType value
+ * a NCName containing a standard color name or 'transparent'
+ * a FromParent value,
+ * a FromNearestSpecified value,
+ * or an Inherit value.
+ *
+ * @param propindex - the <tt>int</tt> property index.
+ * @param foNode - the <tt>FONode</tt> being built
+ * @param value <tt>PropertyValue</tt> returned by the parser
+ * @return <tt>PropertyValue</tt> the refined value
+ */
+ public PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
+ throws PropertyException
+ {
+ return refineParsing(propindex, foNode, value, NOT_NESTED);
+ }
+
+ /**
+ * Do the work for the three argument refineParsing method.
+ * @param propindex - the <tt>int</tt> property index.
+ * @param foNode - the <tt>FONode</tt> being built
+ * @param value <tt>PropertyValue</tt> returned by the parser
+ * @param nested <tt>boolean</tt> indicating whether this method is
+ * called normally (false), or as part of another <i>refineParsing</i>
+ * method.
+ * @return <tt>PropertyValue</tt> the verified value
+ * @see #refineParsing(FONode,PropertyValue)
+ */
+ public PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value, boolean nested)
+ throws PropertyException
+ {
+ int type = value.getType();
+ switch (type) {
+ case PropertyValue.COLOR_TYPE:
+ return value;
+ case PropertyValue.NCNAME:
+ return getColor(value);
+ default:
+ PropertyValue pv;
+ switch (type) {
+ case PropertyValue.FROM_PARENT:
+ case PropertyValue.FROM_NEAREST_SPECIFIED:
+ case PropertyValue.INHERITED_VALUE:
+ case PropertyValue.INHERIT:
+ pv = super.refineParsing(propindex, foNode, value, nested);
+ if (pv.getType() == PropertyValue.COLOR_TYPE)
+ return pv;
+ }
+ throw new PropertyException
+ ("Inappropriate dataTypes passed to "
+ + PropNames.getPropertyName(propindex)
+ + ".refineParsing: " + value.getClass().getName());
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
