Fix NPE in FilteredCheckboxTree
Eclipse has a hidden preference for not showing the filter text
widget: IWorkbenchPreferenceConstants.SHOW_FILTERED_TEXTS. There
is no UI to set this preference, but if set to false, a FilteredTree
has no filter text widget, and getFilterString() returns null.
Explicitly check for null in FilteredCheckboxTree.
Bug: 567166
Change-Id: If05750a8efaf171735d85342069ae0ae39aa8f0e
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/FilteredCheckboxTree.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/FilteredCheckboxTree.java
index 29795bf..9daf96d 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/FilteredCheckboxTree.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/FilteredCheckboxTree.java
@@ -126,11 +126,12 @@
@Override
protected String getFilterString() {
String filterString = super.getFilterString();
- if (!filterText.getText().equals(initialText)
- && filterString.indexOf("*") != 0 //$NON-NLS-1$
- && filterString.indexOf("?") != 0 //$NON-NLS-1$
- && filterString.indexOf(".") != 0) {//$NON-NLS-1$
- filterString = "*" + filterString; //$NON-NLS-1$
+ if (filterString != null
+ && !filterString.equals(initialText)
+ && filterString.indexOf('*') != 0
+ && filterString.indexOf('?') != 0
+ && filterString.indexOf('.') != 0) {
+ filterString = '*' + filterString;
}
return filterString;
}
