Merge branch 'feature/funcwrite'

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / migration / MigrationStateImpl.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/migration/MigrationStateImpl.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/migration/MigrationStateImpl.java
index bf860e44dafe32c400737d9804c95e458a7a61c8..2b19da58607dd66fa9368296ccf99a11100f30c2 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/migration/MigrationStateImpl.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/migration/MigrationStateImpl.java
@@ -37,12 +37,14 @@ import org.simantics.db.layer0.adapter.impl.DefaultPasteImportAdvisor;
 import org.simantics.db.layer0.internal.SimanticsInternal;
 import org.simantics.db.layer0.util.Layer0Utils;
 import org.simantics.db.layer0.util.ModelTransferableGraphSourceRequest;
+import org.simantics.db.layer0.util.TGTransferableGraphSource;
 import org.simantics.db.layer0.util.TransferableGraphConfiguration2;
 import org.simantics.db.request.Read;
 import org.simantics.db.service.ManagementSupport;
 import org.simantics.db.service.SerialisationSupport;
 import org.simantics.graph.db.IImportAdvisor;
 import org.simantics.graph.db.IImportAdvisor2;
+import org.simantics.graph.db.ImportResult;
 import org.simantics.graph.db.StreamingTransferableGraphFileReader;
 import org.simantics.graph.db.TGStatusMonitor;
 import org.simantics.graph.db.TransferableGraphImporter;
@@ -201,8 +203,8 @@ public class MigrationStateImpl implements MigrationState {
                                };
                                // Make sure that the supplied advisor is redirected to temp
                                advisor.redirect(indexRoot);
-                
-                TransferableGraphs.importGraph1WithMonitor(session, tg, advisor, new TGStatusMonitor() {
+
+                ImportResult ir = TransferableGraphs.importGraph1(session, new TGTransferableGraphSource(tg), advisor, new TGStatusMonitor() {
                     @Override
                     public void status(int percentage) {
                         monitor.subTask("Importing model from file (" + percentage + "%)");
@@ -212,7 +214,8 @@ public class MigrationStateImpl implements MigrationState {
                         return monitor.isCanceled();
                     }
                 });
-                
+
+                setProperty(MigrationStateKeys.IMPORT_RESULT, ir);
                 setProperty(MigrationStateKeys.CURRENT_RESOURCE, indexRoot);
                 setProperty(MigrationStateKeys.CURRENT_ROOT_RESOURCES, new ArrayList<>(advisor.getRoots()));
                 setProperty(MigrationStateKeys.DATABASE_REVISION_AFTER_TG_IMPORT, session.getService(ManagementSupport.class).getHeadRevisionId());
@@ -258,7 +261,7 @@ public class MigrationStateImpl implements MigrationState {
                                // Make sure that the supplied advisor is redirected to temp
                                advisor.redirect(indexRoot);
                                
-                TransferableGraphs.importGraph1(session, tgs, advisor, new TGStatusMonitor() {
+                ImportResult ir = TransferableGraphs.importGraph1(session, tgs, advisor, new TGStatusMonitor() {
                     @Override
                     public void status(int percentage) {
                         monitor.subTask("Importing model from file (" + percentage + "%)");
@@ -269,6 +272,7 @@ public class MigrationStateImpl implements MigrationState {
                     }
                 });
 
+                setProperty(MigrationStateKeys.IMPORT_RESULT, ir);
                 setProperty(MigrationStateKeys.CURRENT_RESOURCE, indexRoot);
                 setProperty(MigrationStateKeys.CURRENT_ROOT_RESOURCES, new ArrayList<>(advisor.getRoots()));
                 setProperty(MigrationStateKeys.DATABASE_REVISION_AFTER_TG_IMPORT, session.getService(ManagementSupport.class).getHeadRevisionId());