sebb 2004/03/14 17:19:30
Modified: src/components/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java
Log:
Restoring ability to show images which got lost a few edits ago
(probably my fault)
Revision Changes Path
1.42 +29 -24
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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ViewResultsFullVisualizer.java 7 Mar 2004 23:25:30 -0000 1.41
+++ ViewResultsFullVisualizer.java 15 Mar 2004 01:19:30 -0000 1.42
@@ -28,10 +28,10 @@
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
-//import javax.swing.Icon;
-//import javax.swing.ImageIcon;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
import javax.swing.JEditorPane;
-//import javax.swing.JLabel;
+import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
@@ -89,7 +89,7 @@
private JTextPane stats;
private JEditorPane results;
private JScrollPane resultsScrollPane;
- //private JLabel imageLabel;
+ private JLabel imageLabel;
private JTextArea sampleDataField;
private JRadioButton textButton;
@@ -223,8 +223,6 @@
if (node != null)
{
SampleResult res = (SampleResult) node.getUserObject();
- // res could be null here.
- //byte[] responseBytes = res.getResponseData();
if (log.isDebugEnabled())
{
@@ -306,21 +304,29 @@
"\nHTTP response headers:\n" +
res.getResponseHeaders() + "\n",
null);
- String response = getResponseAsString(res);
- if (textMode)
+ // get the text response and image icon
+ // to determine which is NOT null
+ if ((SampleResult.TEXT).equals(res.getDataType())) //
equals(null) is OK
{
- showTextResponse(response);
+ String response = getResponseAsString(res);
+ if (textMode)
+ {
+ showTextResponse(response);
+ }
+ else
+ {
+ showRenderedResponse(response);
+ }
}
else
{
- showRenderedResponse(response);
+ byte[] responseBytes = res.getResponseData();
+ if (responseBytes != null)
+ {
+ showImage(new ImageIcon(responseBytes));
+ }
}
}
- // res is null at this point - so how did responseBytes get set up??
-// else if (responseBytes != null)
-// {
-// showImage(new ImageIcon(responseBytes));
-// }
}
}
catch (BadLocationException exc)
@@ -331,14 +337,13 @@
log.debug("End : valueChanged1");
}
-// NOTUSED
-// private void showImage(Icon image)
-// {
-// imageLabel.setIcon(image);
-// resultsScrollPane.setViewportView(imageLabel);
-// textButton.setEnabled(false);
-// htmlButton.setEnabled(false);
-// }
+ private void showImage(Icon image)
+ {
+ imageLabel.setIcon(image);
+ resultsScrollPane.setViewportView(imageLabel);
+ textButton.setEnabled(false);
+ htmlButton.setEnabled(false);
+ }
protected void showTextResponse(String response)
{
@@ -575,7 +580,7 @@
results.setEditable(false);
resultsScrollPane = makeScrollPane(results);
- //imageLabel = new JLabel();
+ imageLabel = new JLabel();
JPanel resultsPane = new JPanel(new BorderLayout());
resultsPane.add(resultsScrollPane, BorderLayout.CENTER);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
