cvs commit: xml-xalan/java/src/org/apache/xalan/transformer TransformerImpl.java

[mmidy]

mmidy       00/12/14 16:05:53

  Modified:    java/src/org/apache/xalan/templates StylesheetRoot.java
               java/src/org/apache/xalan/transformer TransformerImpl.java
  Log:
  Use GetOutputFormat when need to get output properties
  
  Revision  Changes    Path
  1.33      +1 -1      
xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java
  
  Index: StylesheetRoot.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- StylesheetRoot.java       2000/12/14 23:46:10     1.32
  +++ StylesheetRoot.java       2000/12/15 00:05:52     1.33
  @@ -188,7 +188,7 @@
      */
     public Properties getOutputProperties()
     {    
  -    return getDefaultOutputProps().clone();
  +    return (Properties)getDefaultOutputProps().clone();
     }
   
     //============== End Templates Interface ================
  
  
  
  1.61      +8 -10     
xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
  
  Index: TransformerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- TransformerImpl.java      2000/12/14 23:46:12     1.60
  +++ TransformerImpl.java      2000/12/15 00:05:53     1.61
  @@ -681,13 +681,14 @@
       throws IllegalArgumentException
     {    
       String value = null;
  -    if(null != m_outputFormat)
  -    {
  -      value = m_outputFormat.getProperty(qnameString);
  -    }
  +    
  +    OutputProperties props = getOutputFormat();    
  +    
  +    value = props.getProperty(qnameString);
  +    
       if(null == value)
       {
  -      if(!m_outputFormat.isLegalPropertyKey(qnameString))
  +      if(!props.isLegalPropertyKey(qnameString))
           throw new IllegalArgumentException("output property not recognized: 
"+qnameString);
       }
       return value;
  @@ -755,11 +756,8 @@
      * for the next transformation.
      */
     public Properties getOutputProperties()
  -  {
  -    if (null == m_outputFormat) 
  -      m_outputFormat = new 
OutputProperties(m_stylesheetRoot.getOutputProperties());
  -    
  -    return (Properties)m_outputFormat.getProperties().clone();  
  +  {    
  +    return (Properties)getOutputFormat().getProperties().clone();  
     }
   
     /**