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 2afdac9927aea060858b0b30f3a30c3d59ddaf87..b4e63a6cc5c4188544baeb3eaf7abafcf6f3d6a7 100644 (file)
--- 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);
                }