# HG changeset patch
# User timkelly
# Date 1280244689 18000
# Node ID b249ba29f64205ad4ea7f39e3f338132cbf5ab01
# Parent  ff22cda9e5782a407bf8c47093ff8813d0ad5841
Remove boolean API to force rescan the SBS cache (there was API to do that already)

diff -r ff22cda9e578 -r b249ba29f642 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Mon Jul 26 17:32:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Tue Jul 27 10:31:29 2010 -0500
@@ -294,7 +294,7 @@
 		try {
 			configQueryData = SBSv2QueryUtils.getConfigQueryDataForSDK(sdk, alias);
 			if (configQueryData == null) {
-				Map<String, String> aliasToMeaningMap = SBSv2QueryUtils.getAliasesForSDK(sdk, false);
+				Map<String, String> aliasToMeaningMap = SBSv2QueryUtils.getAliasesForSDK(sdk);
 				List<String> aliasList = new ArrayList<String>();
 				aliasList.add(alias);
 				String configQueryXML = SBSv2QueryUtils.getConfigQueryXMLforSDK(sdk, aliasList);
diff -r ff22cda9e578 -r b249ba29f642 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 Jul 26 17:32:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/sbsv2/SBSv2QueryUtils.java	Tue Jul 27 10:31:29 2010 -0500
@@ -64,12 +64,12 @@
 	public static final String BAD_EPOCROOT = "BADEPOCROOT";
 
 	@SuppressWarnings("unchecked")
-	public static HashMap<String, String> getAliasesForSDK(ISymbianSDK sdk, boolean forceRescan) throws SBSv2MinimumVersionException {
+	public static HashMap<String, String> getAliasesForSDK(ISymbianSDK sdk) throws SBSv2MinimumVersionException {
 		HashMap<String, String> aliases;
 		Map<String, HashMap<String, String>> aliasesMap = SDKCorePlugin.getCache().getCachedData(ALIAS_CACHE_KEY, Map.class, 0);
 		SBSv2SDKKey key = new SBSv2SDKKey(sdk);
 
-		if (aliasesMap == null || forceRescan) {
+		if (aliasesMap == null) {
 			aliasesMap = new HashMap<String, HashMap<String, String>>();
 		}
 		else {
@@ -86,12 +86,12 @@
 	}
 
 	@SuppressWarnings("unchecked")
-	public static List<String> getProductVariantsForSDK(ISymbianSDK sdk, boolean force) throws SBSv2MinimumVersionException {
+	public static List<String> getProductVariantsForSDK(ISymbianSDK sdk) throws SBSv2MinimumVersionException {
 		List<String> products;
 		Map<String, List<String>> productsMap = SDKCorePlugin.getCache().getCachedData(PRODUCT_CACHE_KEY, Map.class, 0);
 		SBSv2SDKKey key = new SBSv2SDKKey(sdk);
 		
-		if (productsMap == null || force) {
+		if (productsMap == null) {
 			productsMap = new HashMap<String, List<String>>();
 		}
 		else {
@@ -420,13 +420,13 @@
 		}
 	}
 
-	public static HashMap<String, String> getCompleteAliasList(boolean forceRescan) throws SBSv2MinimumVersionException {
+	public static HashMap<String, String> getCompleteAliasList() throws SBSv2MinimumVersionException {
 		HashMap<String, String> resultMap = new HashMap<String, String>();
 		
 		// iterate all SDKs and build the map up
 		for (ISymbianSDK sdk : SDKCorePlugin.getSDKManager().getSDKList()) {
 			if (sdk.isEnabled() && isEpocRootValid(sdk)) {
-				HashMap<String, String> aliasMap = getAliasesForSDK(sdk, forceRescan);
+				HashMap<String, String> aliasMap = getAliasesForSDK(sdk);
 				for (String alias : aliasMap.keySet()) {
 					if (alias.equals(BAD_EPOCROOT)) {
 						continue;
@@ -441,13 +441,13 @@
 		return resultMap;
 	}
 
-	public static List<String> getCompleteProductVariantList(boolean forceRescan) throws SBSv2MinimumVersionException {
+	public static List<String> getCompleteProductVariantList() throws SBSv2MinimumVersionException {
 		List<String> resultList = new ArrayList<String>();
 		
 		// iterate all SDKs and build the map up
 		for (ISymbianSDK sdk : SDKCorePlugin.getSDKManager().getSDKList()) {
 			if (sdk.isEnabled() && isEpocRootValid(sdk)) {
-				List<String> productList = getProductVariantsForSDK(sdk, forceRescan);
+				List<String> productList = getProductVariantsForSDK(sdk);
 				for (String variant : productList) {
 					if (variant.equals(BAD_EPOCROOT)) {
 						continue;
diff -r ff22cda9e578 -r b249ba29f642 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java	Mon Jul 26 17:32:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java	Tue Jul 27 10:31:29 2010 -0500
@@ -70,7 +70,7 @@
 		
 		if (aliasToMeaningMap.size() == 0){
 			try {
-				aliasToMeaningMap = SBSv2QueryUtils.getAliasesForSDK(sdk, false);
+				aliasToMeaningMap = SBSv2QueryUtils.getAliasesForSDK(sdk);
 			} catch (final SBSv2MinimumVersionException e) {
 				if (hasShownDialog == false){
 					
@@ -93,7 +93,7 @@
 			// Not all SDKs will have products, so size of 0 is acceptable
 			productList = new ArrayList<String>();
 			try {
-				productList = SBSv2QueryUtils.getProductVariantsForSDK(sdk, false);
+				productList = SBSv2QueryUtils.getProductVariantsForSDK(sdk);
 			} catch (SBSv2MinimumVersionException e) {
 				// ignore
 			}
diff -r ff22cda9e578 -r b249ba29f642 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 Jul 26 17:32:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv2PlatformFilterComposite.java	Tue Jul 27 10:31:29 2010 -0500
@@ -120,11 +120,19 @@
 			public void widgetSelected(SelectionEvent e) {
 				refreshButton.setEnabled(false);
 				refreshButton.setText(Messages.getString("SBSv2PlatformFilterComposite.RefreshButtonScanningText")); //$NON-NLS-1$
-				initTable(true);
+				SBSv2QueryUtils.removeAllCachedQueries();
+				clearLocalSBSCacheData();
+				initTable();
 				refreshButton.setText(Messages.getString("SBSv2PlatformFilterComposite.RefreshButtonText")); //$NON-NLS-1$
 				refreshButton.setEnabled(true);
 			}
 			
+			private void clearLocalSBSCacheData(){
+				aliasMap.clear();
+				productVariantList.clear();
+			}
+			
+			
 		});
 		
 		Composite variantButtonsComposite = new Composite(this, SWT.NONE);
@@ -200,7 +208,7 @@
 			
 		});
 		
-		initTable(false);
+		initTable();
 	}
 
 	public void performOk() {
@@ -219,28 +227,28 @@
 		SBSv2Utils.setSBSv2FilteredConfigs(checkedConfigs.toArray(new String[checkedConfigs.size()]));
 	}
 	
-	private void initTable(boolean forceRescan) {
+	private void initTable() {
 
 		SBSv2Utils.initDefaultConfigsToFilter();
 		
-		if (aliasMap.size() == 0 || forceRescan){
+		if (aliasMap.size() == 0){
 			try {
-				aliasMap = SBSv2QueryUtils.getCompleteAliasList(forceRescan);
+				aliasMap = SBSv2QueryUtils.getCompleteAliasList();
 			} catch (SBSv2MinimumVersionException e) {
 				// Force a scan for version in case system was updated
 				SDKCorePlugin.getSDKManager().getSBSv2Version(true);
 				try {
 					// try, try again...
-					aliasMap = SBSv2QueryUtils.getCompleteAliasList(forceRescan);
+					aliasMap = SBSv2QueryUtils.getCompleteAliasList();
 				} catch (SBSv2MinimumVersionException e2) {
 					MessageDialog.openError(getShell(), "Minimum sbs version not met.", e.getMessage());
 				}
 			} 
 		}
 		
-		if (productVariantList.size() == 0 || forceRescan){
+		if (productVariantList.size() == 0){
 			try {
-				productVariantList = SBSv2QueryUtils.getCompleteProductVariantList(forceRescan);
+				productVariantList = SBSv2QueryUtils.getCompleteProductVariantList();
 			} catch (SBSv2MinimumVersionException e) {
 				
 			}
@@ -278,7 +286,7 @@
 	}
 	
 	public void setDefaults(){
-		initTable(false);
+		initTable();
 		for (TableItem item : buildAliasTableViewer.getTable().getItems()) {
 			if (item.getText().toLowerCase().equals("armv5_udeb")  || 
 				item.getText().toLowerCase().equals("armv5_urel") ||