Sync git svn branch with SVN repository r33345.

[simantics/platform.git] / bundles / org.simantics.document.ui / src / org / simantics / document / ui / graphfile / FileDocumentUtil.java

diff --git a/bundles/org.simantics.document.ui/src/org/simantics/document/ui/graphfile/FileDocumentUtil.java b/bundles/org.simantics.document.ui/src/org/simantics/document/ui/graphfile/FileDocumentUtil.java
index 35b8813281b967bf740e733869b606b7a1e21138..ece4a38a533e50354931d869ce6c7db61ec7f673 100644 (file)
--- a/bundles/org.simantics.document.ui/src/org/simantics/document/ui/graphfile/FileDocumentUtil.java
+++ b/bundles/org.simantics.document.ui/src/org/simantics/document/ui/graphfile/FileDocumentUtil.java
@@ -262,13 +262,13 @@ public class FileDocumentUtil {
         * @param relation\r
         * @throws DatabaseException\r
         */\r
-       public static void exportDocumentFolder(final Resource folderResource, final File folder, final Resource relation, final IProgressMonitor monitor) throws Exception{\r
+       public static void exportDocumentFolder(final Resource folderResource, final File folder, final Resource relation, boolean useResourceNames, final IProgressMonitor monitor) throws Exception{\r
                Simantics.getSession().syncRequest(new ReadRequest() {\r
                        \r
                        @Override\r
                        public void run(ReadGraph graph) throws DatabaseException {\r
                                try {\r
-                                       exportDocumentFolder(graph, folderResource, folder, relation, monitor);\r
+                                       exportDocumentFolder(graph, folderResource, folder, relation, useResourceNames, monitor);\r
                                } catch (Exception e) {\r
                                        throw new DatabaseException(e);\r
                                }\r
@@ -286,7 +286,7 @@ public class FileDocumentUtil {
         * @param relation\r
         * @throws DatabaseException\r
         */\r
-       public static void exportDocumentFolder(ReadGraph graph, Resource folderResource, File folder, Resource relation, IProgressMonitor monitor) throws Exception{\r
+       public static void exportDocumentFolder(ReadGraph graph, Resource folderResource, File folder, Resource relation, boolean useResourceNames, IProgressMonitor monitor) throws Exception{\r
                Layer0 l0 = Layer0.getInstance(graph);\r
                DocumentResource doc = DocumentResource.getInstance(graph);\r
                GraphFileResource gf = GraphFileResource.getInstance(graph);\r
@@ -297,7 +297,7 @@ public class FileDocumentUtil {
                                String name = null;\r
                                boolean canExport = false;\r
                                if (graph.isInstanceOf(r, doc.FileDocument)) {\r
-                                       name = graph.getRelatedValue(r, gf.HasResourceName);\r
+                                       name = graph.getRelatedValue(r, useResourceNames ? gf.HasResourceName : l0.HasName);\r
                                        canExport = true;\r
                                } else if (graph.isInstanceOf(r, doc.UrlDocument)) {\r
                                        name = graph.getRelatedValue(r, l0.HasName) +".url";\r
@@ -329,7 +329,7 @@ public class FileDocumentUtil {
                                                        continue;\r
                                                }\r
                                        }\r
-                                       exportDocumentFolder(graph, r, subFolder, relation,monitor);\r
+                                       exportDocumentFolder(graph, r, subFolder, relation, useResourceNames, monitor);\r
                                }\r
                        }\r
                }\r