jsalvata 2003/12/16 19:39:30
Modified: src/components/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java
src/core/org/apache/jmeter/save SaveService.java
src/protocol/http/org/apache/jmeter/protocol/http/parser
HtmlParsingUtils.java
Log:
* Use UTF-8 consistently (instead of utf-8).
* Remove some obsolete code (specific to JDK1.2-1.3)
Revision Changes Path
1.35 +3 -3
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ViewResultsFullVisualizer.java 9 Dec 2003 00:29:00 -0000 1.34
+++ ViewResultsFullVisualizer.java 17 Dec 2003 03:39:30 -0000 1.35
@@ -349,7 +349,7 @@
String response = null;
try
{
- response = new String(responseBytes, "utf-8");
+ response = new String(responseBytes, "UTF-8");
}
catch (UnsupportedEncodingException err)
{
@@ -438,7 +438,7 @@
{
try
{
- response = new String(responseBytes, "utf-8");
+ response = new String(responseBytes, "UTF-8");
}
catch (UnsupportedEncodingException err)
{
1.31 +3 -3 jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java
Index: SaveService.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SaveService.java 19 Oct 2003 22:28:55 -0000 1.30
+++ SaveService.java 17 Dec 2003 03:39:30 -0000 1.31
@@ -557,7 +557,7 @@
try
{
- config.setValue(new String(bin, "utf-8"));
+ config.setValue(new String(bin, "UTF-8"));
}
catch (UnsupportedEncodingException e)
{
@@ -574,7 +574,7 @@
}
try
{
- return config.getValue("").getBytes("utf-8");
+ return config.getValue("").getBytes("UTF-8");
}
catch (UnsupportedEncodingException e)
{
1.5 +3 -60
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
Index: HtmlParsingUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HtmlParsingUtils.java 17 Dec 2003 03:21:16 -0000 1.4
+++ HtmlParsingUtils.java 17 Dec 2003 03:39:30 -0000 1.5
@@ -259,7 +259,7 @@
Node node =
getParser().parseDOM(
new ByteArrayInputStream(
- text.getBytes(getUTFEncodingName())),
+ text.getBytes("UTF-8")),
null);
if (log.isDebugEnabled())
@@ -279,47 +279,6 @@
}
}
- /**
- * Returns the encoding type which is different for different jdks even
- * though they mean the same thing i.e. UTF8 or UTF-8.
- *
- * @return either UTF8 or UTF-8 depending on the jdk version
- */
- public static String getUTFEncodingName()
- {
- log.debug("Start : getUTFEncodingName1");
-
- if (utfEncodingName == null)
- {
- String versionNum = System.getProperty("java.version");
-
- if (log.isDebugEnabled())
- {
- log.debug("getUTFEncodingName1 : versionNum - " + versionNum);
- }
-
- if (versionNum.startsWith("1.1"))
- {
- utfEncodingName = "UTF8";
- }
- else
- {
- utfEncodingName = "UTF-8";
- }
- }
-
- if (log.isDebugEnabled())
- {
- log.debug(
- "getUTFEncodingName1 : Returning utfEncodingName - "
- + utfEncodingName);
- }
-
- log.debug("End : getUTFEncodingName1");
-
- return utfEncodingName;
- }
-
public static Document createEmptyDoc()
{
return Tidy.createEmptyDocument();
@@ -518,22 +477,6 @@
public Test(String name)
{
super(name);
- }
-
- public void testGetUTFEncodingName()
- {
- log.debug("Start : testGetUTFEncodingName1");
- String javaVersion = System.getProperty("java.version");
- utfEncodingName = null;
- System.setProperty("java.version", "1.1");
- assertEquals("UTF8", HtmlParsingUtils.getUTFEncodingName());
- // need to clear utfEncodingName variable first 'cos
- // getUTFEncodingName checks to see if it's null
- utfEncodingName = null;
- System.setProperty("java.version", "1.2");
- assertEquals("UTF-8", HtmlParsingUtils.getUTFEncodingName());
- System.setProperty("java.version", javaVersion);
- log.debug("End : testGetUTFEncodingName1");
}
protected void setUp()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
