svn commit: r891347 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java

Author: sebb
Date: Wed Dec 16 17:49:00 2009
New Revision: 891347

URL: http://svn.apache.org/viewvc?rev=891347&view=rev
Log:
Add saveHeaders option to saveCSVStats method

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=891347&r1=891346&r2=891347&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java Wed Dec 16 17:49:00 2009
@@ -103,6 +103,8 @@
     private static final String DEFAULT_DATE_FORMAT_STRING = "MM/dd/yy HH:mm:ss"; // $NON-NLS-1$
     private static final DateFormat DEFAULT_DATE_FORMAT = new SimpleDateFormat(DEFAULT_DATE_FORMAT_STRING);
 
+    private static final String LINE_SEP = System.getProperty("line.separator"); // $NON-NLS-1$
+
     /**
      * Private constructor to prevent instantiation.
      */
@@ -612,7 +614,6 @@
      */
     public static void saveCSVStats(Vector<?> data, FileWriter writer, String headers[]) throws IOException {
         final char DELIM = ',';
-        final String LINE_SEP = System.getProperty("line.separator"); // $NON-NLS-1$
         final char SPECIALS[] = new char[] {DELIM, QUOTING_CHAR};
         if (headers != null){
             for (int i=0; i < headers.length; i++){
@@ -637,7 +638,7 @@
     }
 
     /**
-     * Method saves aggregate statistics as CSV from a table model.
+     * Method saves aggregate statistics (with header names) as CSV from a table model.
      * Same as {@link #saveCSVStats(Vector, FileWriter, String[])} except
      * that there is no need to create a Vector containing the data.
      *
@@ -646,18 +647,33 @@
      * @throws IOException
      */
     public static void saveCSVStats(DefaultTableModel model, FileWriter writer) throws IOException {
+        saveCSVStats(model, writer, true);
+    }
+
+    /**
+     * Method saves aggregate statistics as CSV from a table model.
+     * Same as {@link #saveCSVStats(Vector, FileWriter, String[])} except
+     * that there is no need to create a Vector containing the data.
+     *
+     * @param model table model containing the data
+     * @param writer output file
+     * @param saveHeaders whether or not to save headers
+     * @throws IOException
+     */
+    public static void saveCSVStats(DefaultTableModel model, FileWriter writer, boolean saveHeaders) throws IOException {
         final char DELIM = ',';
-        final String LINE_SEP = System.getProperty("line.separator"); // $NON-NLS-1$
         final char SPECIALS[] = new char[] {DELIM, QUOTING_CHAR};
         final int columns = model.getColumnCount();
         final int rows = model.getRowCount();
-        for (int i=0; i < columns; i++){
-            if (i>0) {
-                writer.write(DELIM);
+        if (saveHeaders){
+            for (int i=0; i < columns; i++){
+                if (i>0) {
+                    writer.write(DELIM);
+                }
+                writer.write(quoteDelimiters(model.getColumnName(i),SPECIALS));
             }
-            writer.write(quoteDelimiters(model.getColumnName(i),SPECIALS));
+            writer.write(LINE_SEP);
         }
-        writer.write(LINE_SEP);
         for (int row=0; row < rows; row++) {
             for (int column=0; column < columns; column++) {
                 if (column > 0) {