From 43effd21ae3bc3a76e27312a8af13aa0898e3af1 Mon Sep 17 00:00:00 2001 From: "Dmitry.Yudin" Date: Mon, 2 Jun 2025 16:46:16 +0200 Subject: [PATCH] Refine EAP license check conditions in plugin components Updated EAP license validation logic to check for additional system property values, ensuring better alignment with expected configurations. GitOrigin-RevId: 31bbdd48b096f33568eacecce5a2f14985616edf --- .../com/intellij/ide/plugins/newui/ListPluginComponent.java | 6 ++---- .../ide/plugins/newui/PluginDetailsPageComponent.kt | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/ListPluginComponent.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/ListPluginComponent.java index cd83fd79087e..22709c814d64 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/ListPluginComponent.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/ListPluginComponent.java @@ -46,10 +46,8 @@ import javax.swing.text.BadLocationException; import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; -import java.util.ArrayList; -import java.util.Iterator; +import java.util.*; import java.util.List; -import java.util.StringJoiner; import java.util.function.BooleanSupplier; import java.util.function.Function; import java.util.function.Supplier; @@ -456,7 +454,7 @@ public final class ListPluginComponent extends JPanel { String stamp = instance.getConfirmationStamp(productCode); if (stamp == null) { - if (ApplicationManager.getApplication().isEAP() && !Boolean.getBoolean("eap.require.license")) { + if (ApplicationManager.getApplication().isEAP() && !Arrays.asList("release", "true").contains(System.getProperty("eap.require.license"))) { setTagTooltip(IdeBundle.message("label.text.plugin.eap.license.not.required")); return; } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.kt b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.kt index 3cfd6437b5e8..743c6181aad1 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.kt +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.kt @@ -1104,7 +1104,7 @@ class PluginDetailsPageComponent @JvmOverloads constructor( val stamp = instance.getConfirmationStamp(productCode) if (stamp == null) { - if (ApplicationManager.getApplication().isEAP && !java.lang.Boolean.getBoolean("eap.require.license")) { + if (ApplicationManager.getApplication().isEAP && System.getProperty("eap.require.license") !in arrayOf("release", "true")) { tagPanel!!.setFirstTagTooltip(IdeBundle.message("tooltip.license.not.required.for.eap.version")) licensePanel.hideWithChildren() return