Merge "Make vertices smaller on map UI & CSV import performance improvements"

[simantics/district.git] / org.simantics.district.imports.ui / src / org / simantics / district / imports / ui / CSVImportModel.java

diff --git a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java
index 93646ded2022e92c9f213ab59054d3c0a60166e2..6861b5c4d94e178592d49ef6876a7696862a2fc2 100644 (file)
--- a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java
+++ b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVRecord;
 import org.simantics.db.Resource;
 import org.simantics.district.imports.DistrictImportUtils;
@@ -95,9 +96,9 @@ public class CSVImportModel {
         return source;
     }
 
-    public List<CSVRecord> getRows(int amount) throws IOException {
+    public List<CSVRecord> getRows(int amount, boolean readFirstAsHeader) throws IOException {
         if (source != null)
-            return DistrictImportUtils.readRows(source, delimiter, amount);
+            return DistrictImportUtils.readRows(source, delimiter, readFirstAsHeader, amount);
         else
             return Collections.emptyList();
     }
@@ -132,7 +133,7 @@ public class CSVImportModel {
 
     public List<Map<String, String>> readRows(int amount) throws IOException {
         if (source != null)
-            return DistrictImportUtils.readRows(source, delimiter, readFirstAsHeader, amount);
+            return DistrictImportUtils.readRows(source, CSVFormat.newFormat(delimiter), readFirstAsHeader, amount);
         else
             return Collections.emptyList();
     }