From 51efd3ae860eaaad312d838de17d6977ccdece3e Mon Sep 17 00:00:00 2001 From: David Inglis Date: Fri, 14 Nov 2003 18:06:34 +0000 Subject: [PATCH] Fixed bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=46685 --- core/org.eclipse.cdt.ui/ChangeLog | 3 +++ .../org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 3abde33488b..aab1389aacd 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,6 @@ +2003-11-14 David Inglis + Fixed bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=46685 + 2003-11-11 Sean Evoy There is a duplicate set of these string resources in the standard make UI plugin, so there is little need to keep these resources in the common UI diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java index 0833f1cc69c..8c2a508f70e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java @@ -151,7 +151,10 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(getContainer().getProject()); ICExtensionReference[] ref = desc.get(CCorePlugin.BINARY_PARSER_UNIQ_ID); if (ref.length > 0) { - initial = point.getExtension(ref[0].getID()).getLabel(); + IExtension ext = point.getExtension(ref[0].getID()); + if (ext != null) { + initial = ext.getLabel(); + } } } catch (CoreException e) { @@ -162,7 +165,11 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { if (id == null || id.length() == 0) { initial = point.getExtension(CCorePlugin.DEFAULT_BINARY_PARSER_UNIQ_ID).getLabel(); } else { - initial = point.getExtension(id).getLabel(); + IExtension ext = point.getExtension(id); + if (ext != null) { + initial = ext.getLabel(); + } + } }