1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

bug 298590: Restore Defaults does not quite restore Folder Settings

Restoring original logic of finding parent folder settings from revisions earlier than 1.65
This commit is contained in:
Andrew Gvozdev 2010-01-01 18:22:30 +00:00
parent b6ffaf6758
commit 172ea442ad

View file

@ -2505,14 +2505,15 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
for(parent = child.getParentContainer(); for(parent = child.getParentContainer();
(parentRcData = (CResourceData)parent.getValue()).getType() != ICSettingBase.SETTING_FOLDER; (parentRcData = (CResourceData)parent.getValue()).getType() != ICSettingBase.SETTING_FOLDER;
parent = parent.getParentContainer()) { parent = parent.getParentContainer()) {
if(!settingsCustomized(project, (CFolderData)parentRcData, (CFolderData)childRcData)){ // no body, this loop is to find the parent
try { }
data.removeResourceData(childRcData); if(!settingsCustomized(project, (CFolderData)parentRcData, (CFolderData)childRcData)){
child.remove(); try {
modified = true; data.removeResourceData(childRcData);
} catch (CoreException e) { child.remove();
CCorePlugin.log(e); modified = true;
} } catch (CoreException e) {
CCorePlugin.log(e);
} }
} }
} else { } else {