X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.imports.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fimports%2Fui%2FCSVImportModel.java;h=6861b5c4d94e178592d49ef6876a7696862a2fc2;hb=refs%2Fchanges%2F42%2F2842%2F2;hp=7c660b4c70c9df6605bce156f87a2f041438eba2;hpb=46e2c804156e3bd2072ec91a801954c18cd15580;p=simantics%2Fdistrict.git

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 7c660b4c..6861b5c4 100644
--- 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;
@@ -71,6 +72,7 @@ public class CSVImportModel {
     private int valvePositionIndx = -1;
     private int addressIndex;
     private int lengthIndex;
+    private int detailedGeometryIndex;
     
     // Third page
 
@@ -94,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();
     }
@@ -131,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();
     }
@@ -491,4 +493,12 @@ public class CSVImportModel {
     public void setLengthIndex(int lengthIndex) {
         this.lengthIndex = lengthIndex;
     }
+
+    public void detailedGeometryIndex(int detailedGeometryIndex) {
+        this.detailedGeometryIndex = detailedGeometryIndex;
+    }
+    
+    public int getDetailedGeometryIndex() {
+        return detailedGeometryIndex;
+    }
 }