diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java index 3639f233e1a..1408908825c 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java @@ -25,6 +25,7 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.Set; import java.util.TreeSet; @@ -151,7 +152,7 @@ public class ExtensionsSection extends TreeSection implements IPropertyChangeLis "commandId", "property", "activityId", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ "attribute", "value"}; //$NON-NLS-1$ //$NON-NLS-2$ - private static final String[] VALID_IMAGE_TYPES = {"png", "bmp", "ico", "gif", "jpg", "tiff"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + private static final Set VALID_IMAGE_TYPES = Set.of("svg", "png", "bmp", "ico", "gif", "jpg", "tiff"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ private static final String MENU_NEW_ID = "NewMenu"; //$NON-NLS-1$ class ExtensionContentProvider implements ITreeContentProvider { @@ -975,15 +976,8 @@ static Image getCustomImage(IPluginElement element) { if (ext == null) { return null; } - boolean valid = false; - // ensure the resource is an image - for (String imageType : VALID_IMAGE_TYPES) { - if (ext.equalsIgnoreCase(imageType)) { - valid = true; - break; - } - } // if the resource is an image, get the image, otherwise return null + boolean valid = VALID_IMAGE_TYPES.contains(ext.toLowerCase(Locale.ROOT)); return valid ? getImageFromPlugin(element, iconPath) : null; } } diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/AboutSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/AboutSection.java index 455a5706f44..a386441e785 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/AboutSection.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/AboutSection.java @@ -147,6 +147,7 @@ private void handleBrowse() { FileExtensionsFilter filter = new FileExtensionsFilter(); filter.addFileExtension("gif"); //$NON-NLS-1$ filter.addFileExtension("png"); //$NON-NLS-1$ + filter.addFileExtension("svg"); //$NON-NLS-1$ dialog.addFilter(filter); dialog.setInput(PDEPlugin.getWorkspace().getRoot()); diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java index 979266840bc..43ddd4b6191 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java @@ -173,6 +173,7 @@ private void handleBrowse(FormEntry entry) { FileExtensionsFilter filter = new FileExtensionsFilter(); filter.addFileExtension("gif"); //$NON-NLS-1$ filter.addFileExtension("png"); //$NON-NLS-1$ + filter.addFileExtension("svg"); //$NON-NLS-1$ dialog.addFilter(filter); dialog.setInput(PDEPlugin.getWorkspace().getRoot());