From 3ae40ca0fa11be3d7d1b21fca2a8af8ce34e4bf0 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 11 May 2017 17:00:55 +0200
Subject: [PATCH] distinguish ModalityState.NON_MODAL from a modality state
 where all entities have been gc-ed, greenify

---
 .../intellij/openapi/application/impl/ModalityStateEx.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ModalityStateEx.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ModalityStateEx.java
index f60c34bd1f20..f06241970ea1 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/ModalityStateEx.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ModalityStateEx.java
@@ -27,7 +27,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class ModalityStateEx extends ModalityState {
-  private final WeakList myModalEntities = new WeakList();
+  private final WeakList<Object> myModalEntities = new WeakList<>();
 
   @SuppressWarnings("unused")
   public ModalityStateEx() { } // used by reflection to initialize NON_MODAL
@@ -39,6 +39,7 @@ public class ModalityStateEx extends ModalityState {
   private List<Object> getModalEntities() {
     ArrayList<Object> result = new ArrayList<>();
     for (Object entity : myModalEntities) {
+      //noinspection UseBulkOperation
       result.add(entity);
     }
     return result;
@@ -71,8 +72,7 @@ public class ModalityStateEx extends ModalityState {
 
   @NonNls
   public String toString() {
-    List<Object> modalEntities = getModalEntities();
-    return modalEntities.isEmpty() ? "ModalityState.NON_MODAL" : "ModalityState:" + StringUtil.join(modalEntities, ", ");
+    return this == NON_MODAL ? "ModalityState.NON_MODAL" : "ModalityState:" + StringUtil.join(getModalEntities(), ", ");
   }
 
   @Override