From 1bc81178cbb605880889ffa23cfdadbe743a4e96 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 3 Aug 2016 18:51:18 +0300
Subject: [PATCH] removed unnecessary Alarms

---
 .../intellij/openapi/vfs/encoding/EncodingManagerImpl.java  | 6 ++----
 .../openapi/progress/impl/ProgressIndicatorTest.java        | 5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java
index 7883b7ac1d87..ea9bcd2816da 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java
@@ -37,8 +37,8 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.vfs.*;
-import com.intellij.util.Alarm;
+import com.intellij.openapi.vfs.CharsetToolkit;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.concurrency.BoundedTaskExecutor;
 import com.intellij.util.xmlb.annotations.Attribute;
@@ -88,7 +88,6 @@ public class EncodingManagerImpl extends EncodingManager implements PersistentSt
 
   private State myState = new State();
 
-  private final Alarm updateEncodingFromContent = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, this);
   private static final Key<Charset> CACHED_CHARSET_FROM_CONTENT = Key.create("CACHED_CHARSET_FROM_CONTENT");
 
   private final BoundedTaskExecutor changedDocumentExecutor =
@@ -168,7 +167,6 @@ public class EncodingManagerImpl extends EncodingManager implements PersistentSt
 
   @Override
   public void dispose() {
-    updateEncodingFromContent.cancelAllRequests();
     clearDocumentQueue();
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/progress/impl/ProgressIndicatorTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/progress/impl/ProgressIndicatorTest.java
index 7daea1cb009c..276668f36df6 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/progress/impl/ProgressIndicatorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/progress/impl/ProgressIndicatorTest.java
@@ -16,6 +16,7 @@
 package com.intellij.openapi.progress.impl;
 
 import com.intellij.codeInsight.daemon.impl.DaemonProgressIndicator;
+import com.intellij.concurrency.JobScheduler;
 import com.intellij.concurrency.SensitiveProgressWrapper;
 import com.intellij.ide.util.DelegatingProgressIndicator;
 import com.intellij.openapi.application.ApplicationManager;
@@ -46,6 +47,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -268,8 +270,7 @@ public class ProgressIndicatorTest extends LightPlatformTestCase {
 
   private void ensureCheckCanceledCalled(@NotNull ProgressIndicator indicator) {
     myFlag = false;
-    Alarm alarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, getTestRootDisposable());
-    alarm.addRequest(() -> myFlag = true, 100);
+    JobScheduler.getScheduler().schedule(() -> myFlag = true, 100, TimeUnit.MILLISECONDS);
     final long start = System.currentTimeMillis();
     try {
       ProgressManager.getInstance().executeProcessUnderProgress(() -> {