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/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())) { 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 @@