Adapted to new getDecoratorManager() API (bug 11748)
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
index 9efabc7..2e6b32a 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchResultViewer.java
@@ -34,6 +34,7 @@
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.ui.IMemento;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.search.ui.IContextMenuConstants;
import org.eclipse.search.ui.IContextMenuContributor;
@@ -80,7 +81,7 @@
setUseHashlookup(true);
setContentProvider(new SearchResultContentProvider());
- setLabelProvider(new SearchResultLabelProvider(new FileLabelProvider(FileLabelProvider.SHOW_LABEL), fOuterPart.getSite().getDecoratorManager()));
+ setLabelProvider(new SearchResultLabelProvider(new FileLabelProvider(FileLabelProvider.SHOW_LABEL), PlatformUI.getWorkbench().getDecoratorManager()));
boolean hasSearch= SearchManager.getDefault().getCurrentSearch() != null;
@@ -306,7 +307,7 @@
}
void internalSetLabelProvider(ILabelProvider provider) {
- setLabelProvider(new SearchResultLabelProvider(provider, fOuterPart.getSite().getDecoratorManager()));
+ setLabelProvider(new SearchResultLabelProvider(provider, PlatformUI.getWorkbench().getDecoratorManager()));
}
/**
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
index 75a21c4..5dbe8ed 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/util/FileLabelProvider.java
@@ -14,15 +14,12 @@
import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.search.ui.ISearchResultViewEntry;
import org.eclipse.search.internal.ui.SearchMessages;
-import org.eclipse.search.internal.ui.SearchPlugin;
public class FileLabelProvider extends DecoratingLabelProvider {
@@ -95,20 +92,7 @@
return super.getImage(((ISearchResultViewEntry) element).getResource());
}
- private static IWorkbenchPartSite getSite() {
- IWorkbenchPage page= SearchPlugin.getActivePage();
- if (page != null) {
- IWorkbenchPart part= page.getActivePart();
- if (part != null)
- return part.getSite();
- }
- return null;
- }
-
private static ILabelDecorator getDecoratorManager() {
- if (getSite() != null)
- return getSite().getDecoratorManager();
- else
- return null;
+ return PlatformUI.getWorkbench().getDecoratorManager();
}
}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetDialog.java b/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetDialog.java
index d37c47e..cae6330 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetDialog.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/workingsets/WorkingSetDialog.java
@@ -31,8 +31,7 @@
import org.eclipse.jface.viewers.ITreeViewerListener;
import org.eclipse.jface.viewers.TreeExpansionEvent;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.model.WorkbenchViewerSorter;
@@ -150,17 +149,8 @@
}
private ILabelProvider createLabelProvider() {
- ILabelDecorator decorationMgr= null;
- IWorkbenchPage page= SearchPlugin.getActivePage();
- if (page != null) {
- IWorkbenchPart part= page.getActivePart();
- if (part != null)
- decorationMgr= part.getSite().getDecoratorManager();
- }
- ILabelProvider labelProvider= new WorkbenchLabelProvider();
- if (decorationMgr != null);
- labelProvider= new DecoratingLabelProvider(labelProvider, decorationMgr);
- return labelProvider;
+ ILabelDecorator decorationMgr= PlatformUI.getWorkbench().getDecoratorManager();
+ return new DecoratingLabelProvider(new WorkbenchLabelProvider(), decorationMgr);
}
private void disableClosedProjects() {
