From 08a0e81c57ece2d5f06791aa3a024c61f98948b9 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Mon, 26 Dec 2011 23:40:59 -0500 Subject: [PATCH] bug 367559: Double source folder in Make Targets View --- .../org/eclipse/cdt/make/ui/MakeContentProvider.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java index f25279446eb..c1351570803 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java @@ -47,7 +47,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; import org.eclipse.core.runtime.preferences.InstanceScope; -import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.Viewer; @@ -346,11 +345,12 @@ public class MakeContentProvider implements ITreeContentProvider, IMakeTargetLis public void run() { if (viewer == null || viewer.getControl() == null || viewer.getControl().isDisposed()) return; - if (viewer instanceof AbstractTreeViewer) { - ((AbstractTreeViewer) viewer).remove(affected.toArray()); - } else { - viewer.refresh(resource); + + if (CCorePlugin.showSourceRootsAtTopOfProject()) { + // that will refresh equal TargetSourceContainer from the tree + viewer.refresh(new TargetSourceContainer(new CSourceEntry((IFolder) resource, null, 0))); } + viewer.refresh(resource); } }); }