aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2014-12-01 10:45:21 -0500
committerMarkus Keller2014-12-01 10:46:39 -0500
commite84a83ce4d5d18e5b983b94fb2abb17a8d538b4d (patch)
treecac5f00cb2f44709159a41aa19e90ac5d907326f
parent1d6cd03072820fd568429c435123b8b164f0715d (diff)
downloadeclipse.platform.ui-e84a83ce4d5d18e5b983b94fb2abb17a8d538b4d.tar.gz
eclipse.platform.ui-e84a83ce4d5d18e5b983b94fb2abb17a8d538b4d.tar.xz
eclipse.platform.ui-e84a83ce4d5d18e5b983b94fb2abb17a8d538b4d.zip
Revert "Bug 452350 - Itemsfilter should generally perform implicit prefix matching"I20141207-2000I20141202-0800
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java14
1 files changed, 4 insertions, 10 deletions
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 904fa59cb2..d7e3030b2e 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 @@ public abstract class FilteredItemsSelectionDialog extends
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);
}