From da91fe7a86d29cee1948211ce36a78bb14bbf8a3 Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Wed, 18 Apr 2007 13:57:11 +0000 Subject: [PATCH] Fix: avoid NPE --- .../src/org/eclipse/cdt/ui/newui/CLocationTab.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java index 43d7115b972..54324e6c3d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java @@ -93,10 +93,17 @@ public abstract class CLocationTab extends AbstractCPropertyTab { ent = _ent; f[0] = new _Filter(this); } - public String toString() { return getPath().toString(); } - - public IPath getPath() { return ent.isValueWorkspacePath() ? ent.getFullPath() : ent.getLocation(); } + public String toString() { + return getPath() == null ? + EMPTY_STR : + getPath().toString(); + } + public IPath getPath() { + return ent.isValueWorkspacePath() ? + ent.getFullPath() : + ent.getLocation(); + } } public void createControls(Composite parent) {