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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Trofimov
2016-09-29 16:32:01 +02:00
parent bbbd1c0cf7 dab231c7c1
commit ffb30fba55
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java
+2 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,8 +31,6 @@ import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Ref;
import com.intellij.util.CommonProcessors;
import com.intellij.util.Processor;
import com.intellij.util.ThrowableRunnable;
import com.intellij.util.io.KeyDescriptor;
import gnu.trove.THashSet;
import gnu.trove.TObjectHashingStrategy;
@@ -142,7 +140,7 @@ public class GenericCompilerRunner {
}
final List<T> selectedTargets = new ReadAction<List<T>>() {
protected void run(final Result<List<T>> result) {
protected void run(@NotNull final Result<List<T>> result) {
result.setResult(instance.getSelectedTargets());
}
}.execute().getResultObject();
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+1 -1
View File
@@ -6551,7 +6551,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
g.drawImage(sprites[spriteIndex++], x, y, null);
if (spriteIndex == sprites.length) {
nrp.set(false);
IdeGlassPaneUtil.find(component).removePainter(this);
ApplicationManager.getApplication().invokeLater(() -> IdeGlassPaneUtil.find(component).removePainter(this));
component.repaint(x, y, SPRITE_SIZE, SPRITE_SIZE);
}
component.repaint(x, y, SPRITE_SIZE, SPRITE_SIZE);