Modify compound property handling; add support for corresponding properties and mixed property types

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193940 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 17 deletions

diff --git a/src/org/apache/fop/fo/EnumProperty.java b/src/org/apache/fop/fo/EnumProperty.java
index c8979d804..0a46c6e53 100644
--- a/src/org/apache/fop/fo/EnumProperty.java
+++ b/src/org/apache/fop/fo/EnumProperty.java
@@ -61,30 +61,20 @@ public class EnumProperty extends Property {
       super(propName);
     }
 
-    // set the Property from the String value
-    public Property make(PropertyList propertyList, String value, FObj fo)
-      throws FOPException
-    {
-      Property p = findConstant(value);
-      if (p == null) {
-	MessageHandler.errorln("WARNING: Unknown value for property '" +
+
+    /**
+     * Called by subclass if no match found.
+     */
+    public Property checkEnumValues(String value) {
+	MessageHandler.errorln("WARNING: Unknown enumerated value for property '" +
 			       getPropName() + "': " + value);
-	return make(propertyList); // return the default value
-      }
-      else {
-	return p; //makeProperty(v);
-      }
+	return null;
     }
 
     protected Property findConstant(String value) {
       return null;
     }
 
-    /***
-    protected Property makeProperty(int v) {
-      return new EnumProperty(v);
-    }
-    ***/
   }
 
     private int value;