# HG changeset patch
# User stechong
# Date 1280260752 18000
# Node ID 0cfa8e4498234753ebef074157c9bd5d2b39b30c
# Parent  176858b7f249d5f55ad8be9a54dde8eeffb31669
No longer scan for installable Eclipse plugins in SDKs.

diff -r 176858b7f249 -r 0cfa8e449823 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java	Tue Jul 27 14:20:13 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java	Tue Jul 27 14:59:12 2010 -0500
@@ -56,8 +56,6 @@
 
 import com.nokia.carbide.cpp.internal.api.sdk.BuildPlat;
 import com.nokia.carbide.cpp.internal.api.sdk.ICarbideDevicesXMLChangeListener;
-import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildInfo;
-import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildInfo;
 import com.nokia.carbide.cpp.internal.api.sdk.ISDKManagerInternal;
 import com.nokia.carbide.cpp.internal.api.sdk.ISDKManagerLoadedHook;
 import com.nokia.carbide.cpp.internal.api.sdk.SBSv2Utils;
@@ -69,7 +67,6 @@
 import com.nokia.carbide.cpp.sdk.core.ICarbideInstalledSDKChangeListener.SDKChangeEventType;
 import com.nokia.carbide.cpp.sdk.core.IRVCTToolChainInfo;
 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.ISymbianSDKFeatures;
 import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
@@ -91,7 +88,6 @@
 	protected static final String SDK_CACHE_ID_ATTRIB = "id";
 	protected static final String SDK_CACHE_ENABLED_ATTRIB = "isEnabled";
 	protected static final String SDK_CACHE_OS_VERSION_ATTRIB = "osVersion";
-	protected static final String SDK_SCANNED_FOR_PLUGINS = "sdkScanned";
 
 	protected static final String SDK_CACHE_EPOCROOT_ATTRIB = "epocroot";
 
@@ -377,12 +373,6 @@
 						if (epocrootItem != null)
 							epocRoot = epocrootItem.getNodeValue();
 						
-						// get whether or not this SDK has been scanned
-						String wasScanned = "false";
-						Node sdkScannedItem = attribs.getNamedItem(SDK_SCANNED_FOR_PLUGINS);
-						if (sdkScannedItem != null)
-							wasScanned = sdkScannedItem.getNodeValue();
-						
 						sdk = SymbianSDKFactory.createInstance(id, 
 															   epocRoot,
 															   new Version(osVersion));
@@ -391,15 +381,6 @@
 						} else {
 							((SymbianSDK)sdk).setEnabled(false);
 						}
-						ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
-						ISBSv2BuildInfo sbsv2BuildInfo = (ISBSv2BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER);
-						if (wasScanned.equalsIgnoreCase("true")){
-							sbsv1BuildInfo.setPreviouslyScanned(true);
-							sbsv2BuildInfo.setPreviouslyScanned(true);
-						} else {
-							sbsv1BuildInfo.setPreviouslyScanned(false);
-							sbsv2BuildInfo.setPreviouslyScanned(false);
-						}
 						synchronized (sdkList) {
 							sdkList.add(sdk);
 						}
@@ -472,17 +453,6 @@
 				Node sdkEpocRootNode = d.createAttribute(SDK_CACHE_EPOCROOT_ATTRIB);
 				sdkEpocRootNode.setNodeValue(currSDK.getEPOCROOT());
 				attribs.setNamedItem(sdkEpocRootNode);
-
-				ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)currSDK.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
-				ISBSv2BuildInfo sbsv2BuildInfo = (ISBSv2BuildInfo)currSDK.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER);
-				Node wasScannedNode = d.createAttribute(SDK_SCANNED_FOR_PLUGINS);
-				if (true == sbsv1BuildInfo.isPreviouslyScanned() ||
-					true == sbsv2BuildInfo.isPreviouslyScanned()) {
-					wasScannedNode.setNodeValue("true");
-				} else {
-					wasScannedNode.setNodeValue("false");
-				}
-				attribs.setNamedItem(wasScannedNode);
 			}
 		}
 		DOMSource domSource = new DOMSource(d);
diff -r 176858b7f249 -r 0cfa8e449823 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	Tue Jul 27 14:20:13 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Tue Jul 27 14:59:12 2010 -0500
@@ -26,7 +26,6 @@
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.IJobChangeListener;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.CellEditor;
@@ -74,7 +73,6 @@
 import com.nokia.carbide.cpp.sdk.core.ISDKManager;
 import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
 import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
-import com.nokia.carbide.cpp.sdk.ui.SDKUIPlugin;
 import com.nokia.carbide.cpp.sdk.ui.shared.AddSDKDialog;
 import com.nokia.carbide.cpp.ui.TextAndDialogCellEditor;
 import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils;
@@ -248,16 +246,13 @@
 		
 	}
 
-	private IPreferenceStore prefsStore;
 	private ISDKManager sdkMgr;
 	private List<ISymbianSDK> sdkList;
 	private ScanJobListener scanJobListner;
-	private boolean scanForNewPlugins;
 	private CheckboxTableViewer sdkListTableViewer;
 	private Button addButton;
 	private Button deleteButton;
 	private Button propertiesButton;
-	private Button scanForNewPluginsButton;
 	private Button rescanButton;
 	private Label iconLabel;
 	private Label statusLabel;
@@ -280,7 +275,6 @@
 	 * @see org.eclipse.jface.preference.PreferencePage#createControl(org.eclipse.swt.widgets.Composite)
 	 */
 	public void createControl(Composite parent){
-		prefsStore = SDKUIPlugin.getDefault().getPreferenceStore();
 		sdkMgr = SDKCorePlugin.getSDKManager();
 		if (sdkMgr == null){
 			return; 
@@ -322,9 +316,6 @@
 	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
 	 */
 	public boolean performOk() {
-		// Save preference page specific values;
-		prefsStore.setValue(SDKUIPreferenceConstants.SCAN_FOR_NEW_PLUGINS, scanForNewPluginsButton.getSelection());
-
 		// Remember which SDK is enabled
 		for (ISymbianSDK sdk : sdkMgr.getSDKList()){
 			((SymbianSDK)sdk).setEnabled(false);
@@ -414,15 +405,6 @@
 
 		new Label(content, SWT.WRAP); // filler
 		
-		// Scan SDK checkbox
-		scanForNewPluginsButton = new Button(content, SWT.CHECK);
-		scanForNewPluginsButton.setText(Messages.getString("SDKPreferencePage.ScanForNewPlugins_Button_Label")); //$NON-NLS-1$
-		scanForNewPluginsButton.setSelection(prefsStore.getBoolean(SDKUIPreferenceConstants.SCAN_FOR_NEW_PLUGINS));
-		addButtonListener(scanForNewPluginsButton);
-
-
-		new Label(content, SWT.WRAP); // filler
-		
 		// Rescan button
 		rescanButton = new Button(content, SWT.NONE);
 		rescanButton.setToolTipText(Messages.getString("SDKPreferencePage.Rescan_Button_ToolTip")); //$NON-NLS-1$
@@ -445,8 +427,6 @@
 					handleDeleteButton();
 				} else if (e.getSource().equals(propertiesButton)) {
 					handlePropertiesButton();
-				} else if (e.getSource().equals(scanForNewPluginsButton)) {
-					handleScanForNewPluginsButton();
 				} else if (e.getSource().equals(rescanButton)) {
 					handleRescanButton();
 				}
@@ -563,10 +543,6 @@
 		}
 	}
 
-	private void handleScanForNewPluginsButton() {
-		scanForNewPlugins = scanForNewPluginsButton.getSelection();
-	}
-
 	private void handleRescanButton() {
 		// forcible rescan; dump cache
 		SymbianBuildContextDataCache.refreshForSDKs(null);
@@ -590,10 +566,6 @@
 		selectSDKEntry(0);
 		rescanButton.setText(Messages.getString("SDKPreferencePage.Rescan_Button_Label")); //$NON-NLS-1$
 		rescanButton.setEnabled(true);
-
-		if (scanForNewPlugins){
-			NewPluginChecker.checkForNewlyInstalledPlugins(SDKUIPlugin.getDefault().getWorkbench());
-		}
 	}
 
 	private void selectSDKEntry(int index) {
diff -r 176858b7f249 -r 0cfa8e449823 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties	Tue Jul 27 14:20:13 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties	Tue Jul 27 14:59:12 2010 -0500
@@ -11,7 +11,6 @@
 SDKPreferencePage.Delete_Button_ToolTip=Delete an SDK from Carbide.c++.
 SDKPreferencePage.Properties_Button_Label=Properties
 SDKPreferencePage.Properties_Button_ToolTip=Show properties of the selected SDK.
-SDKPreferencePage.ScanForNewPlugins_Button_Label=Scan SDKs for installable Eclipse plugins
 SDKPreferencePage.Rescan_Button_Label=Rescan All SDKs
 SDKPreferencePage.Rescan_Button_ToolTip=Rebuilds all SDK entries (same as restarting the IDE).
 SDKPreferencePage.Rescanning_Button_Label=Rescanning...