1 files changed, 2 insertions, 42 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java
index 2e57720201e..82a1c9c805e 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Intel Corporation and others.
+ * Copyright (c) 2007, 2012 Intel Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * Intel Corporation - Initial API and implementation
+ * Baltasar Belyavsky (Texas Instruments) - bug 340219: Project metadata files are saved unnecessarily
  *******************************************************************************/
 package org.eclipse.cdt.managedbuilder.internal.dataprovider;
 
@@ -29,7 +30,6 @@ import org.eclipse.cdt.core.settings.model.IModificationContext;
 import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
 import org.eclipse.cdt.core.settings.model.extension.CConfigurationDataProvider;
 import org.eclipse.cdt.managedbuilder.core.BuildException;
-import org.eclipse.cdt.managedbuilder.core.IBuilder;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IFolderInfo;
 import org.eclipse.cdt.managedbuilder.core.IInputType;
@@ -43,7 +43,6 @@ import org.eclipse.cdt.managedbuilder.core.IToolChain;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
 import org.eclipse.cdt.managedbuilder.internal.core.Builder;
-import org.eclipse.cdt.managedbuilder.internal.core.BuilderFactory;
 import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
 import org.eclipse.cdt.managedbuilder.internal.core.ISettingsChangeListener;
 import org.eclipse.cdt.managedbuilder.internal.core.InputType;
@@ -54,7 +53,6 @@ import org.eclipse.cdt.managedbuilder.internal.core.SettingsChangeEvent;
 import org.eclipse.cdt.managedbuilder.internal.core.Tool;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.QualifiedName;
@@ -83,28 +81,6 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem
 		}
 	}
 
-	private static class DesApplyRunnable implements IWorkspaceRunnable {
-		IBuilder fBuilder;
-		IProject fProject;
-
-		DesApplyRunnable(IProject project, IBuilder builder){
-			fProject = project;
-			fBuilder = builder;
-		}
-
-		@Override
-		public void run(IProgressMonitor monitor) throws CoreException {
-			try {
-				IProjectDescription eDes = fProject.getDescription();
-				if(BuilderFactory.applyBuilder(eDes, fBuilder) == BuilderFactory.CMD_CHANGED) {
-						fProject.setDescription(eDes, monitor);
-				}
-			} catch (Exception e){
-				ManagedBuilderCorePlugin.log(e);
-			}
-		}
-
-	}
 	static BuildConfigurationData writeConfiguration(ICConfigurationDescription cfgDescription,
 			BuildConfigurationData base) throws CoreException {
 		BuildConfigurationData appliedCfg = base;
@@ -178,22 +154,6 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem
 
 			setPersistedFlag(cfgDescription);
 			cacheNaturesIdsUsedOnCache(cfgDescription);
-
-			if(cfgDescription.isActive()){
-				IConfiguration cfg = appliedCfg.getConfiguration();
-				IBuilder builder = cfg.getEditableBuilder();
-				IProject project = context.getProject();
-				IProjectDescription eDes = context.getEclipseProjectDescription();
-				switch(BuilderFactory.applyBuilder(eDes, builder)){
-				case BuilderFactory.CMD_UNDEFINED:
-					IWorkspaceRunnable applyR = new DesApplyRunnable(project, builder);
-					context.addWorkspaceRunnable(applyR);
-					break;
-				case BuilderFactory.CMD_CHANGED:
-					context.setEclipseProjectDescription(eDes);
-					break;
-				}
-			}
 		}
 		return appliedCfg;
 	}