You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mo...@apache.org on 2001/10/25 14:34:07 UTC

cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/trax TransformerHandlerImpl.java TransformerImpl.java

morten      01/10/25 05:34:07

  Modified:    java/src/org/apache/xalan/xsltc/trax
                        TransformerHandlerImpl.java TransformerImpl.java
  Log:
  Fixed the TransformerHandler so that it's Transformer instance can be used
  separateely from the handler itself.
  PR:		bugzilla 3873
  Obtained from:	n/a
  Submitted by:	morten@xml.apache.org
  Reviewed by:	morten@xml.apache.org
  
  Revision  Changes    Path
  1.5       +8 -8      xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java
  
  Index: TransformerHandlerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TransformerHandlerImpl.java	2001/10/08 07:41:45	1.4
  +++ TransformerHandlerImpl.java	2001/10/25 12:34:07	1.5
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: TransformerHandlerImpl.java,v 1.4 2001/10/08 07:41:45 morten Exp $
  + * @(#)$Id: TransformerHandlerImpl.java,v 1.5 2001/10/25 12:34:07 morten Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -97,13 +97,6 @@
   	// Save the reference to the transformer
   	_transformer = transformer;
   
  -	// Create an internal DOM (not W3C) and get SAX2 input handler
  -	_dom = new DOMImpl();
  -	_handler = _dom.getBuilder();
  -
  -	// Set this DOM as the transformer's DOM
  -	_transformer.setDOM(_dom);
  -	
   	// Get a reference to the translet wrapped inside the transformer
   	_translet = _transformer.getTranslet();
       }
  @@ -178,6 +171,10 @@
   	if (_result == null) {
   	    throw new SAXException(NULL_RESULT_ERROR);
   	}
  +	// Create an internal DOM (not W3C) and get SAX2 input handler
  +	_dom = new DOMImpl();
  +	_handler = _dom.getBuilder();
  +
   	_handler.startDocument();
       }
   
  @@ -202,6 +199,9 @@
   	}
   	// Signal that the internal DOM is build (see 'setResult()').
   	_done = true;
  +
  +	// Set this DOM as the transformer's DOM
  +	_transformer.setDOM(_dom);
       }
   	
       /**
  
  
  
  1.29      +1 -7      xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java
  
  Index: TransformerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- TransformerImpl.java	2001/10/12 14:43:24	1.28
  +++ TransformerImpl.java	2001/10/25 12:34:07	1.29
  @@ -1,5 +1,5 @@
   /*
  - * @(#)$Id: TransformerImpl.java,v 1.28 2001/10/12 14:43:24 morten Exp $
  + * @(#)$Id: TransformerImpl.java,v 1.29 2001/10/25 12:34:07 morten Exp $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -449,7 +449,6 @@
   	    _translet.transform(dom, handler);
   	}
   	catch (TransletException e) {
  -	    e.printStackTrace();
   	    if (_errorListener != null)
   		postErrorToListener(e.getMessage());
   	    throw new TransformerException(e);
  @@ -457,8 +456,6 @@
   	catch (RuntimeException e) {
   	    if (_errorListener != null)
   		postErrorToListener("Runtime Error: " + e.getMessage());
  -	    System.err.println("Error: "+e.getMessage());
  -	    e.printStackTrace();
   	    throw new TransformerException(e);
   	}
   	catch (Exception e) {
  @@ -835,9 +832,6 @@
       public void error(TransformerException e)
   	throws TransformerException {
   	System.err.println("ERROR: "+e.getMessageAndLocation());
  -	Throwable wrapped = e.getException();
  -	if (wrapped != null)
  -	    System.err.println("     : "+wrapped.getMessage());
   	throw(e); 	
       }
   
  
  
  

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