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

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

diff --git a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/ComponentMappingPage.java b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/ComponentMappingPage.java
index 5cf5551194a9fab2274fbe69edc8d70a62c1eec6..7b87b29f9c124063b70b2321725da1569613b3ff 100644 (file)
--- a/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/ComponentMappingPage.java
+++ b/org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/ComponentMappingPage.java
@@ -20,8 +20,10 @@ import org.eclipse.swt.widgets.Label;
 import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.common.request.IndexRoot;
 import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.district.imports.CSVImportModel;
 import org.simantics.district.imports.DistrictImportUtils;
 import org.simantics.district.network.ui.function.Functions;
 
@@ -31,7 +33,6 @@ public class ComponentMappingPage extends WizardPage {
     private Composite composite;
     private Composite childComposite;
     protected Map<String, Resource> componentMappings;
-    private Collection<String> distinctMappingIvalues;
     private Collection<String> distinctMappingIndexColumnValues;
 
     public ComponentMappingPage(CSVImportModel model) {
@@ -74,10 +75,11 @@ public class ComponentMappingPage extends WizardPage {
                     
                     @Override
                     public void run(ReadGraph graph) throws DatabaseException {
+                        Resource indexRoot = graph.sync(new IndexRoot(model.getParentDiagram()));
                         if (model.isVertexImport())
-                            componentMappings = Functions.getVertexMappings(graph, model.getParentDiagram());
+                            componentMappings = Functions.getVertexMappings(graph, indexRoot);
                         else
-                            componentMappings = Functions.getEdgeMappings(graph, model.getParentDiagram());
+                            componentMappings = Functions.getEdgeMappings(graph, indexRoot);
                     }
                 });
             } catch (DatabaseException e) {