From 29aec8d2ad357ef952f6b60979c467dc0310689f Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Tue, 10 Apr 2007 14:04:21 +0000 Subject: [PATCH] CommonNavigator: Performance tuning for problem decoration --- .../ui/navigator/CNavigatorLabelProvider.java | 18 ++++---- .../CNavigatorProblemsLabelDecorator.java | 44 +++++++++++++++++++ .../viewsupport/ProblemsLabelDecorator.java | 4 +- 3 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java index 02aaeaf6eeb..1c4db7dc43d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,23 +10,23 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.navigator; +import org.eclipse.core.resources.IResource; +import org.eclipse.ui.IMemento; +import org.eclipse.ui.model.IWorkbenchAdapter; +import org.eclipse.ui.navigator.ICommonContentExtensionSite; +import org.eclipse.ui.navigator.ICommonLabelProvider; + import org.eclipse.cdt.core.model.IArchiveContainer; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.IBinaryContainer; import org.eclipse.cdt.core.model.IBinaryModule; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; + import org.eclipse.cdt.internal.ui.cview.CViewLabelProvider; import org.eclipse.cdt.internal.ui.cview.CViewMessages; import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; -import org.eclipse.cdt.internal.ui.viewsupport.ProblemsLabelDecorator; - -import org.eclipse.core.resources.IResource; -import org.eclipse.ui.IMemento; -import org.eclipse.ui.model.IWorkbenchAdapter; -import org.eclipse.ui.navigator.ICommonContentExtensionSite; -import org.eclipse.ui.navigator.ICommonLabelProvider; /** * A label provider suitable for the Common Navigator providing also @@ -44,7 +44,7 @@ public class CNavigatorLabelProvider extends CViewLabelProvider implements IComm super(AppearanceAwareLabelProvider.DEFAULT_TEXTFLAGS, AppearanceAwareLabelProvider.DEFAULT_IMAGEFLAGS | CElementImageProvider.SMALL_ICONS); - addLabelDecorator(new ProblemsLabelDecorator(null)); + addLabelDecorator(new CNavigatorProblemsLabelDecorator()); } /* diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java new file mode 100644 index 00000000000..43f5b4a68d7 --- /dev/null +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java @@ -0,0 +1,44 @@ +/******************************************************************************* + * Copyright (c) 2007 Wind River Systems, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Anton Leherbauer (Wind River Systems) - initial API and implementation + *******************************************************************************/ + +package org.eclipse.cdt.internal.ui.navigator; + +import org.eclipse.core.resources.IResource; + +import org.eclipse.cdt.internal.ui.viewsupport.ProblemsLabelDecorator; + +/** + * A {@link ProblemsLabelDecorator} optimized for use with the Common Navigator. + * + * @since 4.0 + */ +public class CNavigatorProblemsLabelDecorator extends ProblemsLabelDecorator { + + /** + * Create a problems label decorator for the Common Navigator. + */ + public CNavigatorProblemsLabelDecorator() { + super(null); + } + + /* + * @see org.eclipse.cdt.internal.ui.viewsupport.ProblemsLabelDecorator#fireProblemsChanged(org.eclipse.core.resources.IResource[], boolean) + */ + protected void fireProblemsChanged(IResource[] changedResources, + boolean isMarkerChange) { + // performance: if the number of changed resources is large, it is faster + // to trigger a viewer refresh by setting changedResources to null + if (changedResources != null && changedResources.length > 500) { + changedResources= null; + } + super.fireProblemsChanged(changedResources, isMarkerChange); + } +} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java index 4aa94a40b6b..4d1d5e2e33c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProblemsLabelDecorator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -344,7 +344,7 @@ public class ProblemsLabelDecorator implements ILabelDecorator, ILightweightLabe } } - void fireProblemsChanged(IResource[] changedResources, boolean isMarkerChange) { + protected void fireProblemsChanged(IResource[] changedResources, boolean isMarkerChange) { if (fListeners != null && !fListeners.isEmpty()) { LabelProviderChangedEvent event= new ProblemsLabelChangedEvent(this, changedResources, isMarkerChange); Object[] listeners= fListeners.getListeners();