sebb 2004/09/28 16:04:38
Modified: bin Tag: rel-2_0 jmeter.properties
src/components/org/apache/jmeter/visualizers Tag: rel-2_0
ViewResultsFullVisualizer.java
Log:
Add download embedded resources checkbox to GUI
Revision Changes Path
No revision
No revision
1.100.2.8 +2 -6 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.100.2.7
retrieving revision 1.100.2.8
diff -u -r1.100.2.7 -r1.100.2.8
--- jmeter.properties 25 Sep 2004 20:59:50 -0000 1.100.2.7
+++ jmeter.properties 28 Sep 2004 23:04:38 -0000 1.100.2.8
@@ -302,8 +302,4 @@
#mailer.successlimit=2
#
# Number of failed samples before a message is sent
-#mailer.failurelimit=2
-
-# Should View Results Tree download embedded resources?
-# TODO should be added to GUI one day
-#viewresults.embeddedresources=true
\ No newline at end of file
+#mailer.failurelimit=2
\ No newline at end of file
No revision
No revision
1.42.2.4 +20 -16
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.42.2.3
retrieving revision 1.42.2.4
diff -u -r1.42.2.3 -r1.42.2.4
--- ViewResultsFullVisualizer.java 21 Sep 2004 00:41:14 -0000 1.42.2.3
+++ ViewResultsFullVisualizer.java 28 Sep 2004 23:04:38 -0000 1.42.2.4
@@ -30,6 +30,7 @@
import javax.swing.ButtonGroup;
import javax.swing.Icon;
import javax.swing.ImageIcon;
+import javax.swing.JCheckBox;
import javax.swing.JEditorPane;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -78,24 +79,25 @@
extends AbstractVisualizer
implements ActionListener, TreeSelectionListener, Clearable
{
- transient private static Logger log = LoggingManager.getLoggerForClass();
+ transient private static Logger log = LoggingManager.getLoggerForClass();
public final static Color SERVER_ERROR_COLOR = Color.red;
public final static Color CLIENT_ERROR_COLOR = Color.blue;
public final static Color REDIRECT_COLOR = Color.green;
+ private static final String DOWNLOAD_LABEL = "Download embedded resources";
private static final String HTML_BUTTON_LABEL = "Render HTML";
private static final String TEXT_BUTTON_LABEL = "Show Text";
- private static final String HTML_COMMAND = "html";
- private static final String TEXT_COMMAND = "text";
+ private static final String TEXT_HTML = "text/html"; // $NON-NLS-1$
+ private static final String HTML_COMMAND = "html"; // $NON-NLS-1$
+ private static final String TEXT_COMMAND = "text"; // $NON-NLS-1$
private boolean textMode = true;
- // TODO add to GUI
- private boolean downloadEmbeddedResources =
- JMeterUtils.getPropDefault("viewresults.embeddedresources",true);
-
+ // Keep copies of the two editors needed
private static EditorKit customisedEditor = new LocalHTMLEditorKit();
+ private static EditorKit defaultHtmlEditor =
+ JEditorPane.createEditorKitForContentType(TEXT_HTML);
private DefaultMutableTreeNode root;
private DefaultTreeModel treeModel;
@@ -108,6 +110,7 @@
private JRadioButton textButton;
private JRadioButton htmlButton;
+ private JCheckBox downloadAll;
private JTree jTree;
@@ -473,15 +476,13 @@
* enable the editor-kit. The Stream property can then be
*/
- if (!downloadEmbeddedResources)
- {
- // Must be done before setContentType
-
results.setEditorKitForContentType("text/html",customisedEditor);
- }
+ // Must be done before setContentType
+ results.setEditorKitForContentType(TEXT_HTML,
+ downloadAll.isSelected() ? defaultHtmlEditor :
customisedEditor);
- results.setContentType("text/html");
+ results.setContentType(TEXT_HTML);
- if (downloadEmbeddedResources)
+ if (downloadAll.isSelected())
{
// Allow JMeter to render frames (and relative images)
// Must be done after setContentType [Why?]
@@ -520,9 +521,12 @@
htmlButton.setSelected(!textMode);
group.add(htmlButton);
+ downloadAll = new JCheckBox(DOWNLOAD_LABEL);
+
JPanel pane = new JPanel();
pane.add(textButton);
pane.add(htmlButton);
+ pane.add(downloadAll);
return pane;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
