commit c15dc266df2881fc38fb2b0d44d1d233761938e2
author Dirk Fauth <dirk.fauth@googlemail.com> Mon Oct 26 10:04:56 2020 +0100
committer Dirk Fauth <dirk.fauth@googlemail.com> Mon Oct 26 10:04:56 2020 +0100
tree 202eaac1255295fb2e48d20ba983527a2e893512
parent f9adb1651ca54d264be523876a8c490a9f55990b

Bug 568238 - CSV export should export according to RFC4180

Change-Id: I1aa7a46c00417de976ad62f5895f536f9e5d82f7
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>

org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/export/csv/CsvExporter.java

diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/export/csv/CsvExporter.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/export/csv/CsvExporter.java
index 6874000..f988f0b 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/export/csv/CsvExporter.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/export/csv/CsvExporter.java
@@ -34,6 +34,8 @@
     private static final String CSV_FILE_EXTENSION = "*.csv"; //$NON-NLS-1$
     private static final String CSV_FILE_FILTER = "CSV (*.csv)"; //$NON-NLS-1$
     private static final String DEFAULT_EXPORT_FILE_NAME = "csv_export.csv"; //$NON-NLS-1$
+    private static final String NEW_LINE_REGEX = "\\n\\r|\\r\\n|\\n|\\r"; //$NON-NLS-1$
+    private static final String LINE_SEPARATOR = System.getProperty("line.separator"); //$NON-NLS-1$
     private final IOutputStreamProvider outputStreamProvider;
     private String charset = "windows-1252"; //$NON-NLS-1$
     private String delimiter = ";"; //$NON-NLS-1$
@@ -122,7 +124,7 @@
 
     @Override
     public void exportRowEnd(final OutputStream outputStream, final int rowPosition) throws IOException {
-        this.currentRow.append(System.getProperty("line.separator")); //$NON-NLS-1$
+        this.currentRow.append(LINE_SEPARATOR);
         outputStream.write(this.currentRow.toString().getBytes(this.usedCharset));
     }
 
@@ -145,7 +147,21 @@
         }
 
         if (exportDisplayValue != null) {
-            this.currentRow.append(exportDisplayValue);
+            // handle values according to RFC4180
+            String value = exportDisplayValue.toString();
+
+            // If double-quotes are used to enclose fields, then a double-quote
+            // appearing inside a field must be escaped by preceding it with
+            // another double quote.
+            value = value.replaceAll("\"", "\"\""); //$NON-NLS-1$ //$NON-NLS-2$
+
+            // Fields containing line breaks (CRLF), double quotes, and commas
+            // should be enclosed in double-quotes.
+            if (value.contains("\"") || value.contains(",") || value.split(NEW_LINE_REGEX).length > 1) { //$NON-NLS-1$ //$NON-NLS-2$
+                value = "\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$
+            }
+
+            this.currentRow.append(value);
         }
     }