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 se...@apache.org on 2006/04/05 22:02:55 UTC
svn commit: r391767 -
/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java
Author: sebb
Date: Wed Apr 5 13:02:53 2006
New Revision: 391767
URL: http://svn.apache.org/viewcvs?rev=391767&view=rev
Log:
Tidy up; add NLS markers
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=391767&r1=391766&r2=391767&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java Wed Apr 5 13:02:53 2006
@@ -65,7 +65,9 @@
*/
public class ResultCollector extends AbstractListenerElement implements SampleListener, Clearable, Serializable,
TestListener, Remoteable, NoThreadClone {
- static final long serialVersionUID = 2;
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
+ private static final long serialVersionUID = 2;
private static final String TESTRESULTS_START = "<testResults>"; // $NON-NLS-1$
@@ -79,8 +81,6 @@
private static final int MIN_XML_FILE_LEN = XML_HEADER.length() + TESTRESULTS_START.length()
+ TESTRESULTS_END.length();
- transient private static Logger log = LoggingManager.getLoggerForClass();
-
public final static String FILENAME = "filename"; // $NON-NLS-1$
private final static String SAVE_CONFIG = "saveConfig"; // $NON-NLS-1$
@@ -163,11 +163,11 @@
}
public void testEnded() {
- testEnded("local");
+ testEnded("local"); // $NON-NLS-1$
}
public void testStarted() {
- testStarted("local");
+ testStarted("local"); // $NON-NLS-1$
}
public void loadExistingFile() throws IOException {
@@ -314,26 +314,6 @@
return true;
}
- /**
- * Gets the serializedSampleResult attribute of the ResultCollector object.
- *
- * @param result
- * description of the Parameter
- * @return the serializedSampleResult value
- */
- // NOTUSED
- // private String getSerializedSampleResult(SampleResult result)
- // throws SAXException, IOException, ConfigurationException
- // {
- // ByteArrayOutputStream tempOut = new ByteArrayOutputStream();
- //
- // serializer.serialize(tempOut, OldSaveService.getConfiguration(result,
- // getFunctionalMode()));
- // String serVer = tempOut.toString();
- //
- // return serVer.substring(serVer.indexOf(System
- // .getProperty("line.separator")));
- // }
private void readSamples(TestResultWrapper testResults) throws Exception {
Collection samples = testResults.getSampleResults();
Iterator iter = samples.iterator();
@@ -362,10 +342,6 @@
finalizeFileOutput();
}
- // public void setListener(Object l)
- // {
- // }
-
public void sampleStarted(SampleEvent e) {
}
@@ -440,13 +416,12 @@
int index = serVer.indexOf(lineSep); // Is there a new-line?
if (index > -1) {// Yes, assume it follows the prefix
return serVer.substring(index);
- } else { // no new-line; check for prefix and repace with new-line
- if (serVer.startsWith("<?xml")){ // $NON-NLS-1$
- index=serVer.indexOf("?>");// must exist // $NON-NLS-1$
- return lineSep + serVer.substring(index+2);// +2 for ?>
- }
- return serVer;
}
+ if (serVer.startsWith("<?xml")){ // $NON-NLS-1$
+ index=serVer.indexOf("?>");// must exist // $NON-NLS-1$
+ return lineSep + serVer.substring(index+2);// +2 for ?>
+ }
+ return serVer;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org