Added INTEGER and ENUM to refineParsing().

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195590 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/properties/Property.java b/src/org/apache/fop/fo/properties/Property.java
index 81799dcc3991d0ac8564d48c395a8223e2605a02..a4200a9d29c69e22fddac922dce99f8b0e64be98 100644 (file)
--- a/src/org/apache/fop/fo/properties/Property.java
+++ b/src/org/apache/fop/fo/properties/Property.java
@@ -376,6 +376,11 @@ public /*abstract*/ class Property {
                 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 @@ public /*abstract*/ class Property {
                             (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;