Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2015-02-10 12:03:28 +0000
committerCamille Letavernier2015-02-10 12:03:28 +0000
commitd58a6ff6f82b43d84fce0a946e36fe96e657e110 (patch)
tree419c6ba134cf7c13f05ea199276d6561261e0dee
parent95e24f4bfafa4a6cc87295ebc6c4a9b840ceddd0 (diff)
downloadorg.eclipse.papyrus-d58a6ff6f82b43d84fce0a946e36fe96e657e110.tar.gz
org.eclipse.papyrus-d58a6ff6f82b43d84fce0a946e36fe96e657e110.tar.xz
org.eclipse.papyrus-d58a6ff6f82b43d84fce0a946e36fe96e657e110.zip
436547: [Diagram] All shapes shall be refactored
https://bugs.eclipse.org/bugs/show_bug.cgi?id=436547 - Fix the SVG style provider to avoid exceptions when using an invalid file - Log a warning instead
-rwxr-xr-xplugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java
index be12a81e8f2..1420664093d 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java
@@ -14,6 +14,7 @@ package org.eclipse.papyrus.infra.gmfdiag.common.providers;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
@@ -67,6 +68,10 @@ public class StyleBasedShapeProvider extends AbstractShapeProvider {
return listEmptyRendered;
}
SVGDocument svg = getSVGDocument(view, svgFile);
+ if (svg == null){
+ Activator.log.warn("Invalid SVG File path: "+svgFile);
+ return null;
+ }
RenderedImage img = null;
try {
img = renderSVGDocument(view, svg);

Back to the top