sebb 2004/03/07 15:25:30
Modified: src/components/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java
Log:
Comment out impossible code: if result is null, how can there be any responseData?
Also comment out code used only by the above commented out code
Revision Changes Path
1.41 +26 -26
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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ViewResultsFullVisualizer.java 5 Mar 2004 01:33:33 -0000 1.40
+++ ViewResultsFullVisualizer.java 7 Mar 2004 23:25:30 -0000 1.41
@@ -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;
@@ -53,6 +53,7 @@
import org.apache.jmeter.samplers.Clearable;
import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -88,7 +89,7 @@
private JTextPane stats;
private JEditorPane results;
private JScrollPane resultsScrollPane;
- private JLabel imageLabel;
+ //private JLabel imageLabel;
private JTextArea sampleDataField;
private JRadioButton textButton;
@@ -222,7 +223,8 @@
if (node != null)
{
SampleResult res = (SampleResult) node.getUserObject();
- byte[] responseBytes = res.getResponseData();
+ // res could be null here.
+ //byte[] responseBytes = res.getResponseData();
if (log.isDebugEnabled())
{
@@ -314,10 +316,11 @@
showRenderedResponse(response);
}
}
- else 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)
@@ -328,13 +331,14 @@
log.debug("End : valueChanged1");
}
- private void showImage(Icon image)
- {
- imageLabel.setIcon(image);
- resultsScrollPane.setViewportView(imageLabel);
- textButton.setEnabled(false);
- htmlButton.setEnabled(false);
- }
+// NOTUSED
+// private void showImage(Icon image)
+// {
+// imageLabel.setIcon(image);
+// resultsScrollPane.setViewportView(imageLabel);
+// textButton.setEnabled(false);
+// htmlButton.setEnabled(false);
+// }
protected void showTextResponse(String response)
{
@@ -352,9 +356,6 @@
byte[] responseBytes = res.getResponseData();
String response = null;
-// System.out.println("grasDE="+res.getDataEncoding());
-// System.out.println("grasCT="+res.getContentType());
-// System.out.println("grasDT="+res.getDataType());
if (res.getDataType() != null
&& res.getDataType().equals(SampleResult.TEXT))
{
@@ -504,10 +505,9 @@
Component leftSide = createLeftPanel();
JTabbedPane rightSide= new JTabbedPane();
- // TODO: i18n
- rightSide.addTab("Sampler result", createResponseMetadataPanel());
- rightSide.addTab("Request", createRequestPanel());
- rightSide.addTab("Response data", createResponseDataPanel());
+ rightSide.addTab(JMeterUtils.getResString("view_results_tab_sampler"),
createResponseMetadataPanel());
+ rightSide.addTab(JMeterUtils.getResString("view_results_tab_request"),
createRequestPanel());
+
rightSide.addTab(JMeterUtils.getResString("view_results_tab_response"),
createResponseDataPanel());
JSplitPane mainSplit =
new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftSide, rightSide);
@@ -575,7 +575,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]
