builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java
equal
deleted
inserted
replaced
296 sdkConfigTreeNodes = BuildTargetTreeNode.getTreeViewerInput(sbsv2Project, wbw); |
296 sdkConfigTreeNodes = BuildTargetTreeNode.getTreeViewerInput(sbsv2Project, wbw); |
297 } else { |
297 } else { |
298 IStatus s = new Status(IStatus.ERROR, CarbideBuilderPlugin.PLUGIN_ID, 0, "Error retrieving workbench window. Cannot display configuration tree.", null); |
298 IStatus s = new Status(IStatus.ERROR, CarbideBuilderPlugin.PLUGIN_ID, 0, "Error retrieving workbench window. Cannot display configuration tree.", null); |
299 throw new CoreException(s); |
299 throw new CoreException(s); |
300 } |
300 } |
301 if (sbsv2Project){ |
301 if (sbsv2Project && sdkConfigTreeNodes != null){ |
302 replaceFilteredConfigsFromProject(sdkConfigTreeNodes); |
302 replaceFilteredConfigsFromProject(sdkConfigTreeNodes); |
303 } |
303 } |
304 |
304 |
305 properSdkViewer.setInput(sdkConfigTreeNodes); |
305 properSdkViewer.setInput(sdkConfigTreeNodes); |
306 propagateSdkTree(); |
306 propagateSdkTree(); |
322 * When displaying build configs there may be configurations in the project that may not be displayed |
322 * When displaying build configs there may be configurations in the project that may not be displayed |
323 * We add those back in so they reside in the checked tree viewer in case the user wants to remove them. |
323 * We add those back in so they reside in the checked tree viewer in case the user wants to remove them. |
324 * @param sdkConfigTreeNodes |
324 * @param sdkConfigTreeNodes |
325 */ |
325 */ |
326 private void replaceFilteredConfigsFromProject(BuildTargetTreeNode[] sdkConfigTreeNodes) { |
326 private void replaceFilteredConfigsFromProject(BuildTargetTreeNode[] sdkConfigTreeNodes) { |
|
327 |
|
328 if (sdkConfigTreeNodes == null){ |
|
329 return; |
|
330 } |
|
331 |
327 List<ICarbideBuildConfiguration> bldConfigs = cpi.getBuildConfigurations(); |
332 List<ICarbideBuildConfiguration> bldConfigs = cpi.getBuildConfigurations(); |
328 |
333 |
329 HashMap<BuildTargetTreeNode, List<ISymbianBuildContext>> missingConfigMap = new HashMap<BuildTargetTreeNode, List<ISymbianBuildContext>>(); |
334 HashMap<BuildTargetTreeNode, List<ISymbianBuildContext>> missingConfigMap = new HashMap<BuildTargetTreeNode, List<ISymbianBuildContext>>(); |
330 for (ICarbideBuildConfiguration config : bldConfigs){ |
335 for (ICarbideBuildConfiguration config : bldConfigs){ |
331 boolean foundConfig = false; |
336 boolean foundConfig = false; |