fix findIcon(path, ClassLoader)

GitOrigin-RevId: fd35f17f9ecb137afa677228244693abc35e74c0
This commit is contained in:
Vladimir Krivosheev
2020-10-10 16:22:13 +02:00
committed by intellij-monorepo-bot
parent 2efd1b4175
commit ffc64b112b
5 changed files with 189 additions and 122 deletions

View File

@@ -32,12 +32,14 @@ public final class PropertyGroup implements Group, ColoredItemPresentation, Acce
private SmartPsiElementPointer<?> myGetterPointer;
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");
private final Project myProject;
private final Collection<TreeElement> myChildren = new ArrayList<>();
@@ -202,7 +204,7 @@ public final class PropertyGroup implements Group, ColoredItemPresentation, Acce
}
private static Icon loadIcon(@NonNls String resourceName) {
Icon icon = IconLoader.findIcon(resourceName);
Icon icon = IconLoader.findIcon(resourceName, PropertyGroup.class, PropertyGroup.class.getClassLoader(), null, true);
Application application = ApplicationManager.getApplication();
if (icon == null && application != null && application.isUnitTestMode()) {
return new ImageIcon();