Author: sebb
Date: Tue Dec 1 18:54:42 2009
New Revision: 885866
URL: http://svn.apache.org/viewvc?rev=885866&view=rev
Log:
Tidyup
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsText.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java?rev=885866&r1=885865&r2=885866&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
Tue Dec 1 18:54:42 2009
@@ -32,13 +32,9 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
public class RenderAsHTML extends SamplerResultTab implements ResultRenderer {
- private static final Logger log = LoggingManager.getLoggerForClass();
-
private static final String TEXT_HTML = "text/html"; // $NON-NLS-1$
// Keep copies of the two editors needed
@@ -82,7 +78,6 @@
* To disable downloading and rendering of images and frames, enable
the
* editor-kit. The Stream property can then be
*/
- log.debug("html embedded=" + embedded);
// Must be done before setContentType
results.setEditorKitForContentType(TEXT_HTML, embedded ?
defaultHtmlEditor : customisedEditor);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsText.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsText.java?rev=885866&r1=885865&r2=885866&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsText.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsText.java
Tue Dec 1 18:54:42 2009
@@ -40,7 +40,7 @@
/** {...@inheritdoc} */
@Override
public String toString() {
- return JMeterUtils.getResString("view_results_render_text");
+ return JMeterUtils.getResString("view_results_render_text"); //
$NON-NLS-1$
}
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java?rev=885866&r1=885865&r2=885866&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
Tue Dec 1 18:54:42 2009
@@ -89,11 +89,11 @@
resultsScrollPane.setViewportView(domTreePanel);
}
- /**
+ /*
*
* A Dom tree panel for to display response as tree view author <a
- * href="mailto:[email protected]";>Dave Maung</a> TODO implement to find any
- * nodes in the tree using TreePath.
+ * href="mailto:[email protected]";>Dave Maung</a>
+ * TODO implement to find any nodes in the tree using TreePath.
*
*/
private static class DOMTreePanel extends JPanel {
@@ -117,7 +117,7 @@
ToolTipManager.sharedInstance().registerComponent(domJTree);
domJTree.setCellRenderer(new DomTreeRenderer());
} catch (SAXException e) {
- log.warn("", e);
+ log.warn("Error trying to parse document", e);
}
}
@@ -216,7 +216,7 @@
/** {...@inheritdoc} */
@Override
public String toString() {
- return JMeterUtils.getResString("view_results_render_xml");
+ return JMeterUtils.getResString("view_results_render_xml"); //
$NON-NLS-1$
}
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java?rev=885866&r1=885865&r2=885866&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
Tue Dec 1 18:54:42 2009
@@ -45,13 +45,9 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.GuiUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
public abstract class SamplerResultTab implements ResultRenderer {
- private static final Logger log = LoggingManager.getLoggerForClass();
-
// N.B. these are not multi-threaded, so don't make it static
private final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss z"); // ISO format $NON-NLS-1$
@@ -127,7 +123,6 @@
setupTabPaneForSampleResult();
// load time label
- log.debug("valueChanged1 : load time - " +
sampleResult.getTime());
String sd = sampleResult.getSamplerData();
if (sd != null) {
String rh = sampleResult.getRequestHeaders();
@@ -156,7 +151,6 @@
statsBuff = new StringBuffer(); // reset for reuse
String responseCode = sampleResult.getResponseCode();
- log.debug("valueChanged1 : response code - " + responseCode);
int responseLevel = 0;
if (responseCode != null) {
@@ -187,7 +181,6 @@
// response message label
String responseMsgStr = sampleResult.getResponseMessage();
- log.debug("valueChanged1 : response message - " +
responseMsgStr);
statsBuff.append(JMeterUtils.getResString("view_results_response_message")).append(responseMsgStr).append(NL);
//$NON-NLS-1$
statsBuff.append(NL);
@@ -212,10 +205,6 @@
// We are displaying an AssertionResult
setupTabPaneForAssertionResult();
- if (log.isDebugEnabled()) {
- log.debug("valueChanged1 : sample result - " +
assertionResult);
- }
-
StringBuffer statsBuff = new StringBuffer(100);
statsBuff.append(JMeterUtils.getResString("view_results_assertion_error")).append(assertionResult.isError()).append(NL);
//$NON-NLS-1$
statsBuff.append(JMeterUtils.getResString("view_results_assertion_failure")).append(assertionResult.isFailure()).append(NL);
//$NON-NLS-1$
@@ -224,8 +213,7 @@
statsBuff = null;
}
} catch (BadLocationException exc) {
- log.error("Error setting statistics text", exc);
- stats.setText("");
+ stats.setText(exc.getLocalizedMessage());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
