Make compatible with new Property.Maker constructor and make method parameters

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

8 files changed, 33 insertions, 19 deletions

diff --git a/src/org/apache/fop/svg/SVGD.java b/src/org/apache/fop/svg/SVGD.java
index c58c92a0d..5356ccea8 100644
--- a/src/org/apache/fop/svg/SVGD.java
+++ b/src/org/apache/fop/svg/SVGD.java
@@ -80,7 +80,7 @@ public class SVGD extends Property {
 	 * @param propertyList the property list this is a member of
 	 * @param value the explicit string value of the property
 	 */
-	public Property make(PropertyList propertyList, String value)
+	public Property make(PropertyList propertyList, String value, FObj fo)
 		throws FOPException {
 		return new SVGD(propertyList, new PathData(value));
 	}
@@ -91,7 +91,7 @@ public class SVGD extends Property {
 	 * @param propertyList the property list the property is a member of
 	 */
 	public Property make(PropertyList propertyList) throws FOPException {
-		return make(propertyList, "");
+		return make(propertyList, "", null);
 	}
 	}
 
@@ -100,7 +100,7 @@ public class SVGD extends Property {
 	 *
 	 * @return the maker for SVG Length objects
 	 */
-	public static Property.Maker maker() {
+	public static Property.Maker maker(String propName) {
 	return new SVGD.Maker();
 	}
 
diff --git a/src/org/apache/fop/svg/SVGLengthListProperty.java b/src/org/apache/fop/svg/SVGLengthListProperty.java
index bcb955a16..b25d62183 100644
--- a/src/org/apache/fop/svg/SVGLengthListProperty.java
+++ b/src/org/apache/fop/svg/SVGLengthListProperty.java
@@ -84,7 +84,7 @@ public class SVGLengthListProperty extends Property {
 	 * @param propertyList the property list this is a member of
 	 * @param value the explicit string value of the property
 	 */
-	public Property make(PropertyList propertyList, String value)
+	public Property make(PropertyList propertyList, String value, FObj fo)
 		throws FOPException {
 		SVGAnimatedLengthListImpl anime = new SVGAnimatedLengthListImpl();
 		SVGLengthListImpl len = new SVGLengthListImpl();
@@ -99,7 +99,7 @@ public class SVGLengthListProperty extends Property {
 	 * @param propertyList the property list the property is a member of
 	 */
 	public Property make(PropertyList propertyList) throws FOPException {
-		return make(propertyList, "");
+		return make(propertyList, "", null);
 	}
 	}
 
@@ -112,6 +112,10 @@ public class SVGLengthListProperty extends Property {
 	return new SVGLengthListProperty.Maker();
 	}
 
+	public static Property.Maker maker(String propName) {
+	return new SVGLengthListProperty.Maker();
+	}
+
 	/** the length as a Length object */
 	protected SVGAnimatedLengthList value;
 	
diff --git a/src/org/apache/fop/svg/SVGLengthProperty.java b/src/org/apache/fop/svg/SVGLengthProperty.java
index 1d96f6ead..ce774b8b7 100644
--- a/src/org/apache/fop/svg/SVGLengthProperty.java
+++ b/src/org/apache/fop/svg/SVGLengthProperty.java
@@ -82,7 +82,7 @@ public class SVGLengthProperty extends Property {
          * @param value the explicit string value of the property
          */
         public Property make(PropertyList propertyList,
-                             String value) throws FOPException {
+                             String value, FObj fo) throws FOPException {
             SVGLengthImpl len = new SVGLengthImpl();
             len.setValueAsString(value);
             return new SVGLengthProperty(propertyList, len);
@@ -108,6 +108,16 @@ public class SVGLengthProperty extends Property {
         return new SVGLengthProperty.Maker();
     }
 
+    /**
+     * returns the maker for this object.
+     * @param propName the name of the property (used with new
+     * property mapping scheme)
+     * @return the maker for SVG Length objects
+     */
+    public static Property.Maker maker(String propName) {
+	return new SVGLengthProperty.Maker();
+    }
+
     /** the length as a Length object */
     protected SVGLengthImpl value;
 
diff --git a/src/org/apache/fop/svg/SVGPoints.java b/src/org/apache/fop/svg/SVGPoints.java
index 866615d86..36ff790cf 100644
--- a/src/org/apache/fop/svg/SVGPoints.java
+++ b/src/org/apache/fop/svg/SVGPoints.java
@@ -80,7 +80,7 @@ public class SVGPoints extends Property {
 	 * @param propertyList the property list this is a member of
 	 * @param value the explicit string value of the property
 	 */
-	public Property make(PropertyList propertyList, String value)
+	public Property make(PropertyList propertyList, String value, FObj fo)
 		throws FOPException {
 		return new SVGPoints(propertyList, new PointsData(value));
 	}
@@ -91,7 +91,7 @@ public class SVGPoints extends Property {
 	 * @param propertyList the property list the property is a member of
 	 */
 	public Property make(PropertyList propertyList) throws FOPException {
-		return make(propertyList, "");
+		return make(propertyList, "", null);
 	}
 	}
 
@@ -100,7 +100,7 @@ public class SVGPoints extends Property {
 	 *
 	 * @return the maker for SVG Length objects
 	 */
-	public static Property.Maker maker() {
+	public static Property.Maker maker(String propName) {
 	return new SVGPoints.Maker();
 	}
 
diff --git a/src/org/apache/fop/svg/SVGStringProperty.java b/src/org/apache/fop/svg/SVGStringProperty.java
index 5d9adb98f..c01f28ec5 100644
--- a/src/org/apache/fop/svg/SVGStringProperty.java
+++ b/src/org/apache/fop/svg/SVGStringProperty.java
@@ -81,7 +81,7 @@ public class SVGStringProperty extends Property {
 	 * @param propertyList the property list this is a member of
 	 * @param value the explicit string value of the property
 	 */
-	public Property make(PropertyList propertyList, String value)
+	public Property make(PropertyList propertyList, String value, FObj fo)
 		throws FOPException {
 		return new SVGStringProperty(propertyList, value);
 	}
@@ -92,7 +92,7 @@ public class SVGStringProperty extends Property {
 	 * @param propertyList the property list the property is a member of
 	 */
 	public Property make(PropertyList propertyList) throws FOPException {
-		return make(propertyList, "");
+		return make(propertyList, "", null);
 	}
 	}
 
diff --git a/src/org/apache/fop/svg/SVGStyle.java b/src/org/apache/fop/svg/SVGStyle.java
index 8bd7da0be..f804aa700 100644
--- a/src/org/apache/fop/svg/SVGStyle.java
+++ b/src/org/apache/fop/svg/SVGStyle.java
@@ -82,7 +82,7 @@ public class SVGStyle extends Property {
 	 * @param propertyList the property list this is a member of
 	 * @param value the explicit string value of the property
 	 */
-	public Property make(PropertyList propertyList, String value)
+	public Property make(PropertyList propertyList, String value, FObj fo)
 		throws FOPException {
 		return new SVGStyle(propertyList, new StyleData(value));
 	}
@@ -93,7 +93,7 @@ public class SVGStyle extends Property {
 	 * @param propertyList the property list the property is a member of
 	 */
 	public Property make(PropertyList propertyList) throws FOPException {
-		return make(propertyList, "");
+		return make(propertyList, "", null);
 	}
 	}
 
@@ -102,7 +102,7 @@ public class SVGStyle extends Property {
 	 *
 	 * @return the maker for SVG Length objects
 	 */
-	public static Property.Maker maker() {
+	public static Property.Maker maker(String propName) {
 	return new SVGStyle.Maker();
 	}
 
diff --git a/src/org/apache/fop/svg/SVGTransform.java b/src/org/apache/fop/svg/SVGTransform.java
index 3c90f82d3..e883410e7 100644
--- a/src/org/apache/fop/svg/SVGTransform.java
+++ b/src/org/apache/fop/svg/SVGTransform.java
@@ -82,7 +82,7 @@ public class SVGTransform extends Property {
 	 * @param propertyList the property list this is a member of
 	 * @param value the explicit string value of the property
 	 */
-	public Property make(PropertyList propertyList, String value)
+	public Property make(PropertyList propertyList, String value, FObj fo)
 		throws FOPException {
 		return new SVGTransform(propertyList, new TransformData(value));
 	}
@@ -93,7 +93,7 @@ public class SVGTransform extends Property {
 	 * @param propertyList the property list the property is a member of
 	 */
 	public Property make(PropertyList propertyList) throws FOPException {
-		return make(propertyList, "");
+		return make(propertyList, "", null);
 	}
 	}
 
@@ -102,7 +102,7 @@ public class SVGTransform extends Property {
 	 *
 	 * @return the maker for SVG Length objects
 	 */
-	public static Property.Maker maker() {
+	public static Property.Maker maker(String propName) {
 	return new SVGTransform.Maker();
 	}
 
diff --git a/src/org/apache/fop/svg/TextProperty.java b/src/org/apache/fop/svg/TextProperty.java
index 48f8153ce..74f74a7ec 100644
--- a/src/org/apache/fop/svg/TextProperty.java
+++ b/src/org/apache/fop/svg/TextProperty.java
@@ -80,7 +80,7 @@ public class TextProperty extends Property {
 	 * @param propertyList the property list this is a member of
 	 * @param value the explicit string value of the property
 	 */
-	public Property make(PropertyList propertyList, String value)
+	public Property make(PropertyList propertyList, String value, FObj fo)
 		throws FOPException {
 		return new TextProperty(propertyList, value);
 	}
@@ -91,7 +91,7 @@ public class TextProperty extends Property {
 	 * @param propertyList the property list the property is a member of
 	 */
 	public Property make(PropertyList propertyList) throws FOPException {
-		return make(propertyList, "");
+		return make(propertyList, "", null);
 	}
 	}