From dfd169a1dcc09d949af2b4eb70469c19e58f2ecd Mon Sep 17 00:00:00 2001
From: Mikhail Pyltsin <Mikhail.Pyltsin@jetbrains.com>
Date: Thu, 30 Jan 2025 17:15:17 +0100
Subject: [PATCH] [java-import] IJ-CR-151305 IDEA-364508 support optimize
 imports

- small cleanup

(cherry picked from commit 1650941c66a06b740cee0eaa7c5053a3c5a01ebf)

GitOrigin-RevId: 9788f0d264e5b3d860ed1e1754887eba4f0f00f4
---
 .../psi/codeStyle/JavaPackageEntryTableAccessor.java         | 5 ++++-
 .../src/com/intellij/psi/codeStyle/PackageEntryTable.java    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/JavaPackageEntryTableAccessor.java b/java/java-impl/src/com/intellij/psi/codeStyle/JavaPackageEntryTableAccessor.java
index afecb38af624..883ed19b901d 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/JavaPackageEntryTableAccessor.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/JavaPackageEntryTableAccessor.java
@@ -54,8 +54,11 @@ public class JavaPackageEntryTableAccessor extends ValueListPropertyAccessor<Pac
           if (isModule) {
             entryTable.addEntry(PackageEntry.ALL_MODULE_IMPORTS);
           }
+          else if (isStatic) {
+            entryTable.addEntry(PackageEntry.ALL_OTHER_STATIC_IMPORTS_ENTRY);
+          }
           else {
-            entryTable.addEntry(isStatic ? PackageEntry.ALL_OTHER_STATIC_IMPORTS_ENTRY : PackageEntry.ALL_OTHER_IMPORTS_ENTRY);
+            entryTable.addEntry(PackageEntry.ALL_OTHER_IMPORTS_ENTRY);
           }
         }
         else {
diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java
index 00ea1db8053a..f47bc29f9f2b 100755
--- a/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java
+++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java
@@ -120,8 +120,11 @@ public class PackageEntryTable implements JDOMExternalizable, Cloneable {
           if (isModule) {
             entry = PackageEntry.ALL_MODULE_IMPORTS;
           }
+          else if (isStatic) {
+            entry = PackageEntry.ALL_OTHER_STATIC_IMPORTS_ENTRY;
+          }
           else {
-            entry = isStatic ? PackageEntry.ALL_OTHER_STATIC_IMPORTS_ENTRY : PackageEntry.ALL_OTHER_IMPORTS_ENTRY;
+            entry = PackageEntry.ALL_OTHER_IMPORTS_ENTRY;
           }
         }
         else {