From d8ba0d98a97b746eef57f15a3d16cda0a868349b Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Thu, 14 Jun 2007 16:40:26 +0000
Subject: [PATCH] Fix for [Bug 192423] Project conversion should NOT occur in
 case the tool-chain definition is not installed

---
 .../internal/dataprovider/ProjectConverter.java | 17 +++++++++--------
 .../cdt/ui/wizards/CDTCommonProjectWizard.java  |  6 +++++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java
index 3c55139e58b..2d0f1898926 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java
@@ -29,7 +29,6 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICExternalSetting;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
 import org.eclipse.cdt.core.settings.model.ICStorageElement;
-import org.eclipse.cdt.core.settings.model.WriteAccessException;
 import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
 import org.eclipse.cdt.core.settings.model.extension.ICProjectConverter;
 import org.eclipse.cdt.core.settings.model.util.PathEntryTranslator;
@@ -502,7 +501,7 @@ public class ProjectConverter implements ICProjectConverter {
 		convertOldStdMakeToNewStyle(project, false, monitor, true);
 	}
 
-	private IManagedBuildInfo convertManagedBuildInfo(IProject project, ICProjectDescription newDes){
+	private IManagedBuildInfo convertManagedBuildInfo(IProject project, ICProjectDescription newDes) throws CoreException {
 		IManagedBuildInfo info = ManagedBuildManager.getBuildInfoLegacy(project);
 		
 		synchronized(LOCK){
@@ -516,21 +515,23 @@ public class ProjectConverter implements ICProjectConverter {
 					for(int i = 0; i < cfgs.length; i++){
 						cfg = (Configuration)cfgs[i];
 						data = cfg.getConfigurationData();
-						try {
+//						try {
 							ICConfigurationDescription cfgDes = newDes.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data);
 							if(cfg.getConfigurationDescription() != null) {
 								//copy cfg to avoid raise conditions
 								cfg = ConfigurationDataProvider.copyCfg(cfg, cfgDes);
 							}
 							cfg.setConfigurationDescription(cfgDes);
-						} catch (WriteAccessException e) {
-							ManagedBuilderCorePlugin.log(e);
-						} catch (CoreException e) {
-							ManagedBuilderCorePlugin.log(e);
-						}
+//						} catch (WriteAccessException e) {
+//							ManagedBuilderCorePlugin.log(e);
+//						} catch (CoreException e) {
+//							ManagedBuilderCorePlugin.log(e);
+//						}
 						cfg.exportArtifactInfo();
 					}
 				}
+			} else {
+				throw new CoreException(new Status(IStatus.ERROR, ManagedBuilderCorePlugin.getUniqueIdentifier(), "failed to load the build info for the old-style project"));
 			}
 		}
 		return info;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java
index 1dfe3d1b85e..a8f156de72d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java
@@ -288,7 +288,11 @@ implements IExecutableExtension, IWizardWithMemory
 	public IPath getLastProjectLocation() {
 		return lastProjectLocation;
 	}
-	
+
+	public IProject getLastProject() {
+		return newProject;
+	}
+
 	// Methods below should provide data for language check
 	public String[] getLanguageIDs (){
 		return EMPTY_ARR;