MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

removed unnecessary Alarms

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-08-04 15:21:39 +03:00
parent 1ed5e94446
commit 1bc81178cb
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java
+2 -4
View File
@@ -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();
}
platform/platform-tests/testSrc/com/intellij/openapi/progress/impl/ProgressIndicatorTest.java
+3 -2
View File
@@ -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(() -> {