vgritsenko 2002/09/21 10:31:42
Modified: . Tag: cocoon_2_0_3_branch changes.xml
. changes.xml
src/java/org/apache/cocoon/xml/dom Tag: cocoon_2_0_3_branch
SVGBuilder.java
src/blocks/batik/java/org/apache/cocoon/xml/dom
SVGBuilder.java
Log:
Fix bug 11856: ClassCastExceptions in batik
Revision Changes Path
No revision
No revision
1.138.2.55 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.138.2.54
retrieving revision 1.138.2.55
diff -u -r1.138.2.54 -r1.138.2.55
--- changes.xml 21 Sep 2002 16:29:31 -0000 1.138.2.54
+++ changes.xml 21 Sep 2002 17:31:41 -0000 1.138.2.55
@@ -39,6 +39,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="VG" type="fix" fixes-bug="11856" due-to="Stefan Seifert"
due-to-email="[EMAIL PROTECTED]">
+ Remove unnessesary code in SVGBuilder. This also fixes intermittent
+ ClassCastExceptions in Batik code.
+ </action>
<action dev="VG" type="fix">
Fix issue with cross-platform uploads. Uploaded file's name converted
to match destination platform's path separator.
1.256 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- changes.xml 21 Sep 2002 16:29:31 -0000 1.255
+++ changes.xml 21 Sep 2002 17:31:41 -0000 1.256
@@ -40,6 +40,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="VG" type="fix" fixes-bug="11856" due-to="Stefan Seifert"
due-to-email="[EMAIL PROTECTED]">
+ Remove unnessesary code in SVGBuilder. This also fixes intermittent
+ ClassCastExceptions in Batik code.
+ </action>
<action dev="VG" type="fix">
Fix issue with cross-platform uploads. Uploaded file's name converted
to match destination platform's path separator.
No revision
No revision
1.4.2.2 +6 -14
xml-cocoon2/src/java/org/apache/cocoon/xml/dom/Attic/SVGBuilder.java
Index: SVGBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/Attic/SVGBuilder.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- SVGBuilder.java 5 Jun 2002 00:42:21 -0000 1.4.2.1
+++ SVGBuilder.java 21 Sep 2002 17:31:41 -0000 1.4.2.2
@@ -73,18 +73,6 @@
private static final String SAX_PARSER
= "org.apache.xerces.parsers.SAXParser";
- private final static String CSS_PARSER_CLASS_NAME =
- "org.apache.batik.css.parser.Parser";
-
- static {
- /* Batik 1.5b1 and below:
-
org.apache.batik.css.CSSDocumentHandler.CSSDocumentHandler.setParserClassName(CSS_PARSER_CLASS_NAME);
- */
-
- // VG: Is it required?
- XMLResourceDescriptor.setCSSParserClassName(CSS_PARSER_CLASS_NAME);
- }
-
/**
* Construct a new instance of this TreeGenerator.
*/
@@ -92,6 +80,11 @@
super(SAX_PARSER);
}
+ /**
+ * Provide component with a logger.
+ *
+ * @param logger the logger
+ */
public void setLogger(Logger logger) {
if (this.log == null) {
this.log = logger;
@@ -150,6 +143,5 @@
*/
protected void notify(Document doc)
throws SAXException {
-
}
}
1.2 +2 -15
xml-cocoon2/src/blocks/batik/java/org/apache/cocoon/xml/dom/SVGBuilder.java
Index: SVGBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/batik/java/org/apache/cocoon/xml/dom/SVGBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGBuilder.java 16 Sep 2002 15:35:06 -0000 1.1
+++ SVGBuilder.java 21 Sep 2002 17:31:42 -0000 1.2
@@ -73,18 +73,6 @@
private static final String SAX_PARSER
= "org.apache.xerces.parsers.SAXParser";
- private final static String CSS_PARSER_CLASS_NAME =
- "org.apache.batik.css.parser.Parser";
-
- static {
- /* Batik 1.5b1 and below:
-
org.apache.batik.css.CSSDocumentHandler.CSSDocumentHandler.setParserClassName(CSS_PARSER_CLASS_NAME);
- */
-
- // VG: Is it required?
- XMLResourceDescriptor.setCSSParserClassName(CSS_PARSER_CLASS_NAME);
- }
-
/**
* Construct a new instance of this TreeGenerator.
*/
@@ -94,7 +82,7 @@
/**
* Provide component with a logger.
- *
+ *
* @param logger the logger
*/
public void enableLogging(Logger logger) {
@@ -155,6 +143,5 @@
*/
protected void notify(Document doc)
throws SAXException {
-
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
