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

2005-07-06 Alain Magloire

Browse source 
PR 102619: Performance improvement patch from: Robert O'Callahan
	* src/org/eclipse/cdt/ui/CElementContentProvider.java
This commit is contained in:
Alain Magloire 2005-07-06 14:42:01 +00:00
parent 5875bc56e8
commit 03b2f1de71
2 changed files with 93 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,7 @@
2005-07-06 Alain Magloire
PR 102619: Performance improvement patch from: Robert O'Callahan
* src/org/eclipse/cdt/ui/CElementContentProvider.java
2005-07-05 Alain Magloire 2005-07-05 Alain Magloire
Fix for PR 102327: ContentType framework. Fix for PR 102327: ContentType framework.
* src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java * src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java

162
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java
View file

@ -12,6 +12,8 @@ package org.eclipse.cdt.ui;
import java.util.HashSet;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ElementChangedEvent; import org.eclipse.cdt.core.model.ElementChangedEvent;
@ -67,6 +69,9 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme
protected ITextEditor fEditor; protected ITextEditor fEditor;
protected StructuredViewer fViewer; protected StructuredViewer fViewer;
protected Object fInput; protected Object fInput;
/** Remember what refreshes we already have pending so we don't post them again. */
protected HashSet pendingRefreshes = new HashSet();
/** /**
* Creates a new content provider for C elements. * Creates a new content provider for C elements.
@ -258,97 +263,108 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme
} }
return false; return false;
} }
// Tree refresh system
// We keep track of what we're going to refresh and avoid posting multiple refresh
// messages for the same elements. This avoids major performance issues where
// we update tree views hundreds or thousands of times.
interface IRefreshable {
public void refresh();
}
final class RefreshContainer implements IRefreshable {
private IParent container;
private ICProject cproject;
public RefreshContainer(IParent container, ICProject cproject) {
this.container = container;
this.cproject = cproject;
}
public void refresh() {
if (container.hasChildren()) {
if (fViewer.testFindItem(container) != null) {
fViewer.refresh(container);
} else {
fViewer.refresh(cproject);
}
} else {
fViewer.refresh(cproject);
}
}
public boolean equals(Object o) {
if (o instanceof RefreshContainer) {
RefreshContainer c = (RefreshContainer)o;
return c.container.equals(container) && c.cproject.equals(cproject);
}
return false;
}
public int hashCode() {
return container.hashCode()*10903143 + 31181;
}
}
final class RefreshElement implements IRefreshable {
private Object element;
public RefreshElement(Object element) {
this.element = element;
}
public void refresh() {
if (element instanceof IWorkingCopy){
if (fViewer.testFindItem(element) != null){
fViewer.refresh(element);
} else {
fViewer.refresh(((IWorkingCopy)element).getOriginalElement());
}
} else if (element instanceof IBinary) {
fViewer.refresh(element, true);
} else {
fViewer.refresh(element);
}
}
public boolean equals(Object o) {
if (o instanceof RefreshElement) {
RefreshElement c = (RefreshElement)o;
return c.element.equals(element);
}
return false;
}
public int hashCode() {
return element.hashCode()*7 + 490487;
}
}
private void postContainerRefresh(final IParent container, final ICProject cproject) { private void postContainerRefresh(final IParent container, final ICProject cproject) {
//System.out.println("UI Container:" + cproject + " " + container); //System.out.println("UI Container:" + cproject + " " + container);
postRunnable(new Runnable() { postRefreshable(new RefreshContainer(container, cproject));
public void run () {
Control ctrl= fViewer.getControl();
if (ctrl != null && !ctrl.isDisposed()) {
if (container.hasChildren()) {
if (fViewer.testFindItem(container) != null) {
fViewer.refresh(container);
} else {
fViewer.refresh(cproject);
}
} else {
fViewer.refresh(cproject);
}
}
}
});
} }
private void postRefresh(final Object element) { private void postRefresh(final Object element) {
//System.out.println("UI refresh:" + root); //System.out.println("UI refresh:" + root);
postRunnable(new Runnable() { postRefreshable(new RefreshElement(element));
public void run() {
// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
Control ctrl= fViewer.getControl();
if (ctrl != null && !ctrl.isDisposed()){
if (element instanceof IWorkingCopy){
if (fViewer.testFindItem(element) != null){
fViewer.refresh(element);
} else {
fViewer.refresh(((IWorkingCopy)element).getOriginalElement());
}
} else if (element instanceof IBinary) {
fViewer.refresh(element, true);
} else {
fViewer.refresh(element);
}
}
}
});
} }
private void postAdd(final Object parent, final Object element) { private void postAdd(final Object parent, final Object element) {
//System.out.println("UI add:" + parent + " " + element); //System.out.println("UI add:" + parent + " " + element);
postRunnable(new Runnable() { postRefreshable(new RefreshElement(parent));
public void run() {
// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
Control ctrl= fViewer.getControl();
if (ctrl != null && !ctrl.isDisposed()){
if(parent instanceof IWorkingCopy){
if (fViewer.testFindItem(parent) != null){
fViewer.refresh(parent);
} else {
fViewer.refresh(((IWorkingCopy)parent).getOriginalElement());
}
} else {
fViewer.refresh(parent);
}
}
}
});
} }
private void postRemove(final Object element) { private void postRemove(final Object element) {
//System.out.println("UI remove:" + element); //System.out.println("UI remove:" + element);
postRunnable(new Runnable() { postRefreshable(new RefreshElement(internalGetParent(element)));
public void run() {
// 1GF87WR: ITPUI:ALL - SWTEx + NPE closing a workbench window.
Control ctrl= fViewer.getControl();
if (ctrl != null && !ctrl.isDisposed()) {
Object parent = internalGetParent(element);
if (parent instanceof IWorkingCopy){
if (fViewer.testFindItem(parent) != null){
fViewer.refresh(parent);
} else {
fViewer.refresh(((IWorkingCopy)parent).getOriginalElement());
}
} else {
fViewer.refresh(parent);
}
}
}
});
} }
private void postRunnable(final Runnable r) { private void postRefreshable(final IRefreshable r) {
Control ctrl= fViewer.getControl(); Control ctrl= fViewer.getControl();
if (ctrl != null && !ctrl.isDisposed()) { if (ctrl != null && !ctrl.isDisposed()) {
ctrl.getDisplay().asyncExec(r); if (pendingRefreshes.contains(r))
return;
pendingRefreshes.add(r);
ctrl.getDisplay().asyncExec(new Runnable() {
public void run() {
pendingRefreshes.remove(r);
Control ctrl= fViewer.getControl();
if (ctrl != null && !ctrl.isDisposed()) {
r.refresh();
}
}
});
} }
} }