Fix import of models with images on Windows

archi-contribs · Jan 5, 2017 · d2ecb25 · d2ecb25
1 parent 2756926
commit d2ecb25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/org.archicontribs.grafico/src/org/archicontribs/grafico/MyExporter.java b/org.archicontribs.grafico/src/org/archicontribs/grafico/MyExporter.java
@@ -57,7 +57,6 @@ public class MyExporter implements IModelExporter {
 	static final String FOLDER_XML = "folder.xml";
 
 	// Name of folders for model and images
-	// /!\ IMAGES_FOLDER must match the prefix used in ArchiveManager.createArchiveImagePathname
 	static final String IMAGES_FOLDER = "images";
 	static final String MODEL_FOLDER = "model";
 

diff --git a/org.archicontribs.grafico/src/org/archicontribs/grafico/MyImporter.java b/org.archicontribs.grafico/src/org/archicontribs/grafico/MyImporter.java
@@ -124,7 +124,8 @@ private void loadImages(IArchimateModel fModel, File folder) throws IOException
     	for (File imageFile: folder.listFiles()) {
     		if (imageFile.isFile()) {
     		      bytes = Files.readAllBytes(imageFile.toPath());
-    		      archiveManager.addByteContentEntry(folder.getName()+File.separator+imageFile.getName(), bytes);
+    		      // /!\ This must match the prefix used in ArchiveManager.createArchiveImagePathname
+    		      archiveManager.addByteContentEntry("images/" + imageFile.getName(), bytes);
     		}
     	}
     }