bckfnn 2004/09/24 03:31:22
Modified: src/java/org/apache/fop/apps FOUserAgent.java
src/java/org/apache/fop/fo FOTreeBuilder.java
Log:
Moved from element mapping class names to element mapping objects.
This solves a potential problem where Class.forName() can't load the
element mapping class because the element mapping is only available
in a classloader below the one that loaded fop.jar.
Revision Changes Path
1.17 +4 -3 xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java
Index: FOUserAgent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FOUserAgent.java 11 Sep 2004 17:10:46 -0000 1.16
+++ FOUserAgent.java 24 Sep 2004 10:31:22 -0000 1.17
@@ -35,6 +35,7 @@
import org.apache.commons.logging.LogFactory;
// FOP
+import org.apache.fop.fo.ElementMapping;
import org.apache.fop.pdf.PDFEncryptionParams;
import org.apache.fop.render.Renderer;
@@ -113,11 +114,11 @@
* Add the element mapping with the given class name.
* @param mappingClassName the class name representing the element mapping.
*/
- public void addElementMapping(String mappingClassName) {
+ public void addElementMapping(ElementMapping elementMapping) {
if (additionalElementMappings == null) {
additionalElementMappings = new ArrayList();
}
- additionalElementMappings.add(mappingClassName);
+ additionalElementMappings.add(elementMapping);
}
/**
1.53 +1 -1 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- FOTreeBuilder.java 17 Sep 2004 21:27:36 -0000 1.52
+++ FOTreeBuilder.java 24 Sep 2004 10:31:22 -0000 1.53
@@ -130,7 +130,7 @@
if (addlEMs != null) {
for (int i = 0; i < addlEMs.size(); i++) {
- addElementMapping((String) addlEMs.get(i));
+ addElementMapping((ElementMapping) addlEMs.get(i));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
