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/06/25 00:31:58 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/expr PropertyParser.java
pbwest 2002/06/24 15:31:58
Modified: src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
PropertyParser.java
Log:
Use FunctionNotImplementedException
Revision Changes Path
No revision
No revision
1.5.2.3 +18 -24 xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java
Index: PropertyParser.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- PropertyParser.java 23 Jun 2002 15:02:18 -0000 1.5.2.2
+++ PropertyParser.java 24 Jun 2002 22:31:58 -0000 1.5.2.3
@@ -34,7 +34,6 @@
import org.apache.fop.datatypes.UriType;
import org.apache.fop.datatypes.FromParent;
import org.apache.fop.datatypes.FromNearestSpecified;
-//import org.apache.fop.datatypes.*;
import java.util.HashMap;
@@ -397,8 +396,9 @@
break;
case INHERIT:
- throw new PropertyException("INHERIT not supported");
- //break;
+ prop = new Inherit(property);
+ //throw new PropertyException("INHERIT not supported");
+ break;
case URI:
prop = new UriType(property, currentTokenValue);
@@ -459,8 +459,7 @@
}
else if (currentTokenValue.equals("rgb-icc")) {
PropertyValue[] args = parseArgs(6);
- throw new PropertyException
- ("rgb-icc function is not supported.");
+ throw new FunctionNotImplementedException("rgb-icc");
}
else if (currentTokenValue.equals("system-color")) {
PropertyValue[] args = parseArgs(1);
@@ -491,13 +490,11 @@
}
else if (currentTokenValue.equals("label-end")) {
PropertyValue[] args = parseArgs(0);
- throw new PropertyException
- ("label-end function is not supported.");
+ throw new FunctionNotImplementedException("label-end");
}
else if (currentTokenValue.equals("body-start")) {
PropertyValue[] args = parseArgs(0);
- throw new PropertyException
- ("body-start function is not supported.");
+ throw new FunctionNotImplementedException("body-start");
}
// N.B. see comments on classes FromNearestSpecified and
// FromParent for explanation of this section
@@ -515,9 +512,8 @@
if (! PropertyConsts.isShorthand(property)) {
// develop the function value and return it as
// a property.
- throw new PropertyException
- (currentTokenValue +
- " function is not supported.");
+ throw new FunctionNotImplementedException
+ (currentTokenValue);
}
// else a shorthand - do nothing; prop has been set
// to the appropriate pseudo-propertyValue
@@ -546,28 +542,26 @@
// pseudo-propertyValue
}
else { // An NCName but not a shorthand
- // Perform normal from-parent processing
- throw new PropertyException
- (currentTokenValue +
- " function is not supported.");
+ // Perform normal from-? processing
+ throw new FunctionNotImplementedException
+ (currentTokenValue);
}
}
}
else if (currentTokenValue.equals("from-table-column")) {
PropertyValue[] args = parseArgs(0, 1);
- throw new PropertyException
- ("from-table-column function is not supported.");
+ throw new FunctionNotImplementedException
+ ("from-table-column");
}
else if (currentTokenValue.equals("proportional-column-width")) {
PropertyValue[] args = parseArgs(1);
- throw new PropertyException
- ("proportional-column-width "
- + "function is not supported.");
+ throw new FunctionNotImplementedException
+ ("proportional-column-width");
}
else if (currentTokenValue.equals("merge-property-values")) {
PropertyValue[] args = parseArgs(0, 1);
- throw new PropertyException
- ("merge-property-values function is not supported.");
+ throw new FunctionNotImplementedException
+ ("merge-property-values");
}
else
throw new PropertyException("no such function: "
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org