Additional core fix for [bug 205840] Should file-level tool be updated when project toolchain changes?

2 files changed, 8 insertions, 8 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
index ac70ae60ba7..5653606a036 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
@@ -167,7 +167,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 	
 	private void showErrorMessage() {
 		if (ri instanceof IFolderInfo) {
-			IFolderInfoModification foim = tcmm.getModification((IFolderInfo)ri);
+			IFolderInfoModification foim = tcmm.createModification((IFolderInfo)ri);
 			if (foim.isToolChainCompatible()) {
 				st_toolchain.setText(EMPTY_STR);
 			} else {
@@ -186,7 +186,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 				}
 			}
 		} else { // FileInfo
-			IFileInfoModification fim = tcmm.getModification((IFileInfo)ri);
+			IFileInfoModification fim = tcmm.createModification((IFileInfo)ri);
 			fim.getProjectToolModifications();
 		}
 	}
@@ -202,7 +202,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 		
 		IToolChain[] tcs = r_tcs;
 		if (b_dispCompatible.getSelection() && (ri instanceof IFolderInfo)) {
-			IFolderInfoModification fim = tcmm.getModification((IFolderInfo)ri);
+			IFolderInfoModification fim = tcmm.createModification((IFolderInfo)ri);
 			tcs = fim.getCompatibleToolChains();
 			IToolChain[] tcs1 = new IToolChain[tcs.length + 1];
 			System.arraycopy(tcs, 0, tcs1, 0, tcs.length);
@@ -245,7 +245,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 		IBuilder[] bs = r_bs;
 		
 		if (b_dispCompatible.getSelection() && (ri instanceof IFolderInfo)) {
-			IFolderInfoModification fim = tcmm.getModification((IFolderInfo)ri);
+			IFolderInfoModification fim = tcmm.createModification((IFolderInfo)ri);
 			if (fim instanceof IConfigurationModification) {
 				IBuilder[] bs1 = ((IConfigurationModification)fim).getCompatibleBuilders();
 				bs = new IBuilder[bs1.length + 1];
@@ -347,7 +347,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 		st_tool.setImage(null);
 		if (tool == null)
 			return;
-		IFileInfoModification fim = tcmm.getModification((IFileInfo)ri);
+		IFileInfoModification fim = tcmm.createModification((IFileInfo)ri);
 		IToolModification tm = fim.getToolModification(tool);
 		if (tm != null && !tm.isCompatible()) {
 			CompatibilityStatus cs = tm.getCompatibilityStatus();
@@ -361,7 +361,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 	private boolean updateCompatibleTools(ITool real) {
 		boolean result = false;
 		ArrayList list = new ArrayList();
-		IFileInfoModification fim = tcmm.getModification((IFileInfo)ri);
+		IFileInfoModification fim = tcmm.createModification((IFileInfo)ri);
 		
 		if (real != null) { // Current tool exists 
 			real = ManagedBuildManager.getRealTool(real);
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
index 4f31594e886..8e5353b8248 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
@@ -72,9 +72,9 @@ public class ToolSelectionDialog extends Dialog {
 		setShellStyle(getShellStyle() | SWT.RESIZE);
 		
 		if (ri instanceof IFolderInfo)
-			tmod = ManagedBuildManager.getToolChainModificationManager().getModification((IFolderInfo)ri);
+			tmod = ManagedBuildManager.getToolChainModificationManager().createModification((IFolderInfo)ri);
 		else 	
-			tmod = ManagedBuildManager.getToolChainModificationManager().getModification((IFileInfo)ri);
+			tmod = ManagedBuildManager.getToolChainModificationManager().createModification((IFileInfo)ri);
 	}
 
 	/* (non-Javadoc)