#279 Fix issue with custom images on linux

Generation now properly throws an error if image not found Generation now properly found images if there Add images folder in test model so that it works both on win and linux Signed-off-by: Erwann Traisnel <[email protected]>
eclipse-capella · Dec 3, 2024 · 213ca3e · 213ca3e
1 parent 1bde07e
commit 213ca3e
Show file tree

Hide file tree

Showing 6 changed files with 729 additions and 1 deletion.
diff --git a/...org.polarsys.capella.docgen/src/org/polarsys/capella/docgen/util/DefaultImageHandler.java b/...org.polarsys.capella.docgen/src/org/polarsys/capella/docgen/util/DefaultImageHandler.java
@@ -86,7 +86,8 @@ public String handleImage(ILog logger, EObject eObject, String imageSrc, IFolder
       IPath path = new Path(decodedImageSrc);
       IFile iconFile = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
       if (!iconFile.exists()) { // Try if image is located in the current folder
-        IPath parentSrcFolder = new Path(eObject.eResource().getURI().segment(1));
+        String unencodedPath = StringUtil.unencodeURIString(eObject.eResource().getURI().segment(1), logger);
+        IPath parentSrcFolder = new Path(unencodedPath);
         path = parentSrcFolder.append(decodedImageSrc);
         iconFile = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
       }

diff --git a/...t.ju/model/In-Flight Entertainment System/In-Flight Entertainment System.test_results.ser b/...t.ju/model/In-Flight Entertainment System/In-Flight Entertainment System.test_results.ser
diff --git a/...docgen.test.ju/model/In-Flight Entertainment System/images/Operator context.jpg b/...docgen.test.ju/model/In-Flight Entertainment System/images/Operator context.jpg