Fixes #912 : If Ecore model is null return null for model id and empt…

…y list for references. (#916) Signed-off-by: Simon Pizonka <[email protected]>
eclipse-vorto · May 4, 2018 · d271504 · d271504
1 parent 3969a78
commit d271504
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...k/org.eclipse.vorto.core.ui/src/org/eclipse/vorto/core/ui/model/AbstractModelElement.java b/...k/org.eclipse.vorto.core.ui/src/org/eclipse/vorto/core/ui/model/AbstractModelElement.java
@@ -25,6 +25,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.vorto.core.api.model.model.Model;
 import org.eclipse.vorto.core.api.model.model.ModelId;
 import org.eclipse.vorto.core.api.model.model.ModelIdFactory;
 import org.eclipse.vorto.core.api.model.model.ModelReference;
@@ -67,7 +68,11 @@ private Image getImage(String urlStr) {
 
 	@Override
 	public ModelId getId() {
-		return ModelIdFactory.newInstance(getModel());
+		Model model = getModel();
+		if(model != null) {
+			return ModelIdFactory.newInstance(model);
+		}
+		return null;
 	}
 
 	@Override
@@ -77,7 +82,11 @@ public String getDescription() {
 
 	public Set<IModelElement> getReferences() {
 		Set<IModelElement> references = new TreeSet<>();
-		for (ModelReference modelReference : getModel().getReferences()) {
+		Model model = getModel();
+		if(model == null) {
+			return references;
+		}
+		for (ModelReference modelReference : model.getReferences()) {
 			for(ModelType possibleType : getPossibleReferenceTypes()) {
 				ModelId modelId = ModelIdFactory.newInstance(possibleType, modelReference);
 				IModelElement modelElementReference = this.modelProject.getModelElementById(modelId);

diff --git a/...ective/src/org/eclipse/vorto/perspective/labelprovider/DefaultTreeModelLabelProvider.java b/...ective/src/org/eclipse/vorto/perspective/labelprovider/DefaultTreeModelLabelProvider.java
@@ -17,6 +17,7 @@
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.vorto.core.api.model.model.ModelId;
 import org.eclipse.vorto.core.ui.model.IModelElement;
 
 public class DefaultTreeModelLabelProvider extends ColumnLabelProvider {
@@ -54,7 +55,9 @@ public Image getImage(Object element) {
 	@Override
 	public String getText(Object element) {
 		IModelElement modelElement = (IModelElement) element;
-		return modelElement.getId().getName();
+		ModelId modelId = modelElement.getId();
+		// return filename if model is invalid
+		return modelId != null ? modelId.getName() : modelElement.getModelFile().getName();
 	}
 
 	@Override