Added more TransferableGraphs.writeTransferableGraph methods

[simantics/platform.git] / bundles / org.simantics.graph.db / src / org / simantics / graph / db / TransferableGraphs.java

diff --git a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/TransferableGraphs.java b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/TransferableGraphs.java
index 6aa24637e4a075792121eace6f5b81447d722e6a..0841e1455569ed08e0f184c750c5125e9fe55aa3 100644 (file)
--- a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/TransferableGraphs.java
+++ b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/TransferableGraphs.java
@@ -185,7 +185,7 @@ public class TransferableGraphs {
         
         final IImportAdvisor2 advisor = (advisor_ instanceof IImportAdvisor2) ? ((IImportAdvisor2)advisor_) : new WrapperAdvisor(advisor_);
 
-               final StreamingTransferableGraphImportProcess process = new StreamingTransferableGraphImportProcess(session, vg, tg, advisor);
+               final StreamingTransferableGraphImportProcess process = new StreamingTransferableGraphImportProcess(session, vg, tg, advisor, monitor);
                session.syncRequest(new ReadRequest() {
                        @Override
                        public void run(ReadGraph graph) throws DatabaseException {
@@ -440,15 +440,23 @@ public class TransferableGraphs {
        }
 
        public static void writeTransferableGraph(RequestProcessor processor, String format, int version, TreeMap<String, Variant> metadata, TransferableGraphSource source, File target, TGStatusMonitor monitor) throws Exception {
-               final Serializer datatypeSerializer = Bindings.getSerializerUnchecked(Datatype.class);
                try (RandomAccessBinary out = new BinaryFile(target, 128*1024)) {
-                       DataContainer container = new DataContainer(format, version, metadata, null);
-                       DataContainers.writeHeader(out, container);
-                       datatypeSerializer.serialize((DataOutput) out, Datatypes.getDatatypeUnchecked(TransferableGraph1.class));
-                       writeTransferableGraph(processor, source, out, monitor);
+                       DataContainers.writeHeader(out, new DataContainer(format, version, metadata, null));
+                       writeTransferableGraphVariant(processor, source, out, monitor);
                }
        }
 
+       public static void writeTransferableGraph(RequestProcessor processor, TransferableGraphSource source, File target, TGStatusMonitor monitor) throws Exception {
+               try (RandomAccessBinary out = new BinaryFile(target, 128*1024)) {
+                       writeTransferableGraphVariant(processor, source, out, monitor);
+               }
+       }
+
+       public static void writeTransferableGraphVariant(RequestProcessor processor, TransferableGraphSource source, RandomAccessBinary out, TGStatusMonitor monitor) throws Exception {
+               Bindings.getSerializerUnchecked(Datatype.class).serialize(out, Datatypes.getDatatypeUnchecked(TransferableGraph1.class));
+               writeTransferableGraph(processor, source, out, monitor);
+       }
+
        private static TGStatusMonitor safeMonitor(TGStatusMonitor mon) {
                return mon == null ? TGStatusMonitor.NULL_MONITOR : mon;
        }