X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.imports.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fimports%2Fui%2FCSVImportWizard.java;h=7a29e7505788c6b603a34f9dbf0c7cc76f30b896;hb=1bc60c2213f9b3fc7b4d935ba9afda2b767290e5;hp=97fa990aed619334c5d080e04b74b0e4ec2fb830;hpb=b10b919b6756df3b423dd416df6b1b06abc15f22;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
index 97fa990a..7a29e750 100644
--- a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
+++ b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
@@ -1,38 +1,61 @@
-package org.simantics.district.imports.ui;
-
-import java.io.IOException;
-import java.nio.file.Path;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-import org.simantics.district.imports.DistrictImportUtils;
-
-public class CSVImportWizard extends Wizard implements IImportWizard {
-
-    private CSVImportModel model;
-    
-    public CSVImportWizard() {
-        setWindowTitle("Import CSV data");
-    }
-    
-    
-    @Override
-    public void init(IWorkbench workbench, IStructuredSelection selection) {
-        model = new CSVImportModel();
-        addPage(new CSVImportWizardPage(model));
-    }
-    
-    @Override
-    public boolean performFinish() {
-        Path csvFile = model.getSource();
-        try {
-            DistrictImportUtils.importCSVAsLayer(csvFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-}
+package org.simantics.district.imports.ui;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.apache.commons.csv.CSVRecord;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbench;
+import org.geotools.referencing.CRS;
+import org.opengis.referencing.FactoryException;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.simantics.district.imports.DistrictImportUtils;
+
+public class CSVImportWizard extends Wizard implements IImportWizard {
+
+    private CSVImportModel model;
+    
+    public CSVImportWizard() {
+        setWindowTitle("Import CSV data");
+    }
+    
+    
+    @Override
+    public void init(IWorkbench workbench, IStructuredSelection selection) {
+        model = new CSVImportModel();
+        addPage(new CSVImportWizardPage(model));
+    }
+    
+    @Override
+    public boolean performFinish() {
+        try {
+            
+            
+            Path csvFile = model.getSource();
+            char delim = model.getDelimiter();
+            
+            List<CSVRecord> rows = DistrictImportUtils.readRows(csvFile, delim, -1);
+            
+            Path wktFile = model.getWKTFile();
+            
+            try {
+                
+                
+                CoordinateReferenceSystem crs = CRS.decode(null);
+            } catch (FactoryException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            
+            
+            DistrictImportUtils.importCSVAsLayer(csvFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+}