Skip to content

Icon fix: Interface and Abstract class are not distinguished #8362

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
eirikbakke merged 1 commit into from
Mar 27, 2025
Merged

Icon fix: Interface and Abstract class are not distinguished #8362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion java/java.source/src/org/netbeans/modules/java/JavaNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
}
Expand Down
Loading