keiron 02/01/03 00:29:01
Modified: src/org/apache/fop/extensions Tag: fop-0_20_2-maintain
ExtensionElementMapping.java
src/org/apache/fop/fo Tag: fop-0_20_2-maintain
StandardElementMapping.java
src/org/apache/fop/svg Tag: fop-0_20_2-maintain
SVGElementMapping.java
Log:
fixed thread prob as with trunk
Revision Changes Path
No revision
No revision
1.4.2.1 +6 -2
xml-fop/src/org/apache/fop/extensions/ExtensionElementMapping.java
Index: ExtensionElementMapping.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/extensions/ExtensionElementMapping.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ExtensionElementMapping.java 24 Sep 2001 09:17:12 -0000 1.4
+++ ExtensionElementMapping.java 3 Jan 2002 08:29:00 -0000 1.4.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: ExtensionElementMapping.java,v 1.4 2001/09/24 09:17:12 keiron Exp $
+ * $Id: ExtensionElementMapping.java,v 1.4.2.1 2002/01/03 08:29:00 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -21,12 +21,16 @@
private static HashMap foObjs = null;
- public synchronized void addToBuilder(TreeBuilder builder) {
+ private static synchronized void setupExt() {
if(foObjs == null) {
foObjs = new HashMap();
foObjs.put("outline", Outline.maker());
foObjs.put("label", Label.maker());
}
+ }
+
+ public void addToBuilder(TreeBuilder builder) {
+ setupExt();
builder.addMapping(URI, foObjs);
No revision
No revision
1.26.2.1 +6 -4 xml-fop/src/org/apache/fop/fo/Attic/StandardElementMapping.java
Index: StandardElementMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/StandardElementMapping.java,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -r1.26 -r1.26.2.1
--- StandardElementMapping.java 24 Sep 2001 09:17:12 -0000 1.26
+++ StandardElementMapping.java 3 Jan 2002 08:29:01 -0000 1.26.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: StandardElementMapping.java,v 1.26 2001/09/24 09:17:12 keiron Exp $
+ * $Id: StandardElementMapping.java,v 1.26.2.1 2002/01/03 08:29:01 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -18,7 +18,7 @@
public class StandardElementMapping implements ElementMapping {
private static HashMap foObjs = null;
- public synchronized void addToBuilder(TreeBuilder builder) {
+ private static synchronized void setupFO() {
if(foObjs == null) {
foObjs = new HashMap();
@@ -107,7 +107,10 @@
foObjs.put("marker", Marker.maker());
foObjs.put("retrieve-marker", RetrieveMarker.maker());
}
+ }
+ public void addToBuilder(TreeBuilder builder) {
+ setupFO();
String uri = "http://www.w3.org/1999/XSL/Format";;
builder.addMapping(uri, foObjs);
@@ -119,7 +122,6 @@
builder.addElementPropertyList(uri, elem,
FOPropertyMapping.getElementMapping(elem));
}
-
}
-
}
+
No revision
No revision
1.17.2.1 +6 -3 xml-fop/src/org/apache/fop/svg/SVGElementMapping.java
Index: SVGElementMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGElementMapping.java,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- SVGElementMapping.java 5 Oct 2001 10:29:48 -0000 1.17
+++ SVGElementMapping.java 3 Jan 2002 08:29:01 -0000 1.17.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: SVGElementMapping.java,v 1.17 2001/10/05 10:29:48 keiron Exp $
+ * $Id: SVGElementMapping.java,v 1.17.2.1 2002/01/03 08:29:01 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -22,7 +22,7 @@
private static HashMap foObjs = null;
- public synchronized void addToBuilder(TreeBuilder builder) {
+ private static synchronized void setupSVG() {
if(foObjs == null) {
// this sets the parser that will be used
@@ -84,11 +84,14 @@
foObjs.put("feMerge", SVGObj.maker("feMerge"));
foObjs.put("feMergeNode", SVGObj.maker("feMergeNode"));
}
+ }
+ public void addToBuilder(TreeBuilder builder) {
+ setupSVG();
String uri = "http://www.w3.org/2000/svg";;
builder.addMapping(uri, foObjs);
builder.addPropertyListBuilder(uri, new DirectPropertyListBuilder());
}
-
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
