Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Becker2015-09-09 10:39:05 +0000
committerMarkus Keller2015-09-09 12:01:20 +0000
commite96ee19a45c68315b1af87d77143f5c4f20b64ed (patch)
tree58fc2d670708d213d54499c7e7adf740e8ecb488
parentfbcf26553bf5db3d163806c8f73b9724eb950747 (diff)
downloadeclipse.platform.images-e96ee19a45c68315b1af87d77143f5c4f20b64ed.tar.gz
eclipse.platform.images-e96ee19a45c68315b1af87d77143f5c4f20b64ed.tar.xz
eclipse.platform.images-e96ee19a45c68315b1af87d77143f5c4f20b64ed.zip
Bug 476272: Fix NullPointerException for not existing directories
An error message is written if the directories where the input is read from (for created the PNGs / for rendering galleries) do not exist. Change-Id: I5981ee19fc3b772a8ff94faaa8413f1415272c03 Signed-off-by: Matthias Becker <ma.becker@sap.com>
-rw-r--r--org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/GalleryMojo.java4
-rw-r--r--org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/RenderMojo.java5
2 files changed, 9 insertions, 0 deletions
diff --git a/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/GalleryMojo.java b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/GalleryMojo.java
index 5e11854f..d778e5e0 100644
--- a/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/GalleryMojo.java
+++ b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/GalleryMojo.java
@@ -78,6 +78,10 @@ public class GalleryMojo extends AbstractMojo {
}
File iconDirectoryRoot = new File(pngDir + "/");
+ if (!iconDirectoryRoot.exists()){
+ log.error("PNG directory' "+pngDir+"' does not exist.");
+ return;
+ }
Map<String, List<IconEntry>> galleryIconSets = new HashMap<>();
diff --git a/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/RenderMojo.java b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/RenderMojo.java
index ea3b6f54..b051d4be 100644
--- a/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/RenderMojo.java
+++ b/org.eclipse.images.renderer/src/main/java/org/eclipse/images/renderer/RenderMojo.java
@@ -558,6 +558,11 @@ public class RenderMojo extends AbstractMojo {
File outputDir = new File(workingDirectory + (iconScale == 1 ? "/" + targetDir + "/" : "/" + targetDir + "-highdpi/"));
File iconDirectoryRoot = new File(sourceDir + "/");
+ if (!iconDirectoryRoot.exists()){
+ log.error("Source directory' "+sourceDir+"' does not exist.");
+ return;
+ }
+
// Search each subdir in the root dir for svg icons
for (File file : iconDirectoryRoot.listFiles()) {
if(!file.isDirectory()) {

Back to the top