From 44b7685b4f041e9f841824dee5c153b42d4e14db Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Sat, 5 Mar 2022 11:36:26 +0300 Subject: [PATCH] Do not use PNG icons for properties GitOrigin-RevId: a40373242e8775642356def707d3c2afe149a10d --- .../impl/java/PropertyGroup.java | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java index b1d34f7223e0..3f6d0a0cdd4f 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java @@ -1,22 +1,19 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.structureView.impl.java; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.treeView.WeighedItem; import com.intellij.ide.util.treeView.smartTree.Group; import com.intellij.ide.util.treeView.smartTree.TreeElement; import com.intellij.navigation.ColoredItemPresentation; import com.intellij.navigation.ItemPresentation; -import com.intellij.openapi.application.Application; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.colors.CodeInsightColors; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.*; import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiUtil; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -33,12 +30,12 @@ public final class PropertyGroup implements Group, ColoredItemPresentation, Acce private SmartPsiElementPointer mySetterPointer; private boolean myIsStatic; - public static final Icon PROPERTY_READ_ICON = loadIcon("/nodes/propertyRead.png"); - public static final Icon PROPERTY_READ_STATIC_ICON = loadIcon("/nodes/propertyReadStatic.png"); - public static final Icon PROPERTY_WRITE_ICON = loadIcon("/nodes/propertyWrite.png"); - public static final Icon PROPERTY_WRITE_STATIC_ICON = loadIcon("/nodes/propertyWriteStatic.png"); - public static final Icon PROPERTY_READ_WRITE_ICON = loadIcon("/nodes/propertyReadWrite.png"); - public static final Icon PROPERTY_READ_WRITE_STATIC_ICON = loadIcon("/nodes/propertyReadWriteStatic.png"); + public static final Icon PROPERTY_READ_ICON = AllIcons.Nodes.PropertyRead; + public static final Icon PROPERTY_READ_STATIC_ICON = AllIcons.Nodes.PropertyReadStatic; + public static final Icon PROPERTY_WRITE_ICON = AllIcons.Nodes.PropertyWrite; + public static final Icon PROPERTY_WRITE_STATIC_ICON = AllIcons.Nodes.PropertyWriteStatic; + public static final Icon PROPERTY_READ_WRITE_ICON = AllIcons.Nodes.PropertyReadWrite; + public static final Icon PROPERTY_READ_WRITE_STATIC_ICON = AllIcons.Nodes.PropertyReadWriteStatic; private final Project myProject; private final Collection myChildren = new ArrayList<>(); @@ -198,15 +195,6 @@ public final class PropertyGroup implements Group, ColoredItemPresentation, Acce myChildren.addAll(group.myChildren); } - private static Icon loadIcon(@NonNls String resourceName) { - Icon icon = IconLoader.findIcon(resourceName, PropertyGroup.class.getClassLoader()); - Application application = ApplicationManager.getApplication(); - if (icon == null && application != null && application.isUnitTestMode()) { - return new ImageIcon(); - } - return icon; - } - @Override public TextAttributesKey getTextAttributesKey() { return isDeprecated() ? CodeInsightColors.DEPRECATED_ATTRIBUTES : null;