Skip to content

Commit 0539498

Browse files
jjohnstnmerks
authored andcommitted
Add new getPatternText() method to FilteredItemsSelectionDialog
- add new protected method to FilteredItemsSelectionDialog so that JDT UI can modify the output to add defaulted wildcards in camel case type names - bump up org.eclipse.ui.workbench to 3.136.0 - needed for eclipse-jdt/eclipse.jdt.ui#2387
1 parent c496bbc commit 0539498

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
5-
Bundle-Version: 3.135.200.qualifier
5+
Bundle-Version: 3.136.0.qualifier
66
Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin
77
Bundle-ActivationPolicy: lazy
88
Bundle-Vendor: %providerName

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/dialogs/FilteredItemsSelectionDialog.java

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2019 IBM Corporation and others.
2+
* Copyright (c) 2000, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -2148,11 +2148,12 @@ public ItemsFilter() {
21482148
*/
21492149
public ItemsFilter(SearchPattern searchPattern) {
21502150
patternMatcher = searchPattern;
2151-
String stringPattern = ""; //$NON-NLS-1$
2152-
if (pattern != null && !pattern.getText().equals("*")) { //$NON-NLS-1$
2153-
stringPattern = pattern.getText();
2151+
String stringPattern = getPatternText();
2152+
if (stringPattern != null && !stringPattern.equals("*")) { //$NON-NLS-1$
2153+
patternMatcher.setPattern(stringPattern);
2154+
} else {
2155+
patternMatcher.setPattern(""); //$NON-NLS-1$
21542156
}
2155-
patternMatcher.setPattern(stringPattern);
21562157
}
21572158

21582159
/**
@@ -2982,6 +2983,19 @@ public Control getPatternControl() {
29822983
return pattern;
29832984
}
29842985

2986+
/**
2987+
* Get the text from pattern control.
2988+
*
2989+
* @return text from pattern control or empty string if pattern control is null
2990+
* @since 3.136
2991+
*/
2992+
protected String getPatternText() {
2993+
if (pattern == null) {
2994+
return null;
2995+
}
2996+
return pattern.getText();
2997+
}
2998+
29852999
/**
29863000
* A <code>LabelProvider</code> for (the table of) types.
29873001
*/

0 commit comments

Comments
 (0)