Attachment 233626 Details for Bug 413346 – a additional patch

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

[patch] a additional patch

replace-DecoratingModelLabelProvider-by-StyledDecora.patch (text/plain), 9.92 KB, created by Simon Bernard

on 2013-07-19 12:55:21 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Bernard

Created: 2013-07-19 12:55:21 EDT

Size: 9.92 KB

patch

obsolete

>diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/scriptview/ScriptExplorerPart.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/scriptview/ScriptExplorerPart.java
>index 04b4027..e366637 100644
>--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/scriptview/ScriptExplorerPart.java
>+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/scriptview/ScriptExplorerPart.java
>@@ -59,11 +59,11 @@
> 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;
>@@ -174,7 +174,7 @@
> 	private WorkingSetModel fWorkingSetModel;
> 
> 	private ScriptExplorerLabelProvider fLabelProvider;
>-	private DecoratingModelLabelProvider fDecoratingLabelProvider;
>+	private StyledDecoratingModelLabelProvider fDecoratingLabelProvider;
> 	private ScriptExplorerContentProvider fContentProvider;
> 	private FilterUpdater fFilterUpdater;
> 
>@@ -746,7 +746,7 @@
> 
> 		fLabelProvider = createLabelProvider();
> 		fLabelProvider.setIsFlatLayout(fIsCurrentLayoutFlat);
>-		fDecoratingLabelProvider = new DecoratingModelLabelProvider(
>+		fDecoratingLabelProvider = new StyledDecoratingModelLabelProvider(
> 				fLabelProvider, false, fIsCurrentLayoutFlat);
> 		fViewer.setLabelProvider(fDecoratingLabelProvider);
> 		// problem decoration provided by PackageLabelProvider
>diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/MethodsViewer.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/MethodsViewer.java
>index da8d9a2..4223700 100644
>--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/MethodsViewer.java
>+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/MethodsViewer.java
>@@ -19,8 +19,8 @@
> 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;
>@@ -66,7 +66,8 @@
> 		
> 		fLabelProvider= new MethodsLabelProvider(lifeCycle, this, store);
> 	
>-		setLabelProvider(new DecoratingModelLabelProvider(fLabelProvider, true));
>+		setLabelProvider(new StyledDecoratingModelLabelProvider(fLabelProvider,
>+				true));
> 		setContentProvider(new MethodsContentProvider(lifeCycle));
> 		
> 		HierarchyViewerSorter sorter= new HierarchyViewerSorter(lifeCycle);
>diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/TypeHierarchyViewer.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/TypeHierarchyViewer.java
>index 38c052e..bff79d4 100644
>--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/TypeHierarchyViewer.java
>+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/typehierarchy/TypeHierarchyViewer.java
>@@ -13,8 +13,8 @@
> 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;
>@@ -42,7 +42,8 @@
> 
> 		fLabelProvider = new HierarchyLabelProvider(lifeCycle, store);
> 
>-		setLabelProvider(new DecoratingModelLabelProvider(fLabelProvider, true));
>+		setLabelProvider(new StyledDecoratingModelLabelProvider(fLabelProvider,
>+				true));
> 		setUseHashlookup(true);
> 
> 		setContentProvider(contentProvider);
>diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/newsourcepage/DialogPackageExplorer.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/newsourcepage/DialogPackageExplorer.java
>index 0a703c2..12ccbea 100644
>--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/newsourcepage/DialogPackageExplorer.java
>+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/wizards/buildpath/newsourcepage/DialogPackageExplorer.java
>@@ -42,7 +42,7 @@
> 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.DecoratingModelLabelProvider;
>+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;
>@@ -392,7 +392,7 @@
> 						| ScriptElementImageProvider.SMALL_ICONS,
> 				getPreferenceStore());
> 		fPackageViewer.setContentProvider(contentProvider);
>-		fPackageViewer.setLabelProvider(new DecoratingModelLabelProvider(
>+		fPackageViewer.setLabelProvider(new StyledDecoratingModelLabelProvider(
> 				labelProvider, false));
> 	}
> 
>diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/workingsets/ScriptWorkingSetPage.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/workingsets/ScriptWorkingSetPage.java
>index f513439..77ee2fd 100644
>--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/workingsets/ScriptWorkingSetPage.java
>+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/workingsets/ScriptWorkingSetPage.java
>@@ -19,11 +19,11 @@
> 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;
>@@ -33,7 +33,7 @@
> 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.DecoratingModelLabelProvider;
>+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;
>@@ -140,7 +140,8 @@
> 				DLTKUIPlugin.getDefault().getPreferenceStore()
> 			);
> 		
>-		fTree.setLabelProvider(new DecoratingModelLabelProvider(fScriptElementLabelProvider));
>+		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$
>diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ScriptBrowsingPart.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ScriptBrowsingPart.java
>index 1e2323e..8b732a7 100644
>--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ScriptBrowsingPart.java
>+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ScriptBrowsingPart.java
>@@ -60,6 +60,7 @@
> 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;
>@@ -335,7 +336,7 @@
> 		initDragAndDrop();
> 
> 		fLabelProvider = createLabelProvider();
>-		fViewer.setLabelProvider(createDecoratingLabelProvider(fLabelProvider));
>+		fViewer.setLabelProvider(createDelegatingLabelProvider(fLabelProvider));
> 
> 		fViewer.setComparator(createModelElementComparator());
> 		fViewer.setUseHashlookup(true);
>@@ -418,13 +419,29 @@
> 		};
> 	}
> 
>+	/**
>+	 * @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 new DecoratingModelLabelProvider(provider);
>+		return null;
> 	}
> 
> 	protected ModelElementSorter createModelElementComparator() {

Actions: View | Diff

Attachments on bug 413346: 233624 | 233626 | 233697 | 233698 | 233889 | 233890