fixed bug #10641.
authorwpaul
Mon, 01 Feb 2010 19:58:21 -0600
changeset 871 009f5d356768
parent 870 cdb6d745cb05
child 872 a1e9028ccb80
fixed bug #10641.
core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java	Mon Feb 01 18:25:22 2010 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java	Mon Feb 01 19:58:21 2010 -0600
@@ -54,25 +54,27 @@
 				boolean oneSDKWasScanned = false;
 				for (ISymbianSDK sdk : sdkList) {
 					
-					if (sdk.isPreviouslyScanned() == false){
+					if (sdk.isPreviouslyScanned() == false) {
 						oneSDKWasScanned = true;
 						// XML was parsed, now try to run the feature installer
-						try {
-							sdk.setPreviouslyScanned(true);
-							String eclipsePluginsPath = sdk.getEPOCROOT() + SDK_FEATURE_SUBDIR;
-							DynamicFeatureInstaller installer = new DynamicFeatureInstaller(new File(eclipsePluginsPath), null);
-							if (installer.install()) {
-								installed = true;
+						sdk.setPreviouslyScanned(true);
+						File featureDir = new File(sdk.getEPOCROOT() + SDK_FEATURE_SUBDIR);
+						if (featureDir.exists()) {
+							try {
+								DynamicFeatureInstaller installer = new DynamicFeatureInstaller(featureDir, null);
+								if (installer.install()) {
+									installed = true;
+								}
+		// Boog 8383: We should fail silently, since this will not break anything and may SDKs will not have any documentation
+		// Otherwise, these errors will be logged every time this check is done (workspace is opened)
+		// Originally, this was used to install MBS build support, but now is only used for SDK documentation
+							} catch (MalformedURLException e) {
+		//						ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", e));
+							} catch (FileNotFoundException e) {
+		//						ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", e));
+							} catch (InstallationFailureException e) {
+		//						ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", e));
 							}
-	// Boog 8383: We should fail silently, since this will not break anything and may SDKs will not have any documentation
-	// Otherwise, these errors will be logged every time this check is done (workspace is opened)
-	// Originally, this was used to install MBS build support, but now is only used for SDK documentation
-						} catch (MalformedURLException e) {
-	//						ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", e));
-						} catch (FileNotFoundException e) {
-	//						ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", e));
-						} catch (InstallationFailureException e) {
-	//						ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", e));
 						}
 					}