From 5724095814eaaf214f0215ebcc12461ade688d4c Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Tue, 15 Apr 2025 17:32:33 +0200 Subject: [PATCH 1/2] Allow Eclipse 4 contributions to select svg files via the find dialog With the svg support in SWT we should also allow the selection of svg files for Eclipse 4 application model elements. Fixes #https://github.com/eclipse-platform/eclipse.platform.ui/issues/2911 --- .../dialogs/AbstractIconDialogWithScopeAndFilter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java index 9fa56f548c2..3f5208cab39 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java +++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialogWithScopeAndFilter.java @@ -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; @@ -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; @@ -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())) { From 4dab2776cda32458b04818ae12aaf68ebdf38e3c Mon Sep 17 00:00:00 2001 From: Eclipse PDE Bot Date: Tue, 15 Apr 2025 17:18:15 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.36 stream --- .../bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF | 2 +- e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml | 2 +- features/org.eclipse.e4.core.tools.feature/feature.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF index a476ca2a244..0bf31b355b9 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF +++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF @@ -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 diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml index 02dd8c45117..8b19e9c842c 100644 --- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml +++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml @@ -21,7 +21,7 @@ org.eclipse.platform org.eclipse.e4.tools.emf.ui - 4.8.600-SNAPSHOT + 4.8.700-SNAPSHOT eclipse-plugin diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml index fe474fda39e..0c8735ca5b0 100644 --- a/features/org.eclipse.e4.core.tools.feature/feature.xml +++ b/features/org.eclipse.e4.core.tools.feature/feature.xml @@ -2,7 +2,7 @@