xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From santiag...@apache.org
Subject cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output StreamTextOutput.java TransletOutputHandlerFactory.java
Date Thu, 23 May 2002 20:10:03 GMT
santiagopg    02/05/23 13:10:03

  Modified:    java/src/org/apache/xalan/xsltc/runtime/output
                        TransletOutputHandlerFactory.java
  Added:       java/src/org/apache/xalan/xsltc/runtime/output
                        StreamTextOutput.java
  Log:
  
  
  Revision  Changes    Path
  1.3       +15 -9     xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java
  
  Index: TransletOutputHandlerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TransletOutputHandlerFactory.java	23 May 2002 18:13:04 -0000	1.2
  +++ TransletOutputHandlerFactory.java	23 May 2002 20:10:02 -0000	1.3
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: TransletOutputHandlerFactory.java,v 1.2 2002/05/23 18:13:04 santiagopg Exp
$
  + * @(#)$Id: TransletOutputHandlerFactory.java,v 1.3 2002/05/23 20:10:02 santiagopg Exp
$
    *
    * The Apache Software License, Version 1.1
    *
  @@ -63,6 +63,7 @@
   package org.apache.xalan.xsltc.runtime.output;
   
   import java.io.IOException;
  +import java.io.OutputStream;
   
   import org.xml.sax.SAXException;
   import org.xml.sax.ContentHandler;
  @@ -76,9 +77,10 @@
       public static final int SAX    = 1;
       public static final int DOM    = 2;
   
  -    private String _encoding   = "utf-8";
  -    private String _method     = null;
  -    private int    _outputType = STREAM;
  +    private String _encoding       = "utf-8";
  +    private String _method         = null;
  +    private int    _outputType     = STREAM;
  +    private OutputStream _ostream  = System.out;
   
       static public TransletOutputHandlerFactory newInstance() {
   	return new TransletOutputHandlerFactory();
  @@ -98,21 +100,25 @@
   	_method = method;
       }
   
  +    public void setOutputStream(OutputStream ostream) {
  +	_ostream = ostream;
  +    }
  +
       public TransletOutputHandler getTransletOutputHandler() throws IOException {
   	switch (_outputType) {
   	    case STREAM:
   		if (_method == null) {
  -		    return new StreamUnknownOutput(System.out, _encoding);
  +		    return new StreamUnknownOutput(_ostream, _encoding);
   		}
   
   		if (_method.equalsIgnoreCase("xml")) {
  -		    return new StreamXMLOutput(System.out, _encoding);
  +		    return new StreamXMLOutput(_ostream, _encoding);
   		}
   		else if (_method.equalsIgnoreCase("html")) {
  -		    return new StreamHTMLOutput(System.out, _encoding);
  +		    return new StreamHTMLOutput(_ostream, _encoding);
   		}
   		else if (_method.equalsIgnoreCase("text")) {
  -		    // TODO
  +		    return new StreamTextOutput(_ostream, _encoding);
   		}
   	    break;
   	    case SAX:
  @@ -128,7 +134,7 @@
       // Temporary - returns an instance of TextOutput
       public TransletOutputHandler getOldTransletOutputHandler() throws IOException {
   	DefaultSAXOutputHandler saxHandler =
  -	    new DefaultSAXOutputHandler(System.out, _encoding);
  +	    new DefaultSAXOutputHandler(_ostream, _encoding);
   	return new TextOutput((ContentHandler)saxHandler,
   			      (LexicalHandler)saxHandler, _encoding);
       }
  
  
  
  1.1                  xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamTextOutput.java
  
  Index: StreamTextOutput.java
  ===================================================================
  /*
   * @(#)$Id: StreamTextOutput.java,v 1.1 2002/05/23 20:10:02 santiagopg Exp $
   *
   * The Apache Software License, Version 1.1
   *
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Xalan" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES{} LOSS OF
   * USE, DATA, OR PROFITS{} OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation and was
   * originally based on software copyright (c) 2001, Sun
   * Microsystems., http://www.sun.com.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * @author Santiago Pericas-Geertsen
   *
   */
  
  package org.apache.xalan.xsltc.runtime.output;
  
  import java.io.Writer;
  import java.io.IOException;
  import java.io.OutputStream;
  
  import org.apache.xalan.xsltc.TransletException;
  
  public class StreamTextOutput extends StreamOutput {
  
      public StreamTextOutput(Writer writer, String encoding) {
  	super(writer, encoding);
      }
  
      public StreamTextOutput(OutputStream out, String encoding) 
  	throws IOException
      {
  	super(out, encoding);
      }
  
      public void endDocument() throws TransletException { 
  	outputBuffer();
      }
  
      public void characters(String characters) 
  	throws TransletException 
      { 
  	_buffer.append(characters);
      }
  
      public void characters(char[] characters, int offset, int length)
  	throws TransletException 
      { 
  	_buffer.append(characters, offset, length);
      }
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message