Skip to content

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

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

Merged
vogella merged 2 commits into from
Apr 15, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5724095
Allow Eclipse 4 contributions to select svg files via the find dialog
vogella Apr 15, 2025
4dab277
Version bump(s) for 4.36 stream
eclipse-pde-bot Apr 15, 2025
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
2 changes: 1 addition & 1 deletion e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
Bundle-Version: 4.8.600.qualifier
Bundle-Version: 4.8.700.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
2 changes: 1 addition & 1 deletion e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
<version>4.8.600-SNAPSHOT</version>
<version>4.8.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<properties>
Expand Down
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
2 changes: 1 addition & 1 deletion features/org.eclipse.e4.core.tools.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.e4.core.tools.feature"
label="%featureName"
version="4.30.400.qualifier"
version="4.30.500.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
Loading