diff options
| author | Dani Megert | 2001-09-18 14:22:50 +0000 |
|---|---|---|
| committer | Dani Megert | 2001-09-18 14:22:50 +0000 |
| commit | ad33db09788f01eecd809b9c4a68caa24f51c268 (patch) | |
| tree | 59430ce25294950f3f8103c52173d0f9833940eb | |
| parent | 51a64dca79256c1cd423ccec8820f7e328714c4d (diff) | |
| download | eclipse.platform.text-ad33db09788f01eecd809b9c4a68caa24f51c268.tar.gz eclipse.platform.text-ad33db09788f01eecd809b9c4a68caa24f51c268.tar.xz eclipse.platform.text-ad33db09788f01eecd809b9c4a68caa24f51c268.zip | |
Changed javadoc and NPE protection
| -rw-r--r-- | org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcePathSorter.java | 15 | ||||
| -rw-r--r-- | org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcenameSorter.java | 13 |
2 files changed, 17 insertions, 11 deletions
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcePathSorter.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcePathSorter.java index 5c8f4cf76d2..2893a7e35cc 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcePathSorter.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcePathSorter.java @@ -9,11 +9,12 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.search.internal.ui.util.FileLabelProvider;
+import org.eclipse.search.ui.ISearchResultView;
import org.eclipse.search.ui.ISearchResultViewEntry;
import org.eclipse.search.ui.SearchUI;
/**
- * Sorts the search result viewer by the resource name.
+ * Sorts the search result viewer by the resource path.
*/
public class ResourcePathSorter extends ViewerSorter {
@@ -46,11 +47,13 @@ public class ResourcePathSorter extends ViewerSorter { * Overrides method from ViewerSorter
*/
public void sort(Viewer viewer, Object[] elements) {
- // Set label provider to show "path - resource"
- ILabelProvider labelProvider= SearchUI.getSearchResultView().getLabelProvider();
- if (labelProvider instanceof FileLabelProvider)
- ((FileLabelProvider)labelProvider).setOrder(FileLabelProvider.SHOW_PATH_LABEL);
-
+ // Set label provider to show "resource - path"
+ ISearchResultView view= SearchUI.getSearchResultView();
+ if (view != null) {
+ ILabelProvider labelProvider= view.getLabelProvider();
+ if (labelProvider instanceof FileLabelProvider)
+ ((FileLabelProvider)labelProvider).setOrder(FileLabelProvider.SHOW_PATH_LABEL);
+ }
super.sort(viewer, elements);
}
}
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcenameSorter.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcenameSorter.java index 52ac0934fb8..e6fec02c418 100644 --- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcenameSorter.java +++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ResourcenameSorter.java @@ -9,11 +9,12 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.search.internal.ui.util.FileLabelProvider;
+import org.eclipse.search.ui.ISearchResultView;
import org.eclipse.search.ui.ISearchResultViewEntry;
import org.eclipse.search.ui.SearchUI;
/**
- * Sorts the search result viewer by the resource path.
+ * Sorts the search result viewer by the resource name.
*/
public class ResourcenameSorter extends ViewerSorter {
@@ -47,10 +48,12 @@ public class ResourcenameSorter extends ViewerSorter { */
public void sort(Viewer viewer, Object[] elements) {
// Set label provider to show "resource - path"
- ILabelProvider labelProvider= SearchUI.getSearchResultView().getLabelProvider();
- if (labelProvider instanceof FileLabelProvider)
- ((FileLabelProvider)labelProvider).setOrder(FileLabelProvider.SHOW_LABEL_PATH);
-
+ ISearchResultView view= SearchUI.getSearchResultView();
+ if (view != null) {
+ ILabelProvider labelProvider= view.getLabelProvider();
+ if (labelProvider instanceof FileLabelProvider)
+ ((FileLabelProvider)labelProvider).setOrder(FileLabelProvider.SHOW_LABEL_PATH);
+ }
super.sort(viewer, elements);
}
}
\ No newline at end of file |