pbwest      2002/11/21 00:22:16

  Modified:    src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
                        Property.java
  Log:
  Added INTEGER and ENUM to refineParsing().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +12 -3     xml-fop/src/org/apache/fop/fo/properties/Attic/Property.java
  
  Index: Property.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Property.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- Property.java     13 Nov 2002 03:48:32 -0000      1.1.2.5
  +++ Property.java     21 Nov 2002 08:22:16 -0000      1.1.2.6
  @@ -376,6 +376,11 @@
                   return value;
               throw new PropertyException
                               ("Numeric value invalid  for " + propName);
  +        case PropertyValue.INTEGER:
  +            if ((dataTypes & NUMBER) != 0)
  +                return value;
  +            throw new PropertyException
  +                    ("IntegerType value invalid for " + propName);
           case PropertyValue.NCNAME:
               String ncname = ((NCName)value).getNCName();
               // Can by any of
  @@ -396,6 +401,10 @@
                               (foNode, property, ncname)).getMappedNumValue();
               throw new PropertyException
                               ("NCName value invalid  for " + propName);
  +        case PropertyValue.ENUM:
  +            if ((dataTypes & ENUM) != 0) return value;
  +            throw new PropertyException
  +                    ( "Enumerated value invalid for " + propName);
           case PropertyValue.LITERAL:
               // Can be LITERAL or CHARACTER_T
               if ((dataTypes & (LITERAL | CHARACTER_T)) != 0) return value;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to