# HG changeset patch
# User timkelly
# Date 1283198330 18000
# Node ID 4de816ec8ba54d63a624e1d7f3d2bdd0af4d92b8
# Parent  4d554177f768c799a5e0acff2b4149672e5ce27d# Parent  be67822599988b1303c25d148742fcb37db764dc
merge commit

diff -r be6782259998 -r 4de816ec8ba5 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/sbsv2/SBSv2QueryUtils.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/sbsv2/SBSv2QueryUtils.java	Mon Aug 30 14:53:55 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/sbsv2/SBSv2QueryUtils.java	Mon Aug 30 14:58:50 2010 -0500
@@ -482,5 +482,19 @@
 	public static void removeCachedConfigurations() {
 		SDKCacheUtils.getCache().removeCache(CONFIG_CACHE_KEY, true);
 	}
+	
+	/**
+	 * Write all SBSv2 caches.
+	 */
+	public static void flushAllSBSv2Caches(){
+		try {
+			SDKCacheUtils.getCache().flushCache(ALIAS_CACHE_KEY);
+			SDKCacheUtils.getCache().flushCache(PRODUCT_CACHE_KEY);
+			SDKCacheUtils.getCache().flushCache(CONFIG_CACHE_KEY);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+	}
 
 }
diff -r be6782259998 -r 4de816ec8ba5 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv2PlatformFilterComposite.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv2PlatformFilterComposite.java	Mon Aug 30 14:53:55 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv2PlatformFilterComposite.java	Mon Aug 30 14:58:50 2010 -0500
@@ -135,13 +135,15 @@
 			public void widgetSelected(SelectionEvent e) {
 				refreshButton.setEnabled(false);
 				refreshButton.setText(Messages.getString("SBSv2PlatformFilterComposite.RefreshButtonScanningText")); //$NON-NLS-1$
-				SBSv2QueryUtils.removeAllCachedQueries();
-				refreshLocalSBSCacheData();
 				
-				for (ISymbianSDK sdk : SDKCorePlugin.getSDKManager().getSDKList()){
-					((SBSv2BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER)).clearDataFromBuildCache();
-				}
+//				for (ISymbianSDK sdk : SDKCorePlugin.getSDKManager().getSDKList()){
+//					((SBSv2BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER)).clearDataFromBuildCache();
+//				}
+				SBSv2QueryUtils.removeAllCachedQueries();
 				
+				refreshLocalSBSCacheData();
+
+				SBSv2QueryUtils.flushAllSBSv2Caches();
 				refreshButton.setText(Messages.getString("SBSv2PlatformFilterComposite.RefreshButtonText")); //$NON-NLS-1$
 				refreshButton.setEnabled(true);
 			}
@@ -320,6 +322,7 @@
 		if (customVariantListViewer != null) {
 			customVariantListViewer.setInput(savedVariants);
 		}
+		
 	}
 
 	private void refreshLocalSBSCacheData() {