cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output StreamHTMLOutput.java StreamOutput.java StreamUnknownOutput.java StreamXMLOutput.java

[santiagopg]

santiagopg    2002/06/04 15:02:16

  Modified:    java/src/org/apache/xalan/xsltc/runtime/output
                        StreamHTMLOutput.java StreamOutput.java
                        StreamUnknownOutput.java StreamXMLOutput.java
  Log:
  Updated.
  
  Revision  Changes    Path
  1.7       +10 -1     
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamHTMLOutput.java
  
  Index: StreamHTMLOutput.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamHTMLOutput.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- StreamHTMLOutput.java     30 May 2002 17:48:10 -0000      1.6
  +++ StreamHTMLOutput.java     4 Jun 2002 22:02:16 -0000       1.7
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: StreamHTMLOutput.java,v 1.6 2002/05/30 17:48:10 santiagopg Exp $
  + * @(#)$Id: StreamHTMLOutput.java,v 1.7 2002/06/04 22:02:16 santiagopg Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -272,6 +272,15 @@
        if (_startTagOpen) {
            closeStartTag();
        }
  +
  +     // Handle document type declaration 
  +     if (_firstElement) {
  +         if (_doctypeSystem != null || _doctypePublic != null) {
  +             appendDTD("html");
  +         }
  +         _firstElement = false;
  +     }
  +
        // A PI in HTML ends with ">" instead of "?>"
        _buffer.append("<?").append(target).append(' ')
            .append(data).append('>');
  
  
  
  1.12      +2 -1      
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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StreamOutput.java 4 Jun 2002 20:55:37 -0000       1.11
  +++ StreamOutput.java 4 Jun 2002 22:02:16 -0000       1.12
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: StreamOutput.java,v 1.11 2002/06/04 20:55:37 santiagopg Exp $
  + * @(#)$Id: StreamOutput.java,v 1.12 2002/06/04 22:02:16 santiagopg Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -167,6 +167,7 @@
       }
   
       public void setIndent(boolean indent) { 
  +// System.out.println("StreamOutput.setIndent() indent = " + indent);
        _indent = indent;
       }
   
  
  
  
  1.2       +8 -4      
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamUnknownOutput.java
  
  Index: StreamUnknownOutput.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamUnknownOutput.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StreamUnknownOutput.java  23 May 2002 18:13:04 -0000      1.1
  +++ StreamUnknownOutput.java  4 Jun 2002 22:02:16 -0000       1.2
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: StreamUnknownOutput.java,v 1.1 2002/05/23 18:13:04 santiagopg 
Exp $
  + * @(#)$Id: StreamUnknownOutput.java,v 1.2 2002/06/04 22:02:16 santiagopg 
Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -80,7 +80,7 @@
   public class StreamUnknownOutput extends StreamOutput {
   
       private StreamOutput _handler;
  -    private boolean      _startDocumentCalled = false;
  +    private boolean      _callStartDocument = false;
   
       public StreamUnknownOutput(Writer writer, String encoding) {
        super(writer, encoding);
  @@ -95,10 +95,13 @@
       }
   
       public void startDocument() throws TransletException { 
  -     _startDocumentCalled = true;
  +     _callStartDocument = true;
       }
   
       public void endDocument() throws TransletException { 
  +     if (_callStartDocument) {
  +         _handler.startDocument();
  +     }
        _handler.endDocument();
       }
   
  @@ -108,8 +111,9 @@
            if (elementName.equalsIgnoreCase("html")) {
                _handler = new StreamHTMLOutput(_handler);
            }
  -         if (_startDocumentCalled) {
  +         if (_callStartDocument) {
                _handler.startDocument();
  +             _callStartDocument = false;
            }
            _firstElement = false;
        }
  
  
  
  1.12      +2 -2      
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamXMLOutput.java
  
  Index: StreamXMLOutput.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamXMLOutput.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StreamXMLOutput.java      4 Jun 2002 15:16:09 -0000       1.11
  +++ StreamXMLOutput.java      4 Jun 2002 22:02:16 -0000       1.12
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: StreamXMLOutput.java,v 1.11 2002/06/04 15:16:09 santiagopg Exp $
  + * @(#)$Id: StreamXMLOutput.java,v 1.12 2002/06/04 22:02:16 santiagopg Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -122,7 +122,7 @@
       }
   
       public void startElement(String elementName) throws TransletException { 
  -// System.out.println("startElement = " + elementName);
  +// System.out.println("startElement = " + elementName + " _indent = " + 
_indent);
        if (_startTagOpen) {
            closeStartTag();
        }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]