Attachment 144835 Details for Bug 247021 – Alternative exemplary patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Alternative exemplary patch

ProjExplorerRefresh-247021.patch (text/plain), 2.73 KB, created by Alex Freidin

on 2009-08-18 11:14:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Freidin

Created: 2009-08-18 11:14:01 EDT

Size: 2.73 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.core
>Index: model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java,v
>retrieving revision 1.70
>diff -u -r1.70 CProjectDescriptionManager.java
>--- model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java	21 Apr 2009 20:19:18 -0000	1.70
>+++ model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java	18 Aug 2009 15:07:30 -0000
>@@ -1890,6 +1890,17 @@
> 				List<CElementDelta> list = new ArrayList<CElementDelta>();
> 				generateCElementDeltasFromCfgDelta(cProject, indexDelta, list);
> 				return list.toArray(new ICElementDelta[list.size()]);
>+			} else {
>+				if(projDesDelta.getChangeFlags() == ICDescriptionDelta.ACTIVE_CFG) {
>+					CElementDelta cdelta = new CElementDelta(cProject.getCModel());
>+					cdelta.changed(cProject, ICElementDelta.F_CONTENT);		
>+					try {						
>+						// just a trigger for CElementContentProvider to update the view
>+						cdelta.changed(cProject.getBinaryContainer(), ICElementDelta.F_CONTENT);						
>+					} catch (CModelException e) {						
>+					}					
>+					return new ICElementDelta[]{cdelta};					
>+				}
> 			}
> 			return EMPTY_CELEMENT_DELTA;
> 		case ICDescriptionDelta.ADDED:
>@@ -1980,6 +1991,10 @@
> 				ICLanguageSetting oldLS = getLanguageSetting(oldRcDes, fileName);
> 				ICDescriptionDelta ld = createDelta(newLS, oldLS);
> 				generateCElementDeltasFromLanguageDelta(el, ld, list);
>+				if(ld == null) {
>+					// if no language delta, the resource configuration was added or removed
>+					generateCElementForResource(cProject, el, list);
>+				}
> 			} else {
> 				if(newRcDes.getType() == ICSettingBase.SETTING_FOLDER){
> 					ICFolderDescription oldFoDes = null;
>@@ -1997,6 +2012,9 @@
> 								generateCElementDeltasFromLanguageDelta(el, child, list);
> 							}
> 						}
>+					} else {
>+						// if no language delta, the resource configuration was added or removed
>+						generateCElementForResource(cProject, el, list);
> 					}
> 				} else {
> 					//ERROR?
>@@ -2061,6 +2079,13 @@
> 		return flags;
> 	}
> 
>+	private void generateCElementForResource(ICProject cProject, ICElement el, List<CElementDelta> list) {
>+		CElementDelta cdelta = new CElementDelta(el.getCModel());
>+		cdelta.changed(cProject, ICElementDelta.F_CONTENT);
>+		cdelta.changed(el, ICElementDelta.F_CONTENT);
>+		list.add(cdelta);
>+	}
>+
> 	int[] kindsToArray(int kinds){
> 		int allKinds[] = KindBasedStore.getLanguageEntryKinds();
> 		int kindsArray[] = new int[allKinds.length];

Flags:

angvoz.dev: iplog+

Actions: View | Diff

Attachments on bug 247021: 112311 | 143920 | 144835