From 04d8854fb69e70e14c5f6551c5ac09dbb118d74a Mon Sep 17 00:00:00 2001 From: UNV Date: Fri, 20 Feb 2026 22:14:05 +0300 Subject: [PATCH 1/2] Eliminating usage of PlatformIcons. --- .../PsiViewerCodeFragmentExtension.java | 23 +++++++++++-------- .../psiView/PsiViewerExpressionExtension.java | 23 +++++++++++-------- .../psiView/PsiViewerMethodExtension.java | 23 +++++++++++-------- 3 files changed, 39 insertions(+), 30 deletions(-) diff --git a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java index 16fe57bcea..3accda9931 100644 --- a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java +++ b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java @@ -16,8 +16,8 @@ package com.intellij.java.impl.internal.psiView; import consulo.annotation.component.ExtensionImpl; -import consulo.ide.impl.idea.util.PlatformIcons; import consulo.language.psi.PsiElement; +import consulo.platform.base.icon.PlatformIconGroup; import consulo.project.Project; import javax.swing.*; @@ -28,15 +28,18 @@ */ @ExtensionImpl public class PsiViewerCodeFragmentExtension extends JavaPsiViewerExtension { - public String getName() { - return "Java Code Block"; - } + @Override + public String getName() { + return "Java Code Block"; + } - public Icon getIcon() { - return PlatformIcons.CLASS_INITIALIZER; - } + @Override + public Icon getIcon() { + return (Icon) PlatformIconGroup.nodesClassinitializer(); + } - public PsiElement createElement(Project project, String text) { - return getFactory(project).createCodeBlockFromText(text, null); - } + @Override + public PsiElement createElement(Project project, String text) { + return getFactory(project).createCodeBlockFromText(text, null); + } } diff --git a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java index db8befa5d1..b767c7c240 100644 --- a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java +++ b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java @@ -16,8 +16,8 @@ package com.intellij.java.impl.internal.psiView; import consulo.annotation.component.ExtensionImpl; -import consulo.ide.impl.idea.util.PlatformIcons; import consulo.language.psi.PsiElement; +import consulo.platform.base.icon.PlatformIconGroup; import consulo.project.Project; import javax.swing.*; @@ -28,15 +28,18 @@ */ @ExtensionImpl public class PsiViewerExpressionExtension extends JavaPsiViewerExtension { - public String getName() { - return "Java Expression"; - } + @Override + public String getName() { + return "Java Expression"; + } - public Icon getIcon() { - return PlatformIcons.CLASS_INITIALIZER; - } + @Override + public Icon getIcon() { + return (Icon) PlatformIconGroup.nodesClassinitializer(); + } - public PsiElement createElement(Project project, String text) { - return getFactory(project).createExpressionFromText(text, null); - } + @Override + public PsiElement createElement(Project project, String text) { + return getFactory(project).createExpressionFromText(text, null); + } } diff --git a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java index 986e0b5507..4677e43b58 100644 --- a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java +++ b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java @@ -16,8 +16,8 @@ package com.intellij.java.impl.internal.psiView; import consulo.annotation.component.ExtensionImpl; -import consulo.ide.impl.idea.util.PlatformIcons; import consulo.language.psi.PsiElement; +import consulo.platform.base.icon.PlatformIconGroup; import consulo.project.Project; import javax.swing.*; @@ -28,15 +28,18 @@ */ @ExtensionImpl public class PsiViewerMethodExtension extends JavaPsiViewerExtension { - public String getName() { - return "Java Method"; - } + @Override + public String getName() { + return "Java Method"; + } - public Icon getIcon() { - return PlatformIcons.METHOD_ICON; - } + @Override + public Icon getIcon() { + return (Icon) PlatformIconGroup.nodesMethod(); + } - public PsiElement createElement(Project project, String text) { - return getFactory(project).createMethodFromText(text, null); - } + @Override + public PsiElement createElement(Project project, String text) { + return getFactory(project).createMethodFromText(text, null); + } } From 581cb565125b38e3f2740bc73e02f4b925612397 Mon Sep 17 00:00:00 2001 From: UNV Date: Fri, 20 Feb 2026 22:17:06 +0300 Subject: [PATCH 2/2] Using TargetAWT.to() instead of cast to java.swing.Icon. --- .../impl/internal/psiView/PsiViewerCodeFragmentExtension.java | 3 ++- .../impl/internal/psiView/PsiViewerExpressionExtension.java | 3 ++- .../java/impl/internal/psiView/PsiViewerMethodExtension.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java index 3accda9931..bf19533034 100644 --- a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java +++ b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerCodeFragmentExtension.java @@ -19,6 +19,7 @@ import consulo.language.psi.PsiElement; import consulo.platform.base.icon.PlatformIconGroup; import consulo.project.Project; +import consulo.ui.ex.awtUnsafe.TargetAWT; import javax.swing.*; @@ -35,7 +36,7 @@ public String getName() { @Override public Icon getIcon() { - return (Icon) PlatformIconGroup.nodesClassinitializer(); + return TargetAWT.to(PlatformIconGroup.nodesClassinitializer()); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java index b767c7c240..c5fe781072 100644 --- a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java +++ b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerExpressionExtension.java @@ -19,6 +19,7 @@ import consulo.language.psi.PsiElement; import consulo.platform.base.icon.PlatformIconGroup; import consulo.project.Project; +import consulo.ui.ex.awtUnsafe.TargetAWT; import javax.swing.*; @@ -35,7 +36,7 @@ public String getName() { @Override public Icon getIcon() { - return (Icon) PlatformIconGroup.nodesClassinitializer(); + return TargetAWT.to(PlatformIconGroup.nodesClassinitializer()); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java index 4677e43b58..45e75cad91 100644 --- a/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java +++ b/plugin/src/main/java/com/intellij/java/impl/internal/psiView/PsiViewerMethodExtension.java @@ -19,6 +19,7 @@ import consulo.language.psi.PsiElement; import consulo.platform.base.icon.PlatformIconGroup; import consulo.project.Project; +import consulo.ui.ex.awtUnsafe.TargetAWT; import javax.swing.*; @@ -35,7 +36,7 @@ public String getName() { @Override public Icon getIcon() { - return (Icon) PlatformIconGroup.nodesMethod(); + return TargetAWT.to(PlatformIconGroup.nodesMethod()); } @Override