Author: sebb
Date: Tue Jan  8 05:44:21 2008
New Revision: 609983

URL: http://svn.apache.org/viewvc?rev=609983&view=rev
Log:
Bug 44184 - Allow header to be saved with Aggregate Graph data

Modified:
    
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=609983&r1=609982&r2=609983&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
 Tue Jan  8 05:44:21 2008
@@ -33,6 +33,7 @@
 
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
@@ -128,6 +129,9 @@
     protected JButton saveTable = 
         new JButton(JMeterUtils.getResString("aggregate_graph_save_table"));   
                //$NON-NLS-1$
     
+    private JCheckBox saveHeaders = // should header be saved with the data?
+       new 
JCheckBox(JMeterUtils.getResString("aggregate_graph_save_table_header"));   
//$NON-NLS-1$
+ 
     JLabeledTextField graphTitle = 
         new 
JLabeledTextField(JMeterUtils.getResString("aggregate_graph_user_title")); 
//$NON-NLS-1$
     
@@ -264,6 +268,7 @@
         buttonpanel.add(displayButton);
         buttonpanel.add(saveGraph);
         buttonpanel.add(saveTable);
+        buttonpanel.add(saveHeaders);
         
         graph.add(graphLabel);
         graph.add(graphTitle);
@@ -388,7 +393,7 @@
             try {
                 writer = new FileWriter(output);
                 Vector data = this.getAllTableData();
-                CSVSaveService.saveCSVStats(data,writer);
+                
CSVSaveService.saveCSVStats(data,writer,saveHeaders.isSelected() ? COLUMNS : 
null);
             } catch (FileNotFoundException e) {
                 log.warn(e.getMessage());
             } catch (IOException e) {

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=609983&r1=609982&r2=609983&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
Tue Jan  8 05:44:21 2008
@@ -20,6 +20,7 @@
 aggregate_graph_response_time=Response Time
 aggregate_graph_save=Save Graph
 aggregate_graph_save_table=Save Table Data
+aggregate_graph_save_table_header=Save Table Header
 aggregate_graph_title=Aggregate Graph
 aggregate_graph_user_title=Title for Graph
 aggregate_graph_width=Width

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=609983&r1=609982&r2=609983&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Jan  8 05:44:21 2008
@@ -84,6 +84,7 @@
 <li>Bug 43379 - Switch Controller now supports selection by name as well as 
number</li>
 <li>Can specify list of variable names to be written to JTL files (CSV and XML 
format)</li>
 <li>Now checks that the remoteStart options -r and -R are only used with 
non_GUI -n option</li>
+<li>Bug 44184 - Allow header to be saved with Aggregate Graph data</li>
 </ul>
 
 <h4>Non-functional changes</h4>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to