X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.document.ui%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fui%2Fgraphfile%2FFileDocumentUtil.java;h=ece4a38a533e50354931d869ce6c7db61ec7f673;hp=35b8813281b967bf740e733869b606b7a1e21138;hb=0b471805f017da83d715a0d8409f53bdd009d31e;hpb=145a2884933f2ffdd48d6835729e58f1152d274e

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 35b881328..ece4a38a5 100644
--- 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
 	 * @throws DatabaseException
 	 */
-	public static void exportDocumentFolder(final Resource folderResource, final File folder, final Resource relation, final IProgressMonitor monitor) throws Exception{
+	public static void exportDocumentFolder(final Resource folderResource, final File folder, final Resource relation, boolean useResourceNames, final IProgressMonitor monitor) throws Exception{
 		Simantics.getSession().syncRequest(new ReadRequest() {
 			
 			@Override
 			public void run(ReadGraph graph) throws DatabaseException {
 				try {
-					exportDocumentFolder(graph, folderResource, folder, relation, monitor);
+					exportDocumentFolder(graph, folderResource, folder, relation, useResourceNames, monitor);
 				} catch (Exception e) {
 					throw new DatabaseException(e);
 				}
@@ -286,7 +286,7 @@ public class FileDocumentUtil {
 	 * @param relation
 	 * @throws DatabaseException
 	 */
-	public static void exportDocumentFolder(ReadGraph graph, Resource folderResource, File folder, Resource relation, IProgressMonitor monitor) throws Exception{
+	public static void exportDocumentFolder(ReadGraph graph, Resource folderResource, File folder, Resource relation, boolean useResourceNames, IProgressMonitor monitor) throws Exception{
 		Layer0 l0 = Layer0.getInstance(graph);
 		DocumentResource doc = DocumentResource.getInstance(graph);
 		GraphFileResource gf = GraphFileResource.getInstance(graph);
@@ -297,7 +297,7 @@ public class FileDocumentUtil {
 				String name = null;
 				boolean canExport = false;
 				if (graph.isInstanceOf(r, doc.FileDocument)) {
-					name = graph.getRelatedValue(r, gf.HasResourceName);
+					name = graph.getRelatedValue(r, useResourceNames ? gf.HasResourceName : l0.HasName);
 					canExport = true;
 				} else if (graph.isInstanceOf(r, doc.UrlDocument)) {
 					name = graph.getRelatedValue(r, l0.HasName) +".url";
@@ -329,7 +329,7 @@ public class FileDocumentUtil {
 							continue;
 						}
 					}
-					exportDocumentFolder(graph, r, subFolder, relation,monitor);
+					exportDocumentFolder(graph, r, subFolder, relation, useResourceNames, monitor);
 				}
 			}
 		}