From 60205fe481a1bf25d00d8252bc5cb8cc40f902fa Mon Sep 17 00:00:00 2001 From: Eirik Bakke Date: Wed, 26 Mar 2025 22:44:24 -0400 Subject: [PATCH] Fix missing distinction between abstract/concrete/interface Java file icon. (Regression when SVG icons were introduced.) --- .../java.source/src/org/netbeans/modules/java/JavaNode.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java/java.source/src/org/netbeans/modules/java/JavaNode.java b/java/java.source/src/org/netbeans/modules/java/JavaNode.java index 51089d2cceb3..96e74677be52 100644 --- a/java/java.source/src/org/netbeans/modules/java/JavaNode.java +++ b/java/java.source/src/org/netbeans/modules/java/JavaNode.java @@ -101,7 +101,9 @@ public final class JavaNode extends DataNode implements ChangeListener { private static final long serialVersionUID = -7396485743899766258L; private static final String JAVA_ICON_BASE = "org/netbeans/modules/java/resources/class.png"; // NOI18N + private static final String JAVA_ICON_BASE_SVG = "org/netbeans/modules/java/resources/class.svg"; // NOI18N private static final String CLASS_ICON_BASE = "org/netbeans/modules/java/resources/clazz.gif"; // NOI18N + private static final String CLASS_ICON_BASE_SVG = "org/netbeans/modules/java/resources/clazz.svg"; // NOI18N private static final String ABSTRACT_CLASS_ICON_BASE = "org/netbeans/modules/java/resources/abstract_class_file.png"; //NOI18N private static final String INTERFACE_ICON_BASE = "org/netbeans/modules/java/resources/interface_file.png"; //NOI18N private static final String ENUM_ICON_BASE = "org/netbeans/modules/java/resources/enum_file.png"; //NOI18N @@ -566,7 +568,9 @@ private Image prefferImage(Image computed, Image parent, int type) { final Object attrValue = parent.getProperty("url", null); //NOI18N if (attrValue instanceof URL) { final String url = attrValue.toString(); - if (!(isJavaSource ? url.endsWith(JAVA_ICON_BASE) : url.endsWith(CLASS_ICON_BASE))) { + if (!(url.endsWith(isJavaSource ? JAVA_ICON_BASE : CLASS_ICON_BASE) || + url.endsWith(isJavaSource ? JAVA_ICON_BASE_SVG : CLASS_ICON_BASE_SVG))) + { return parent; } }