376190: [EMF-Compare] Papyrus should provide viewers for EMF-Compare

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

Correct a NPE with the label provider : impacted class : EMFCompareLabelProvider

1 files changed, 14 insertions, 10 deletions

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.ui/src/org/eclipse/papyrus/infra/emf/compare/ui/provider/EMFCompareLabelProvider.java b/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.ui/src/org/eclipse/papyrus/infra/emf/compare/ui/provider/EMFCompareLabelProvider.java
index 545ca688d89..62aeca32053 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.ui/src/org/eclipse/papyrus/infra/emf/compare/ui/provider/EMFCompareLabelProvider.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.ui/src/org/eclipse/papyrus/infra/emf/compare/ui/provider/EMFCompareLabelProvider.java
@@ -101,16 +101,20 @@ public class EMFCompareLabelProvider extends CustomizableModelLabelProvider {
 	@Override
 	public String getText(final Object element) {
 		String text = ""; //$NON-NLS-1$
-		if(element instanceof IFile) {
-			text = ((IFile)element).getName();
-		} else if(element instanceof Resource) {
-			text = ((Resource)element).getURI().lastSegment();
-		}
-		if(element instanceof EObject) {
-			final ITreeElement treeElement = getTreeElement((EObject)element);
-			text = super.getText(treeElement);
-		} else {
-			text = super.getText(element);
+		if(element != null) {
+			if(element instanceof IFile) {
+				text = ((IFile)element).getName();
+			} else if(element instanceof Resource) {
+				text = ((Resource)element).getURI().lastSegment();
+			}
+			if(element instanceof EObject) {
+				final ITreeElement treeElement = getTreeElement((EObject)element);
+				text = super.getText(treeElement);
+			} else {
+				text = super.getText(element);
+			}
+		}else{
+			text="null";
 		}
 		return text;
 	}