From: Jussi Koskela <jussi.koskela@semantum.fi>
Date: Mon, 21 Aug 2017 08:11:37 +0000 (+0300)
Subject: Option to pass custom TG configuration to exportModel function
X-Git-Tag: v1.31.0~231
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=6733bb2f128363c572c1a4fcf907d034060f3aae

Option to pass custom TG configuration to exportModel function

Custom TG configuration is required for example if some resources need
to be excluded. Also fixed the exception handling not to wrap possible
DatabaseException in another DatabaseException.

refs #7442

Change-Id: Ibee0b501b2c7008d1f79b127859f0daa86719107
---

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
index 2afdac992..b4e63a6cc 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
@@ -2204,11 +2204,17 @@ public class ModelingUtils {
 	}
 	
 	public static void exportModel(ReadGraph graph, Resource model, String fileName, String format, int version) throws DatabaseException {
+		TransferableGraphConfiguration2 conf = new TransferableGraphConfiguration2(graph, model, true, false);
+		exportModel(graph, conf, fileName, format, version);
+	}
 	
+	public static void exportModel(ReadGraph graph, TransferableGraphConfiguration2 conf, String fileName, String format, int version) throws DatabaseException {
+		
 		try {
-			TransferableGraphConfiguration2 conf = new TransferableGraphConfiguration2(graph, model, true, false);
 	        TransferableGraphSource s = graph.syncRequest(new ModelTransferableGraphSourceRequest(conf));
 			TransferableGraphs.writeTransferableGraph(graph, format, version, s, new File(fileName));
+		} catch (DatabaseException e) {
+			throw e;
 		} catch (Exception e) {
 			throw new DatabaseException(e);
 		}