From 2c098ef25aae0dfb43155b75fd05ebb4cda4ced4 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Mon, 18 Jan 2010 02:53:40 +0000 Subject: [PATCH] bug 299858: Project Explorer is not notified when FolderDescription is created for an existing folder --- .../model/CProjectDescriptionManager.java | 74 +++++++++---------- .../model/SettingsModelMessages.properties | 2 + 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java index fdbdd6efbf5..392c6e3e06a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java @@ -1975,7 +1975,12 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { return list; } - private List generateCElementDeltasFromResourceDelta(ICProject cProject, ICDescriptionDelta delta, List list){ + /** + * The method maps {@link ICDescriptionDelta} to {@link CElementDelta} which are added to the {@code list}. + * The delta will indicate modification of CElement for a given resource plus language settings + * if they changed (relative to parent resource description if the resource has no its own). + */ + private void generateCElementDeltasFromResourceDelta(ICProject cProject, ICDescriptionDelta delta, List list){ int kind = delta.getDeltaKind(); ICDescriptionDelta parentDelta = delta.getParent(); @@ -1989,23 +1994,19 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { newRcDes = ((ICConfigurationDescription)parentDelta.getNewSetting()).getResourceDescription(path, false); break; case ICDescriptionDelta.ADDED: - newRcDes = (ICResourceDescription)delta.getNewSetting(); - path = newRcDes.getPath(); - oldRcDes = null; - break; - case ICDescriptionDelta.CHANGED: -// if((delta.getChangeFlags() & ICProjectDescriptionDelta.PATH) == 0){ - newRcDes = (ICResourceDescription)delta.getNewSetting(); - path = newRcDes.getPath(); - oldRcDes = (ICResourceDescription)delta.getOldSetting(); - break; -// } -// //if path changed treat as default - default: newRcDes = (ICResourceDescription)delta.getNewSetting(); path = newRcDes.getPath(); oldRcDes = ((ICConfigurationDescription)parentDelta.getOldSetting()).getResourceDescription(path, false); break; + case ICDescriptionDelta.CHANGED: + newRcDes = (ICResourceDescription)delta.getNewSetting(); + path = newRcDes.getPath(); + oldRcDes = (ICResourceDescription)delta.getOldSetting(); + break; + default: + // Not possible + CCorePlugin.log(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, SettingsModelMessages.getString("CProjectDescriptionManager.illegalDeltaKind")+kind)); //$NON-NLS-1$ + return; } path = path.makeRelative(); @@ -2013,11 +2014,15 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { try { el = cProject.findElement(path); } catch (CModelException e) { - return list; + return; } IResource rc = el.getResource(); if(rc != null){ + CElementDelta ceRcDelta = new CElementDelta(el.getCModel()); + ceRcDelta.changed(el, ICElementDelta.F_MODIFIERS); + list.add(ceRcDelta); + if(rc.getType() == IResource.FILE){ String fileName = path.lastSegment(); ICLanguageSetting newLS = getLanguageSetting(newRcDes, fileName); @@ -2025,34 +2030,29 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { ICDescriptionDelta ld = createDelta(newLS, oldLS); generateCElementDeltasFromLanguageDelta(el, ld, list); } else { - if(newRcDes.getType() == ICSettingBase.SETTING_FOLDER){ - ICFolderDescription oldFoDes = null; - if (oldRcDes != null) { - if (oldRcDes.getType() == ICSettingBase.SETTING_FOLDER) - oldFoDes = (ICFolderDescription)oldRcDes; - } - ICDescriptionDelta folderDelta = createDelta((ICFolderDescription)newRcDes, oldFoDes); - if(folderDelta != null){ - CElementDelta cElDelta = new CElementDelta(el.getCModel()); - cElDelta.changed(el, ICElementDelta.F_MODIFIERS); - list.add(cElDelta); - - ICDescriptionDelta children[] = folderDelta.getChildren(); - ICDescriptionDelta child; - for(int i = 0; i < children.length; i++){ - child = children[i]; - if(child.getSettingType() == ICSettingBase.SETTING_LANGUAGE){ - generateCElementDeltasFromLanguageDelta(el, child, list); - } + if(newRcDes.getType() != ICSettingBase.SETTING_FOLDER){ + CCorePlugin.log(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, SettingsModelMessages.getString("CProjectDescriptionManager.wrongTypeOfResourceDescription")+newRcDes)); //$NON-NLS-1$ + return; + } + ICFolderDescription newFoDes = (ICFolderDescription)newRcDes; + + if(oldRcDes.getType() != ICSettingBase.SETTING_FOLDER){ + CCorePlugin.log(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, SettingsModelMessages.getString("CProjectDescriptionManager.wrongTypeOfResourceDescription")+oldRcDes)); //$NON-NLS-1$ + return; + } + ICFolderDescription oldFoDes = (ICFolderDescription)oldRcDes; + + ICDescriptionDelta folderDelta = createDelta(newFoDes, oldFoDes); + if (folderDelta != null) { + for (ICDescriptionDelta child : folderDelta.getChildren()) { + if(child.getSettingType() == ICSettingBase.SETTING_LANGUAGE){ + generateCElementDeltasFromLanguageDelta(el, child, list); } } - } else { - //ERROR? } } } - return list; } private ICLanguageSetting getLanguageSetting(ICResourceDescription rcDes, String fileName){ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties index 32ae6e2344c..01cdf7f8d6c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SettingsModelMessages.properties @@ -38,6 +38,8 @@ CProjectDescriptionManager.15=Preference Configuration CProjectDescriptionManager.16=attempt to set description for the non-openned project CProjectDescriptionManager.17=unable to apply the invalid project description for project CProjectDescriptionManager.cfgIDAlreadyExists=Configuration with ID: {0} already exists in passed in settings storage +CProjectDescriptionManager.illegalDeltaKind=Illegal delta kind +CProjectDescriptionManager.wrongTypeOfResourceDescription=Wrong type of resource description: CFolderDescription.0=data was not created CFolderDescription.1=expected proxy of type ICLanguageSetting, but was CFolderDescription.2=data was not created