tmiller 01/10/10 04:50:52
Modified: java/src/org/apache/xalan/xsltc/runtime
AbstractTranslet.java DefaultSAXOutputHandler.java
TextOutput.java
Log:
bug fix 4040, UTF vs. uft
Revision Changes Path
1.26 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
Index: AbstractTranslet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/AbstractTranslet.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- AbstractTranslet.java 2001/09/28 14:39:14 1.25
+++ AbstractTranslet.java 2001/10/10 11:50:52 1.26
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: AbstractTranslet.java,v 1.25 2001/09/28 14:39:14 morten Exp $
+ * @(#)$Id: AbstractTranslet.java,v 1.26 2001/10/10 11:50:52 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -84,7 +84,7 @@
// appear as fields (with the same type, only public) in Output.java
public String _version = "1.0";
public String _method = null;
- public String _encoding = "utf-8";
+ public String _encoding = "UTF-8";
public boolean _omitHeader = false;
public String _standalone = null;
public String _doctypePublic = null;
1.21 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultSAXOutputHandler.java
Index: DefaultSAXOutputHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultSAXOutputHandler.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultSAXOutputHandler.java 2001/10/09 16:48:15 1.20
+++ DefaultSAXOutputHandler.java 2001/10/10 11:50:52 1.21
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DefaultSAXOutputHandler.java,v 1.20 2001/10/09 16:48:15 morten
Exp $
+ * @(#)$Id: DefaultSAXOutputHandler.java,v 1.21 2001/10/10 11:50:52 tmiller
Exp $
*
* The Apache Software License, Version 1.1
*
@@ -92,7 +92,7 @@
// Settings passed on from TextOutput
private int _outputType = TextOutput.UNKNOWN;
- private String _encoding = "utf-8";
+ private String _encoding = "UTF-8";
private String _version = "1.0";
private String _standalone = null;
private boolean _indent = false;
@@ -138,7 +138,7 @@
* Constructor - simple, initially for use in servlets
*/
public DefaultSAXOutputHandler(Writer writer) throws IOException {
- this(writer, "utf-8");
+ this(writer, "UTF-8");
}
/**
@@ -152,7 +152,7 @@
writer = new OutputStreamWriter(out, _encoding = encoding);
}
catch (java.io.UnsupportedEncodingException e) {
- writer = new OutputStreamWriter(out, _encoding = "utf-8" );
+ writer = new OutputStreamWriter(out, _encoding = "UTF-8" );
}
_writer = new BufferedWriter(writer);
init();
1.36 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TextOutput.java
Index: TextOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TextOutput.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- TextOutput.java 2001/10/02 11:17:32 1.35
+++ TextOutput.java 2001/10/10 11:50:52 1.36
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TextOutput.java,v 1.35 2001/10/02 11:17:32 morten Exp $
+ * @(#)$Id: TextOutput.java,v 1.36 2001/10/10 11:50:52 tmiller Exp $
*
* The Apache Software License, Version 1.1
*
@@ -197,7 +197,7 @@
private void init() throws IOException {
// Reset all output configuration from <xsl:output>
_outputType = UNKNOWN;
- _encoding = "utf-8";
+ _encoding = "UTF-8";
_mediaType = "text/html";
// Reset all internal variables and tables
@@ -941,7 +941,7 @@
public void setType(int type) {
try {
_outputType = type;
- if (_encoding == null) _encoding = "utf-8";
+ if (_encoding == null) _encoding = "UTF-8";
if (_saxHandler instanceof DefaultSAXOutputHandler)
((DefaultSAXOutputHandler)_saxHandler).setOutputType(type);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
