Revert "Bug 452350 - Itemsfilter should generally perform implicit prefix matching"
This reverts commit 5edf2e07117327c1caa8faee30cecd534035caa7.
Change-Id: Iff3a03c49a88c6f21b902e2c0c4eef8fbd3ef479
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
index 904fa59..d7e3030 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java
@@ -13,7 +13,6 @@
* - Fix for bug 208602 - [Dialogs] Open Type dialog needs accessible labels
* Simon Muschel <smuschel@gmx.de> - bug 258493
* Lars Vogel <Lars.Vogel@gmail.com> - Bug 440810
- * Simon Scholz <simon.scholz@vogella.com> - Bug 452350
*******************************************************************************/
package org.eclipse.ui.dialogs;
@@ -2296,29 +2295,24 @@
protected SearchPattern patternMatcher;
/**
- * Creates new instance of ItemsFilter with implicit prefix matching.
+ * Creates new instance of ItemsFilter.
*/
public ItemsFilter() {
this(new SearchPattern());
}
/**
- * Creates new instance of ItemsFilter with implicit prefix matching.
- *
+ * Creates new instance of ItemsFilter.
+ *
* @param searchPattern
* the pattern to be used when filtering
*/
public ItemsFilter(SearchPattern searchPattern) {
patternMatcher = searchPattern;
String stringPattern = ""; //$NON-NLS-1$
- if (pattern != null) {
+ if (pattern != null && !pattern.getText().equals("*")) { //$NON-NLS-1$
stringPattern = pattern.getText();
}
-
- if (!stringPattern.startsWith("*") && !stringPattern.startsWith("?") && !stringPattern.startsWith(".")) {//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- stringPattern = "*" + stringPattern; //$NON-NLS-1$
- }
-
patternMatcher.setPattern(stringPattern);
}
