From 68059d36750738ede1e3c44c3d146b46764db3db Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Thu, 10 Apr 2008 14:09:43 +0000 Subject: [PATCH] NPE elimination --- .../ui/properties/ToolSettingsPrefStore.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java index 0fb5fea9531..c5cacfa3f07 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java @@ -198,15 +198,20 @@ public class ToolSettingsPrefStore implements IPreferenceStore { } public Object[] getOption(String id){ - if (selectedElement == null) return null; + if (selectedElement == null) + return null; IHoldsOptions selectedHolder = selectedElement.getHoldOptions(); - if (selectedHolder == null) selectedHolder = selectedElement.getTool(); + if (selectedHolder == null) + selectedHolder = selectedElement.getTool(); Object options[][] = optCategory.getOptions(rcInfo, selectedHolder); - + if (options == null) + return null; + for(int i = 0; i < options.length; i++){ IHoldsOptions ho = (IHoldsOptions)options[i][0]; - if(ho == null) break; + if(ho == null) + break; IOption option = (IOption)options[i][1];