Attachment #233626 for bug #413346

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




import org.eclipse.dltk.ui.ScriptElementLabels;
import org.eclipse.dltk.ui.actions.CustomFiltersActionGroup;
import org.eclipse.dltk.ui.viewsupport.AppearanceAwareLabelProvider;
import org.eclipse.dltk.ui.viewsupport.DecoratingModelLabelProvider;
import org.eclipse.dltk.ui.viewsupport.FilterUpdater;
import org.eclipse.dltk.ui.viewsupport.IViewPartInputProvider;
import org.eclipse.dltk.ui.viewsupport.ProblemTreeViewer;
import org.eclipse.dltk.ui.viewsupport.StatusBarUpdater;
import org.eclipse.dltk.ui.viewsupport.StyledDecoratingModelLabelProvider;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager;

	private WorkingSetModel fWorkingSetModel;

	private ScriptExplorerLabelProvider fLabelProvider;
	private StyledDecoratingModelLabelProvider fDecoratingLabelProvider;
	private ScriptExplorerContentProvider fContentProvider;
	private FilterUpdater fFilterUpdater;



		fLabelProvider = createLabelProvider();
		fLabelProvider.setIsFlatLayout(fIsCurrentLayoutFlat);
		fDecoratingLabelProvider = new StyledDecoratingModelLabelProvider(
				fLabelProvider, false, fIsCurrentLayoutFlat);
		fViewer.setLabelProvider(fDecoratingLabelProvider);
		// problem decoration provided by PackageLabelProvider




import org.eclipse.dltk.ui.ScriptElementLabels;
import org.eclipse.dltk.ui.actions.MemberFilterActionGroup;
import org.eclipse.dltk.ui.actions.OpenAction;
import org.eclipse.dltk.ui.viewsupport.DecoratingModelLabelProvider;
import org.eclipse.dltk.ui.viewsupport.ProblemTableViewer;
import org.eclipse.dltk.ui.viewsupport.StyledDecoratingModelLabelProvider;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;

		
		fLabelProvider= new MethodsLabelProvider(lifeCycle, this, store);
	
		setLabelProvider(new StyledDecoratingModelLabelProvider(fLabelProvider,
				true));
		setContentProvider(new MethodsContentProvider(lifeCycle));
		
		HierarchyViewerSorter sorter= new HierarchyViewerSorter(lifeCycle);




import org.eclipse.dltk.core.IMember;
import org.eclipse.dltk.core.IType;
import org.eclipse.dltk.ui.ScriptElementLabels;
import org.eclipse.dltk.ui.viewsupport.DecoratingModelLabelProvider;
import org.eclipse.dltk.ui.viewsupport.ProblemTreeViewer;
import org.eclipse.dltk.ui.viewsupport.StyledDecoratingModelLabelProvider;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;


		fLabelProvider = new HierarchyLabelProvider(lifeCycle, store);

		setLabelProvider(new StyledDecoratingModelLabelProvider(fLabelProvider,
				true));
		setUseHashlookup(true);

		setContentProvider(contentProvider);

Lines 42-48 Link Here

(-)a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/newsourcepage/DialogPackageExplorer.java (-2 / +2 lines)
42	import org.eclipse.dltk.ui.ScriptElementImageProvider;	42	import org.eclipse.dltk.ui.ScriptElementImageProvider;
43	import org.eclipse.dltk.ui.ScriptElementLabels;	43	import org.eclipse.dltk.ui.ScriptElementLabels;
44	import org.eclipse.dltk.ui.viewsupport.AppearanceAwareLabelProvider;	44	import org.eclipse.dltk.ui.viewsupport.AppearanceAwareLabelProvider;
45	import org.eclipse.dltk.ui.viewsupport.DecoratingModelLabelProvider;	45	import org.eclipse.dltk.ui.viewsupport.StyledDecoratingModelLabelProvider;
46	import org.eclipse.jface.action.IMenuListener;	46	import org.eclipse.jface.action.IMenuListener;
47	import org.eclipse.jface.action.IMenuManager;	47	import org.eclipse.jface.action.IMenuManager;
48	import org.eclipse.jface.action.MenuManager;	48	import org.eclipse.jface.action.MenuManager;
Lines 392-398 Link Here
392	\| ScriptElementImageProvider.SMALL_ICONS,	392	\| ScriptElementImageProvider.SMALL_ICONS,
393	getPreferenceStore());	393	getPreferenceStore());
394	fPackageViewer.setContentProvider(contentProvider);	394	fPackageViewer.setContentProvider(contentProvider);
395	fPackageViewer.setLabelProvider(new DecoratingModelLabelProvider(	395	fPackageViewer.setLabelProvider(new StyledDecoratingModelLabelProvider(
396	labelProvider, false));	396	labelProvider, false));
397	}	397	}
398		398




import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.core.IScriptProject;
import org.eclipse.dltk.core.IModelElement;
import org.eclipse.dltk.core.IProjectFragment;
import org.eclipse.dltk.core.IScriptFolder;
import org.eclipse.dltk.core.IScriptModel;
import org.eclipse.dltk.core.IScriptProject;
import org.eclipse.dltk.core.ModelException;
import org.eclipse.dltk.internal.ui.actions.SelectionConverter;
import org.eclipse.dltk.internal.ui.util.SWTUtil;

import org.eclipse.dltk.ui.ScriptElementImageProvider;
import org.eclipse.dltk.ui.ScriptElementLabels;
import org.eclipse.dltk.ui.viewsupport.AppearanceAwareLabelProvider;
import org.eclipse.dltk.ui.viewsupport.StyledDecoratingModelLabelProvider;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTreeViewer;

				DLTKUIPlugin.getDefault().getPreferenceStore()
			);
		
		fTree.setLabelProvider(new StyledDecoratingModelLabelProvider(
				fScriptElementLabelProvider));
		fTree.setSorter(new ModelElementSorter());
		if (DLTKCore.DEBUG) {
			System.err.println("Add empty inner package filter support here..."); //$NON-NLS-1$




import org.eclipse.dltk.ui.viewsupport.ProblemTableViewer;
import org.eclipse.dltk.ui.viewsupport.ScriptUILabelProvider;
import org.eclipse.dltk.ui.viewsupport.StatusBarUpdater;
import org.eclipse.dltk.ui.viewsupport.StyledDecoratingModelLabelProvider;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;

		initDragAndDrop();

		fLabelProvider = createLabelProvider();
		fViewer.setLabelProvider(createDelegatingLabelProvider(fLabelProvider));

		fViewer.setComparator(createModelElementComparator());
		fViewer.setUseHashlookup(true);

		};
	}

	/**
	 * @since 5.1
	 */
	protected ILabelProvider createDelegatingLabelProvider(
			ScriptUILabelProvider provider) {
		DecoratingModelLabelProvider labelprovider = createDecoratingLabelProvider(provider);
		if (labelprovider != null)
			return labelprovider;
		return new StyledDecoratingModelLabelProvider(provider);
	}

	/**
	 * @deprecated override
	 *             org.eclipse.dltk.ui.browsing.ScriptBrowsingPart.createLabelProvider
	 *             (ScriptUILabelProvider) instead
	 */
	protected DecoratingModelLabelProvider createDecoratingLabelProvider(
			ScriptUILabelProvider provider) {
		// XXX: Work in progress for problem decorator being a workbench
		// decorator//
		// return new ExcludingDecoratingLabelProvider(provider, decorationMgr,
		// "org.eclipse.jdt.ui.problem.decorator"); //$NON-NLS-1$
		return null;
	}

	protected ModelElementSorter createModelElementComparator() {

Return to bug 413346

Lines 60-65 Link Here

(-)a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ScriptBrowsingPart.java (-2 / +19 lines)
60	import org.eclipse.dltk.ui.viewsupport.ProblemTableViewer;	60	import org.eclipse.dltk.ui.viewsupport.ProblemTableViewer;
61	import org.eclipse.dltk.ui.viewsupport.ScriptUILabelProvider;	61	import org.eclipse.dltk.ui.viewsupport.ScriptUILabelProvider;
62	import org.eclipse.dltk.ui.viewsupport.StatusBarUpdater;	62	import org.eclipse.dltk.ui.viewsupport.StatusBarUpdater;
		63	import org.eclipse.dltk.ui.viewsupport.StyledDecoratingModelLabelProvider;
63	import org.eclipse.jface.action.IAction;	64	import org.eclipse.jface.action.IAction;
64	import org.eclipse.jface.action.IMenuListener;	65	import org.eclipse.jface.action.IMenuListener;
65	import org.eclipse.jface.action.IMenuManager;	66	import org.eclipse.jface.action.IMenuManager;
Lines 335-341 Link Here
335	initDragAndDrop();	336	initDragAndDrop();
336		337
337	fLabelProvider = createLabelProvider();	338	fLabelProvider = createLabelProvider();
338	fViewer.setLabelProvider(createDecoratingLabelProvider(fLabelProvider));	339	fViewer.setLabelProvider(createDelegatingLabelProvider(fLabelProvider));
339		340
340	fViewer.setComparator(createModelElementComparator());	341	fViewer.setComparator(createModelElementComparator());
341	fViewer.setUseHashlookup(true);	342	fViewer.setUseHashlookup(true);
Lines 418-430 Link Here
418	};	419	};
419	}	420	}
420		421
		422	/**
		423	* @since 5.1
		424	*/
		425	protected ILabelProvider createDelegatingLabelProvider(
		426	ScriptUILabelProvider provider) {
		427	DecoratingModelLabelProvider labelprovider = createDecoratingLabelProvider(provider);
		428	if (labelprovider != null)
		429	return labelprovider;
		430	return new StyledDecoratingModelLabelProvider(provider);
		431	}
		432
		433	/**
		434	* @deprecated override
		435	* org.eclipse.dltk.ui.browsing.ScriptBrowsingPart.createLabelProvider
		436	* (ScriptUILabelProvider) instead
		437	*/
421	protected DecoratingModelLabelProvider createDecoratingLabelProvider(	438	protected DecoratingModelLabelProvider createDecoratingLabelProvider(
422	ScriptUILabelProvider provider) {	439	ScriptUILabelProvider provider) {
423	// XXX: Work in progress for problem decorator being a workbench	440	// XXX: Work in progress for problem decorator being a workbench
424	// decorator//	441	// decorator//
425	// return new ExcludingDecoratingLabelProvider(provider, decorationMgr,	442	// return new ExcludingDecoratingLabelProvider(provider, decorationMgr,
426	// "org.eclipse.jdt.ui.problem.decorator"); //$NON-NLS-1$	443	// "org.eclipse.jdt.ui.problem.decorator"); //$NON-NLS-1$
427	return new DecoratingModelLabelProvider(provider);	444	return null;
428	}	445	}
429		446
430	protected ModelElementSorter createModelElementComparator() {	447	protected ModelElementSorter createModelElementComparator() {

Lines 13-20 Link Here

(-)a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/TypeHierarchyViewer.java (-2 / +3 lines)
13	import org.eclipse.dltk.core.IMember;	13	import org.eclipse.dltk.core.IMember;
14	import org.eclipse.dltk.core.IType;	14	import org.eclipse.dltk.core.IType;
15	import org.eclipse.dltk.ui.ScriptElementLabels;	15	import org.eclipse.dltk.ui.ScriptElementLabels;
16	import org.eclipse.dltk.ui.viewsupport.DecoratingModelLabelProvider;
17	import org.eclipse.dltk.ui.viewsupport.ProblemTreeViewer;	16	import org.eclipse.dltk.ui.viewsupport.ProblemTreeViewer;
		17	import org.eclipse.dltk.ui.viewsupport.StyledDecoratingModelLabelProvider;
18	import org.eclipse.jface.action.IMenuListener;	18	import org.eclipse.jface.action.IMenuListener;
19	import org.eclipse.jface.action.IMenuManager;	19	import org.eclipse.jface.action.IMenuManager;
20	import org.eclipse.jface.action.MenuManager;	20	import org.eclipse.jface.action.MenuManager;
Lines 42-48 Link Here
42		42
43	fLabelProvider = new HierarchyLabelProvider(lifeCycle, store);	43	fLabelProvider = new HierarchyLabelProvider(lifeCycle, store);
44		44
45	setLabelProvider(new DecoratingModelLabelProvider(fLabelProvider, true));	45	setLabelProvider(new StyledDecoratingModelLabelProvider(fLabelProvider,
		46	true));
46	setUseHashlookup(true);	47	setUseHashlookup(true);
47		48
48	setContentProvider(contentProvider);	49	setContentProvider(contentProvider);

Lines 19-29 Link Here

(-)a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/workingsets/ScriptWorkingSetPage.java (-3 / +4 lines)
19	import org.eclipse.core.runtime.Assert;	19	import org.eclipse.core.runtime.Assert;
20	import org.eclipse.core.runtime.IAdaptable;	20	import org.eclipse.core.runtime.IAdaptable;
21	import org.eclipse.dltk.core.DLTKCore;	21	import org.eclipse.dltk.core.DLTKCore;
22	import org.eclipse.dltk.core.IScriptProject;
23	import org.eclipse.dltk.core.IModelElement;	22	import org.eclipse.dltk.core.IModelElement;
24	import org.eclipse.dltk.core.IProjectFragment;	23	import org.eclipse.dltk.core.IProjectFragment;
25	import org.eclipse.dltk.core.IScriptFolder;	24	import org.eclipse.dltk.core.IScriptFolder;
26	import org.eclipse.dltk.core.IScriptModel;	25	import org.eclipse.dltk.core.IScriptModel;
		26	import org.eclipse.dltk.core.IScriptProject;
27	import org.eclipse.dltk.core.ModelException;	27	import org.eclipse.dltk.core.ModelException;
28	import org.eclipse.dltk.internal.ui.actions.SelectionConverter;	28	import org.eclipse.dltk.internal.ui.actions.SelectionConverter;
29	import org.eclipse.dltk.internal.ui.util.SWTUtil;	29	import org.eclipse.dltk.internal.ui.util.SWTUtil;
Lines 33-39 Link Here
33	import org.eclipse.dltk.ui.ScriptElementImageProvider;	33	import org.eclipse.dltk.ui.ScriptElementImageProvider;
34	import org.eclipse.dltk.ui.ScriptElementLabels;	34	import org.eclipse.dltk.ui.ScriptElementLabels;
35	import org.eclipse.dltk.ui.viewsupport.AppearanceAwareLabelProvider;	35	import org.eclipse.dltk.ui.viewsupport.AppearanceAwareLabelProvider;
36	import org.eclipse.dltk.ui.viewsupport.DecoratingModelLabelProvider;	36	import org.eclipse.dltk.ui.viewsupport.StyledDecoratingModelLabelProvider;
37	import org.eclipse.jface.dialogs.Dialog;	37	import org.eclipse.jface.dialogs.Dialog;
38	import org.eclipse.jface.viewers.CheckStateChangedEvent;	38	import org.eclipse.jface.viewers.CheckStateChangedEvent;
39	import org.eclipse.jface.viewers.CheckboxTreeViewer;	39	import org.eclipse.jface.viewers.CheckboxTreeViewer;
Lines 140-146 Link Here
140	DLTKUIPlugin.getDefault().getPreferenceStore()	140	DLTKUIPlugin.getDefault().getPreferenceStore()
141	);	141	);
142		142
143	fTree.setLabelProvider(new DecoratingModelLabelProvider(fScriptElementLabelProvider));	143	fTree.setLabelProvider(new StyledDecoratingModelLabelProvider(
		144	fScriptElementLabelProvider));
144	fTree.setSorter(new ModelElementSorter());	145	fTree.setSorter(new ModelElementSorter());
145	if (DLTKCore.DEBUG) {	146	if (DLTKCore.DEBUG) {
146	System.err.println("Add empty inner package filter support here..."); //$NON-NLS-1$	147	System.err.println("Add empty inner package filter support here..."); //$NON-NLS-1$