diff --git a/docgenhtml/plugins/org.polarsys.capella.docgen/src/org/polarsys/capella/docgen/util/DefaultImageHandler.java b/docgenhtml/plugins/org.polarsys.capella.docgen/src/org/polarsys/capella/docgen/util/DefaultImageHandler.java index 175777a3..03a12969 100644 --- a/docgenhtml/plugins/org.polarsys.capella.docgen/src/org/polarsys/capella/docgen/util/DefaultImageHandler.java +++ b/docgenhtml/plugins/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/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/In-Flight Entertainment System.test_results.ser b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/In-Flight Entertainment System.test_results.ser index 4dbdfc26..7797a8cd 100644 Binary files a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/In-Flight Entertainment System.test_results.ser and b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/In-Flight Entertainment System.test_results.ser differ diff --git a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/Operator context.jpg b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/Operator context.jpg new file mode 100644 index 00000000..e66b5f83 Binary files /dev/null and b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/Operator context.jpg differ diff --git a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/Operator.svg b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/Operator.svg new file mode 100644 index 00000000..b7d0e7c2 --- /dev/null +++ b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/Operator.svg @@ -0,0 +1,727 @@ + + + + + First responder - crisis management operator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + First responder - crisis management operator + + + Jan Helebrant + + + + + Jan Helebrant + + + + + Jan Helebrant + + + + + + emergency + disaster + crisis management + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/Overview.png b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/Overview.png new file mode 100644 index 00000000..13e40eab Binary files /dev/null and b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/Overview.png differ diff --git a/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/info.jpg b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/info.jpg new file mode 100644 index 00000000..8407879b Binary files /dev/null and b/tests/plugins/org.polarsys.capella.docgen.test.ju/model/In-Flight Entertainment System/images/info.jpg differ