# HG changeset patch # User wpaul # Date 1250084977 18000 # Node ID be59a4bc07470f8d331c958fbcc82479a20ef36f # Parent 57e6a837cd3c6ba135d81ec0b657d4ec57b32635# Parent c72fa4f18841bfccb18e4c10e3f9e733878fa78c merged diff -r 57e6a837cd3c -r be59a4bc0747 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/BuildConfigurationData.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/BuildConfigurationData.java Wed Aug 12 08:46:04 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/BuildConfigurationData.java Wed Aug 12 08:49:37 2009 -0500 @@ -42,6 +42,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; +import org.eclipse.swt.widgets.Display; import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin; import com.nokia.carbide.cdt.builder.EpocEngineHelper; @@ -269,7 +270,7 @@ private void persistCache() { // persist the cache between IDE launches. try { - ICarbideProjectInfo cpi = carbideBuildConfig.getCarbideProject(); + final ICarbideProjectInfo cpi = carbideBuildConfig.getCarbideProject(); if (cpi == null) { return; } @@ -291,9 +292,6 @@ filesCacheValue += file.getAbsolutePath() + ENTRY_DELIMTER; } storage.setAttribute(FILES_CACHE, filesCacheValue); - - // save the CDT project description - CCorePlugin.getDefault().setProjectDescription(cpi.getProject(), projDes, true, new NullProgressMonitor()); } } } catch (CoreException e) { diff -r 57e6a837cd3c -r be59a4bc0747 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java Wed Aug 12 08:46:04 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java Wed Aug 12 08:49:37 2009 -0500 @@ -27,6 +27,7 @@ import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.content.*; +import org.eclipse.swt.widgets.Display; import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin; import com.nokia.carbide.cdt.builder.EpocEngineHelper; @@ -309,7 +310,7 @@ private void persistCache() { // persist the cache between IDE launches. try { - IProject project = carbideBuildConfig.getCarbideProject().getProject(); + final IProject project = carbideBuildConfig.getCarbideProject().getProject(); ICProjectDescription projDes = CoreModel.getDefault().getProjectDescription(project); if (projDes != null) { ICConfigurationDescription configDes = projDes.getConfigurationById(carbideBuildConfig.getDisplayString()); @@ -343,9 +344,6 @@ filesCacheValue += file.getAbsolutePath() + ENTRY_DELIMTER; } storage.setAttribute(FILES_CACHE, filesCacheValue); - - // save the CDT project description - CCorePlugin.getDefault().setProjectDescription(project, projDes, true, new NullProgressMonitor()); } } } catch (CoreException e) { diff -r 57e6a837cd3c -r be59a4bc0747 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectInfo.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectInfo.java Wed Aug 12 08:46:04 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectInfo.java Wed Aug 12 08:49:37 2009 -0500 @@ -83,9 +83,9 @@ this.projectTracker = new TrackedResource(project); try { - ICProjectDescription projDes = getProjectDescription(); + ICProjectDescription projDes = getProjectDescription(false); if (projDes != null) { - initializeDefaults(projDes); + initializeDefaults(); ICStorageElement storage = projDes.getStorage(CarbideBuilderPlugin.getCarbideBuilderExtensionID(), false); if (storage != null) { @@ -232,7 +232,7 @@ } } - protected void initializeDefaults(ICProjectDescription projDes) { + protected void initializeDefaults() { overrideWorkspaceSettings = false; if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(projectTracker.getProject())) { @@ -260,7 +260,7 @@ List configs = new ArrayList(); - ICProjectDescription projectDescription = getProjectDescription(); + ICProjectDescription projectDescription = getProjectDescription(false); if (projectDescription != null) { for (ICConfigurationDescription config : projectDescription.getConfigurations()) { CConfigurationData data = config.getConfigurationData(); @@ -274,7 +274,7 @@ } public ICarbideBuildConfiguration getNamedConfiguration(String configName) { - ICProjectDescription projectDescription = getProjectDescription(); + ICProjectDescription projectDescription = getProjectDescription(false); if (projectDescription != null) { ICConfigurationDescription config = projectDescription.getConfigurationByName(configName); if (config != null) { @@ -289,7 +289,7 @@ } public ICarbideBuildConfiguration getDefaultConfiguration() { - ICProjectDescription projectDescription = getProjectDescription(); + ICProjectDescription projectDescription = getProjectDescription(false); if (projectDescription == null) return null; ICConfigurationDescription config = projectDescription.getActiveConfiguration(); @@ -412,8 +412,8 @@ return workingDir; } - protected ICProjectDescription getProjectDescription() { - return CoreModel.getDefault().getProjectDescription(projectTracker.getProject()); + protected ICProjectDescription getProjectDescription(boolean writable) { + return CoreModel.getDefault().getProjectDescription(projectTracker.getProject(), writable); } public int getCleanLevel() { diff -r 57e6a837cd3c -r be59a4bc0747 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectModifier.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectModifier.java Wed Aug 12 08:46:04 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectModifier.java Wed Aug 12 08:49:37 2009 -0500 @@ -45,7 +45,7 @@ super(projDes.getProject()); this.projDes = projDes; - initializeDefaults(projDes); + initializeDefaults(); } /* @@ -56,7 +56,7 @@ // get the latest ICProjectDescription super(cpi.projectTracker.getProject()); - projDes = getProjectDescription(); + projDes = getProjectDescription(true); projectRelativeBldInfPath = cpi.projectRelativeBldInfPath; buildFromInf = cpi.buildFromInf; overrideWorkspaceSettings = cpi.overrideWorkspaceSettings; diff -r 57e6a837cd3c -r be59a4bc0747 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java Wed Aug 12 08:46:04 2009 -0500 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java Wed Aug 12 08:49:37 2009 -0500 @@ -26,6 +26,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Display; import java.lang.reflect.InvocationTargetException; @@ -178,7 +179,7 @@ return; final TestResult result[] = { null }; - if (runnableContext != null) { + if (runnableContext != null && (!(runnableContext instanceof WizardDialog) || ((WizardDialog) runnableContext).getShell() != null)) { Display.getDefault().syncExec(new Runnable() { public void run() { try { diff -r 57e6a837cd3c -r be59a4bc0747 core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Wed Aug 12 08:46:04 2009 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Wed Aug 12 08:49:37 2009 -0500 @@ -15,17 +15,22 @@

Carbide.c++ bugs fixed

This is a comprehensive list of bugs fixed by release:

-