cvs commit: xml-xalan/java/src/org/apache/xalan/templates output_text.properties OutputProperties.java

[sboag]

sboag       00/12/08 19:47:27

  Modified:    java/src/org/apache/xalan/templates output_text.properties
                        OutputProperties.java
  Log:
  Set the encoding for the text method to be the system default.
  
  Revision  Changes    Path
  1.3       +1 -2      
xml-xalan/java/src/org/apache/xalan/templates/output_text.properties
  
  Index: output_text.properties
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/output_text.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- output_text.properties    2000/12/08 23:28:07     1.2
  +++ output_text.properties    2000/12/09 03:47:26     1.3
  @@ -1,6 +1,5 @@
   #
  -# Specify defaults when method="text".  These defaults use 
output_xml.properties 
  -# as a base.
  +# Specify defaults when method="text".
   #
   
   # XSLT properties do not need namespace qualification.
  
  
  
  1.5       +6 -1      
xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java
  
  Index: OutputProperties.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OutputProperties.java     2000/12/08 22:48:02     1.4
  +++ OutputProperties.java     2000/12/09 03:47:26     1.5
  @@ -272,7 +272,12 @@
               if (null == m_text_properties)  // double check
               {
                 m_text_properties = 
loadPropertiesFile("output_text.properties", 
  -                                                     m_xml_properties);
  +                                                     null);
  +              if(null == m_text_properties.getProperty(OutputKeys.ENCODING))
  +              {
  +                String mimeEncoding = 
org.apache.xalan.serialize.Encodings.getMimeEncoding(null);
  +                m_text_properties.put(OutputKeys.ENCODING, mimeEncoding);
  +              }
               }
             }
           }