You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sa...@apache.org on 2002/06/04 22:55:37 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output OutputBase.java SAXOutput.java SAXXMLOutput.java StreamOutput.java
santiagopg 2002/06/04 13:55:37
Modified: java/src/org/apache/xalan/xsltc/runtime/output
OutputBase.java SAXOutput.java SAXXMLOutput.java
StreamOutput.java
Log:
Updated.
Revision Changes Path
1.6 +6 -1 xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/OutputBase.java
Index: OutputBase.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/OutputBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OutputBase.java 4 Jun 2002 16:21:36 -0000 1.5
+++ OutputBase.java 4 Jun 2002 20:55:37 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: OutputBase.java,v 1.5 2002/06/04 16:21:36 santiagopg Exp $
+ * @(#)$Id: OutputBase.java,v 1.6 2002/06/04 20:55:37 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -127,6 +127,11 @@
*/
protected boolean _startTagOpen = false;
+ /**
+ * Set to false after processing first element.
+ */
+ protected boolean _firstElement = true;
+
/**
* Initialize global variables
*/
1.9 +7 -14 xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXOutput.java
Index: SAXOutput.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXOutput.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SAXOutput.java 4 Jun 2002 15:16:09 -0000 1.8
+++ SAXOutput.java 4 Jun 2002 20:55:37 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: SAXOutput.java,v 1.8 2002/06/04 15:16:09 santiagopg Exp $
+ * @(#)$Id: SAXOutput.java,v 1.9 2002/06/04 20:55:37 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -73,26 +73,18 @@
abstract class SAXOutput extends OutputBase implements Constants {
- private static final char[] BEGCOMM = "<!--".toCharArray();
- private static final char[] ENDCOMM = "-->".toCharArray();
- private static final int BEGCOMM_length = BEGCOMM.length;
- private static final int ENDCOMM_length = ENDCOMM.length;
-
protected ContentHandler _saxHandler;
- protected LexicalHandler _lexHandler;
+ protected LexicalHandler _lexHandler = null;
protected AttributesImpl _attributes = new AttributesImpl();
-
protected String _elementName = null;
-
protected String _encoding = null;
-
public SAXOutput(ContentHandler handler, String encoding) {
_saxHandler = handler;
_encoding = encoding;
}
- public SAXOutput(ContentHandler hdler, LexicalHandler lex, String encoding){
+ public SAXOutput(ContentHandler hdler, LexicalHandler lex, String encoding) {
_saxHandler = hdler;
_lexHandler = lex;
_encoding = encoding;
@@ -123,9 +115,10 @@
closeCDATA();
}
- _saxHandler.characters(BEGCOMM, 0, BEGCOMM_length);
- characters(comment);
- _saxHandler.characters(ENDCOMM, 0, ENDCOMM_length);
+ // Ignore if a lexical handler has not been set
+ if (_lexHandler != null) {
+ _lexHandler.comment(comment.toCharArray(), 0, comment.length());
+ }
}
catch (SAXException e) {
throw new TransletException(e);
1.10 +7 -3 xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXXMLOutput.java
Index: SAXXMLOutput.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXXMLOutput.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SAXXMLOutput.java 4 Jun 2002 16:21:36 -0000 1.9
+++ SAXXMLOutput.java 4 Jun 2002 20:55:37 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: SAXXMLOutput.java,v 1.9 2002/06/04 16:21:36 santiagopg Exp $
+ * @(#)$Id: SAXXMLOutput.java,v 1.10 2002/06/04 20:55:37 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -117,6 +117,7 @@
* element (<elem>data</elem> type) or a CDATA section.
*/
public void startElement(String elementName) throws TransletException {
+// System.out.println("SAXXMLOutput.startElement name = " + elementName);
try {
// Close any open start tag
if (_startTagOpen) {
@@ -127,12 +128,12 @@
}
// Handle document type declaration (for first element only)
- if (_lexHandler != null) {
+ if (_firstElement) {
if (_doctypeSystem != null) {
_lexHandler.startDTD(elementName, _doctypePublic,
_doctypeSystem);
}
- _lexHandler = null;
+ _firstElement = false;
}
_depth++;
@@ -182,6 +183,8 @@
public void characters(char[] ch, int off, int len)
throws TransletException
{
+// System.out.println("SAXXMLOutput.characters ch = " + new String(ch, off, len));
+
try {
// Close any open start tag
if (_startTagOpen) {
@@ -202,6 +205,7 @@
}
public void endElement(String elementName) throws TransletException {
+// System.out.println("SAXXMLOutput.endElement name = " + elementName);
try {
// Close any open element
if (_startTagOpen) {
1.11 +1 -2 xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamOutput.java
Index: StreamOutput.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamOutput.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StreamOutput.java 4 Jun 2002 11:58:31 -0000 1.10
+++ StreamOutput.java 4 Jun 2002 20:55:37 -0000 1.11
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: StreamOutput.java,v 1.10 2002/06/04 11:58:31 tmiller Exp $
+ * @(#)$Id: StreamOutput.java,v 1.11 2002/06/04 20:55:37 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -104,7 +104,6 @@
protected int _indentLevel = 0;
protected boolean _escaping = true;
- protected boolean _firstElement = true;
protected String _encoding = "UTF-8";
// protected HashSet _attributes = new HashSet();
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org