# HG changeset patch # User timkelly # Date 1276522445 18000 # Node ID bf2b5be81802a8ed8a675b0690c9143a07353f4f # Parent c435b58e283f014b07e043cd4197f64b45d5b2b1 updates after refactoring ISymbianSDK diff -r c435b58e283f -r bf2b5be81802 carbidesdk/com.nokia.carbide.cpp.sdk.examples/src/com/nokia/carbide/cpp/sdk/examples/jobs/NewProjectJob.java --- a/carbidesdk/com.nokia.carbide.cpp.sdk.examples/src/com/nokia/carbide/cpp/sdk/examples/jobs/NewProjectJob.java Fri Jun 11 14:13:49 2010 -0500 +++ b/carbidesdk/com.nokia.carbide.cpp.sdk.examples/src/com/nokia/carbide/cpp/sdk/examples/jobs/NewProjectJob.java Mon Jun 14 08:34:05 2010 -0500 @@ -142,7 +142,7 @@ List result = new ArrayList(); List sdks = SDKCorePlugin.getSDKManager().getSDKList(); ISymbianSDK sdk = sdks.get(0); - result.addAll(sdk.getFilteredBuildConfigurations()); + result.addAll(sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getFilteredBuildConfigurations()); return result; } diff -r c435b58e283f -r bf2b5be81802 project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/MissingSdkTest.java --- a/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/MissingSdkTest.java Fri Jun 11 14:13:49 2010 -0500 +++ b/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/MissingSdkTest.java Mon Jun 14 08:34:05 2010 -0500 @@ -37,6 +37,7 @@ import com.nokia.carbide.cpp.project.core.ProjectCorePlugin; import com.nokia.carbide.cpp.sdk.core.ISDKManager; import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext; +import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID; import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; @@ -89,7 +90,7 @@ // put up to 4 configs among each SDK in devices.xml (to improve speed with custkits) List allConfigs = new ArrayList(); for (ISymbianSDK sdk : sdkList) { - List sdkConfigs = sdk.getFilteredBuildConfigurations(); + List sdkConfigs = sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getFilteredBuildConfigurations(); if (sdkConfigs == null) continue; if (sdkConfigs.size() <= 0) diff -r c435b58e283f -r bf2b5be81802 project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestsPlugin.java --- a/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestsPlugin.java Fri Jun 11 14:13:49 2010 -0500 +++ b/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestsPlugin.java Mon Jun 14 08:34:05 2010 -0500 @@ -76,7 +76,7 @@ */ public static List getUsableBuildConfigs() { for (ISymbianSDK sdk : SDKCorePlugin.getSDKManager().getSDKList()) { - List contexts = sdk.getUnfilteredBuildConfigurations(); + List contexts = sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getAllBuildConfigurations(); if (contexts.size() > 0) return contexts.subList(0, Math.min(contexts.size(), 8)); }