You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2002/05/03 01:18:24 UTC
cvs commit: jakarta-jmeter/src_1/org/apache/jmeter/reporters ResultCollector.java
mstover1 02/05/02 16:18:24
Modified: src/org/apache/jmeter/gui/action Save.java
src/org/apache/jmeter/save/xml TagHandler.java
src_1/org/apache/jmeter/reporters ResultCollector.java
Log:
Fixing char encoding problem with saved .jmx files - Shunsuke Masuda contributor
Revision Changes Path
1.7 +5 -3 jakarta-jmeter/src/org/apache/jmeter/gui/action/Save.java
Index: Save.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/action/Save.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Save.java 2 May 2002 22:54:57 -0000 1.6
+++ Save.java 2 May 2002 23:18:24 -0000 1.7
@@ -106,9 +106,11 @@
{
return;
}
- FileWriter writer = null;
+ PrintWriter writer = null;
try {
- writer = new FileWriter(chooser.getSelectedFile());
+ writer = new PrintWriter(new OutputStreamWriter(
+ new BufferedOutputStream(new FileOutputStream(
+ chooser.getSelectedFile())),"UTF-8"));
TagHandler handler = (TagHandler) ((Saveable) model).getTagHandlerClass().newInstance();
handler.startSave(writer);
handler.save((Saveable) model, writer);
@@ -132,7 +134,7 @@
*
*@param writer Description of Parameter
*/
- private void closeWriter(FileWriter writer) {
+ private void closeWriter(Writer writer) {
if (writer != null) {
try {
writer.close();
1.8 +1 -1 jakarta-jmeter/src/org/apache/jmeter/save/xml/TagHandler.java
Index: TagHandler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/save/xml/TagHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TagHandler.java 16 Feb 2002 03:21:42 -0000 1.7
+++ TagHandler.java 2 May 2002 23:18:24 -0000 1.8
@@ -90,7 +90,7 @@
public void startSave(Writer out) throws IOException
{
- out.write("<?xml version=\"1.0\"?>\n\n");
+ out.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n");
}
/************************************************************
1.9 +4 -2 jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ResultCollector.java 2 May 2002 22:54:59 -0000 1.8
+++ ResultCollector.java 2 May 2002 23:18:24 -0000 1.9
@@ -71,7 +71,7 @@
* Title: Description: Copyright: Copyright (c) 2001 Company:
*
*@author Michael Stover
- *@created $Date: 2002/05/02 22:54:59 $
+ *@created $Date: 2002/05/02 23:18:24 $
*@version 1.0
*/
@@ -182,7 +182,9 @@
if(writer == null)
{
trimmed = trimLastLine(filename);
- writer = new PrintWriter(new BufferedOutputStream(new FileOutputStream(filename,trimmed)));
+ writer = new PrintWriter(new OutputStreamWriter(
+ new BufferedOutputStream(new FileOutputStream(
+ filename,trimmed)),"UTF-8"));
files.put(filename,writer);
}
if(!trimmed)
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>