Make it possible to import CSV data via SCL & create models

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

diff --git a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java b/org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java
similarity index 98%
rename from org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java
rename to org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java
index 6861b5c4d94e178592d49ef6876a7696862a2fc2..5041f1bbe69e2fe98356f532f1b98d0bfd626904 100644 (file)
--- a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java
+++ b/org.simantics.district.imports/src/org/simantics/district/imports/CSVImportModel.java
@@ -1,4 +1,4 @@
-package org.simantics.district.imports.ui;
+package org.simantics.district.imports;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -10,7 +10,6 @@ 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;
 import org.simantics.district.imports.DistrictImportUtils.CSVHeader;
 
 public class CSVImportModel {
@@ -70,9 +69,9 @@ public class CSVImportModel {
     private int idIndex = -1;
     private double edgePadding = 0.0001; // default
     private int valvePositionIndx = -1;
-    private int addressIndex;
-    private int lengthIndex;
-    private int detailedGeometryIndex;
+    private int addressIndex = -1;
+    private int lengthIndex = -1;
+    private int detailedGeometryIndex = -1;
     
     // Third page
 
@@ -462,7 +461,7 @@ public class CSVImportModel {
         this.idIndex = idIndex;
     }
 
-    public void setEdgePapping(double edgePadding) {
+    public void setEdgePadding(double edgePadding) {
         this.edgePadding = edgePadding;
     }