Bug 9601 - need writable project description to modify config data, but additional call to setProjectDescription is superfluous and causes exception due to recursive call to setProjectDescription
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/BuildConfigurationData.java Tue Aug 11 15:01:16 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/BuildConfigurationData.java Tue Aug 11 15:18:59 2009 -0500
@@ -275,7 +275,7 @@
return;
}
- ICProjectDescription projDes = CoreModel.getDefault().getProjectDescription(cpi.getProject(), false);
+ ICProjectDescription projDes = CoreModel.getDefault().getProjectDescription(cpi.getProject());
if (projDes != null) {
ICConfigurationDescription configDes = projDes.getConfigurationById(carbideBuildConfig.getDisplayString());
if (configDes != null) {
@@ -292,18 +292,6 @@
filesCacheValue += file.getAbsolutePath() + ENTRY_DELIMTER;
}
storage.setAttribute(FILES_CACHE, filesCacheValue);
-
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- ICProjectDescription projDes = CoreModel.getDefault().getProjectDescription(cpi.getProject());
- try {
- // save the CDT project description
- CCorePlugin.getDefault().setProjectDescription(cpi.getProject(), projDes, true, new NullProgressMonitor());
- } catch (CoreException e) {
- CarbideBuilderPlugin.log(e);
- }
- }
- });
}
}
} catch (CoreException e) {
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java Tue Aug 11 15:01:16 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java Tue Aug 11 15:18:59 2009 -0500
@@ -311,7 +311,7 @@
// persist the cache between IDE launches.
try {
final IProject project = carbideBuildConfig.getCarbideProject().getProject();
- ICProjectDescription projDes = CoreModel.getDefault().getProjectDescription(project, false);
+ ICProjectDescription projDes = CoreModel.getDefault().getProjectDescription(project);
if (projDes != null) {
ICConfigurationDescription configDes = projDes.getConfigurationById(carbideBuildConfig.getDisplayString());
if (configDes != null) {
@@ -344,18 +344,6 @@
filesCacheValue += file.getAbsolutePath() + ENTRY_DELIMTER;
}
storage.setAttribute(FILES_CACHE, filesCacheValue);
-
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- ICProjectDescription projDes = CoreModel.getDefault().getProjectDescription(project);
- try {
- // save the CDT project description
- CCorePlugin.getDefault().setProjectDescription(project, projDes, true, new NullProgressMonitor());
- } catch (CoreException e) {
- CarbideBuilderPlugin.log(e);
- }
- }
- });
}
}
} catch (CoreException e) {