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 rm...@apache.org on 2013/12/04 17:36:06 UTC
svn commit: r1547838 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
Author: rmeyer
Date: Wed Dec 4 16:36:05 2013
New Revision: 1547838
URL: http://svn.apache.org/r1547838
Log:
FOP-1069: No error message on illegal/unknown values on a property
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java?rev=1547838&r1=1547837&r2=1547838&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java Wed Dec 4 16:36:05 2013
@@ -83,14 +83,17 @@ public class GenericShorthandParser impl
PropertyList propertyList)
throws PropertyException {
Property prop = null;
+ String vProperty = "";
// Try each of the stored values in turn
Iterator iprop = property.getList().iterator();
while (iprop.hasNext() && prop == null) {
Property p = (Property)iprop.next();
+ if (p.getNCname() != null) {
+ vProperty += p.getNCname() + " ";
+ }
prop = maker.convertShorthandProperty(propertyList, p, null);
- // The following produces a regression, about which see FOP-2311.
- // propertyList.validatePropertyValue(p.getNCname(), prop, property);
}
+ propertyList.validatePropertyValue(vProperty.trim(), prop, property);
return prop;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org