project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/scripting/ImporterScritpingUtils.java
branchC3_BUILDER_WORK
changeset 1462 b38491fd06da
parent 1434 79471fd1fd69
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/scripting/ImporterScritpingUtils.java	Fri Jun 11 11:35:13 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/scripting/ImporterScritpingUtils.java	Fri Jun 11 12:09:52 2010 -0500
@@ -123,15 +123,11 @@
 			}
 		}
 		else {
+			selectedConfigs = new ArrayList<ISymbianBuildContext>();
 			ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
 			ISBSv2BuildInfo sbsv2BuildInfo = (ISBSv2BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER);
-			if (sbsv1BuildInfo != null) {
-				selectedConfigs = sbsv1BuildInfo.getFilteredBuildConfigurations(sdk);
-			} else if (sbsv2BuildInfo != null) {
-				selectedConfigs = sbsv2BuildInfo.getFilteredBuildConfigurations(sdk);
-			} else {
-				selectedConfigs = new ArrayList<ISymbianBuildContext>();
-			}
+			selectedConfigs.addAll(sbsv1BuildInfo.getFilteredBuildConfigurations());
+			selectedConfigs.addAll(sbsv1BuildInfo.getFilteredBuildConfigurations());
 		}
 		return selectedConfigs;
 	}