morten 01/06/06 08:17:38
Modified: java/src/org/apache/xalan/xsltc/runtime
DefaultSAXOutputHandler.java
Log:
Reverted changes to SAX output handler.
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.6 +9 -7
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultSAXOutputHandler.java
Index: DefaultSAXOutputHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultSAXOutputHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultSAXOutputHandler.java 2001/06/06 12:41:25 1.5
+++ DefaultSAXOutputHandler.java 2001/06/06 15:17:33 1.6
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DefaultSAXOutputHandler.java,v 1.5 2001/06/06 12:41:25 morten
Exp $
+ * @(#)$Id: DefaultSAXOutputHandler.java,v 1.6 2001/06/06 15:17:33 morten
Exp $
*
* The Apache Software License, Version 1.1
*
@@ -111,10 +111,9 @@
private static final char[] XMLNS = " xmlns".toCharArray();
// All of these are used to control/track output indentation
- private static final char[] INDENT =
- " ".toCharArray();
- private static final int MAX_INDENT_LEVEL = 10;
- private static final int MAX_INDENT = 30;
+ private static final char[] INDENT = "
".toCharArray();
+ private static final int MAX_INDENT_LEVEL = (INDENT.length >> 1);
+ private static final int MAX_INDENT = INDENT.length;
private static final String EMPTYSTRING = "";
@@ -292,13 +291,16 @@
public void endElement(String uri, String localname,
String elementName) throws SAXException {
try {
+
+ _linefeedNextStartTag = false;
+
if (_indent) _indentLevel--;
if (_startTagOpen) {
closeStartTag(false);
}
else {
- if ((_indent) && (_indentNextEndTag)) indent(true);
+ if ((_indent) && (_indentNextEndTag)) indent(false);
char[] endTag = (char[])_endTags.get(elementName);
if (endTag == null) {
// We dont' want to concatenate String objects!!!!
@@ -417,7 +419,7 @@
if (linefeed)
_writer.write('\n');
if (_indentLevel < MAX_INDENT_LEVEL)
- _writer.write(INDENT, 0,
(_indentLevel+_indentLevel+_indentLevel));
+ _writer.write(INDENT, 0, (_indentLevel+_indentLevel));
else
_writer.write(INDENT, 0, MAX_INDENT);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
