Skip to content

Allow Eclipse 4 contributions to select svg files via the find dialog #1720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vogella wants to merge 1 commit into from
Closed

Allow Eclipse 4 contributions to select svg files via the find dialog #1720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .../tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ private static class SearchThread extends TimerTask {
private final StringMatcher matcherGif;
private final StringMatcher matcherJpg;
private final StringMatcher matcherPng;
private final StringMatcher matcherSvg;
private final StringMatcher matcherBinFolder;
private final Filter filter;
private boolean includeNonBundles;
Expand All @@ -335,6 +336,7 @@ public SearchThread(IconMatchCallback callback, Filter filter) {
matcherGif = new StringMatcher("*" + filter.namePattern + "*.gif", true, false); //$NON-NLS-1$//$NON-NLS-2$
matcherJpg = new StringMatcher("*" + filter.namePattern + "*.jpg", true, false); //$NON-NLS-1$//$NON-NLS-2$
matcherPng = new StringMatcher("*" + filter.namePattern + "*.png", true, false); //$NON-NLS-1$//$NON-NLS-2$
matcherSvg = new StringMatcher("*" + filter.namePattern + "*.svg", true, false); //$NON-NLS-1$//$NON-NLS-2$
matcherBinFolder = new StringMatcher("bin/*", true, false); //$NON-NLS-1$
this.callback = callback;
this.filter = filter;
Expand Down Expand Up @@ -383,7 +385,8 @@ public void run() {
} else if (resource.getType() == IResource.FILE && !resource.isLinked()) {
final String path = resource.getProjectRelativePath().toString();
if (!matcherBinFolder.match(path)
&& (matcherGif.match(path) || matcherPng.match(path) || matcherJpg.match(path))) {
&& (matcherGif.match(path) || matcherPng.match(path)
|| matcherJpg.match(path) | matcherSvg.match(path))) {
if (E.notEmpty(filter.getPackages())) {
if (!filter.getPackages().contains(
resource.getProjectRelativePath().removeLastSegments(1).toOSString())) {
Expand Down
Loading