# HG changeset patch
# User timkelly
# Date 1285181701 18000
# Node ID 42a54f0190c1d9c20ecb293cfeb6eda7a2411c9c
# Parent  0a42921f1c7641306b0c34f9358d84dba1312f01# Parent  3d4e0b2128c15f45be02b38877b2f005d0396a42
merge commit

diff -r 3d4e0b2128c1 -r 42a54f0190c1 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java	Wed Sep 22 13:40:05 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java	Wed Sep 22 13:55:01 2010 -0500
@@ -156,21 +156,6 @@
 		return osVersion;
 	}
 
-//	public File getPrefixFile(String builderId) {
-//		File prefixFile = prefixFileMap.get(builderId);
-//		if (prefixFile == null) {
-//			ISDKBuildInfo buildInfo = getBuildInfo(builderId);
-//			if (buildInfo != null) {
-//				IPath prefixFilePath = buildInfo.getPrefixFromVariantCfg();
-//				if (prefixFilePath != null) {
-//					prefixFile = prefixFilePath.toFile();
-//					setPrefixFile(prefixFilePath, builderId);
-//				}
-//			}
-//		}
-//		return prefixFile;
-//	}
-
 	public IPath getReleaseRoot() {
 		String epocRoot = getEPOCROOT();
 		if (epocRoot.length() > 0) {
@@ -642,7 +627,7 @@
 		return hasScannedRaptor;
 	}
 
-	void setScannedRaptor(boolean hasScannedRaptor){
+	public void setScannedRaptor(boolean hasScannedRaptor){
 		this.hasScannedRaptor = hasScannedRaptor;
 	}
 }
diff -r 3d4e0b2128c1 -r 42a54f0190c1 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Wed Sep 22 13:40:05 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Wed Sep 22 13:55:01 2010 -0500
@@ -67,9 +67,12 @@
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.PlatformUI;
 
+import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildInfo;
 import com.nokia.carbide.cpp.internal.api.sdk.SymbianBuildContextDataCache;
+import com.nokia.carbide.cpp.internal.sdk.core.model.SBSv2BuildInfo;
 import com.nokia.carbide.cpp.internal.sdk.core.model.SymbianSDK;
 import com.nokia.carbide.cpp.sdk.core.ISDKManager;
+import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID;
 import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
 import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
 import com.nokia.carbide.cpp.sdk.ui.SDKUIPlugin;
@@ -182,6 +185,13 @@
 		@Override
 		protected void setValue(Object element, Object value) {
 			ISymbianSDK sdk = (ISymbianSDK) element;
+			File currentPath = new File(sdk.getEPOCROOT());
+			File editedPath = new File(value.toString());
+			if (!currentPath.equals(editedPath)){
+				// User changed the path, so make sure to scan again (boog 12172)
+				((SymbianSDK)sdk).setScannedRaptor(false);
+				SymbianBuildContextDataCache.refreshForSDKs(new ISymbianSDK[] { sdk });
+			}
 			((SymbianSDK)sdk).setEPOCROOT(value.toString());
 			SDKCorePlugin.getSDKManager().updateSDK(sdk);
 			getViewer().refresh();