You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2002/12/01 15:29:39 UTC

cvs commit: xml-fop/src/org/apache/fop/fo/properties ColorCommon.java

pbwest      2002/12/01 06:29:39

  Modified:    src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
                        ColorCommon.java
  Log:
  Added property index arg to getColor().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +4 -3      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.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- ColorCommon.java	29 Nov 2002 16:46:21 -0000	1.1.2.2
  +++ ColorCommon.java	1 Dec 2002 14:29:38 -0000	1.1.2.3
  @@ -61,14 +61,15 @@
        * 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 propindex the index of the property to which this value is
  +     * being applied.
        * @param value <tt>PropertyValue</tt>
        * @return <tt>ColorValue</tt> equivalent of the argument
        * @exception <tt>PropertyException</tt>
        */
  -    protected static ColorType getColor(PropertyValue value)
  +    protected static ColorType getColor(int property, 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
  @@ -147,7 +148,7 @@
           case PropertyValue.COLOR_TYPE:
               return value;
           case PropertyValue.NCNAME:
  -            return getColor(value);
  +            return getColor(propindex, value);
           default:
               PropertyValue pv;
               switch (type) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org