358732: [Model Explorer] Make the model explorer view fully implemented with EMF Facet

https://bugs.eclipse.org/bugs/show_bug.cgi?id=358732

Fix NPE

1 files changed, 8 insertions, 8 deletions

diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java
index 05b35a3905e..0ded9eb1614 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/src/org/eclipse/papyrus/sysml/modelexplorer/query/GetImageQuery.java
@@ -15,29 +15,29 @@ public class GetImageQuery implements IJavaModelQuery<Element, String> {
 
 	public String evaluate(final Element context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
 
-		String icon_path = "";
+		String iconPath = "";
 		if(!context.getAppliedStereotypes().isEmpty()) {
 			Stereotype first_stereotype = context.getAppliedStereotypes().get(0);
 
 			if(!first_stereotype.getIcons().isEmpty()) {
 				org.eclipse.uml2.uml.Image icon = ElementUtil.getStereotypeImage(context, first_stereotype, "icon");
 				if(icon != null) {
-					icon_path = icon.getLocation();
+					iconPath = icon.getLocation();
 				}
 			}
 		}
 
-		String image_path = "";
+		String imagePath = "";
 
-		if(!"".equals(icon_path)) {
-			URI iconURI = URI.createURI(icon_path);
+		if(iconPath != null && !"".equals(iconPath)) {
+			URI iconURI = URI.createURI(iconPath);
 			if(iconURI.isRelative()) {
-				image_path = sysml_plugin_path + icon_path;
+				imagePath = sysml_plugin_path + iconPath;
 			} else {
-				image_path = iconURI.toPlatformString(true);
+				imagePath = iconURI.toPlatformString(true);
 			}
 		}
 
-		return image_path;
+		return imagePath;
 	}
 }