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

shelf: IDEA-208591 Do not load shelve file content in EDT

Browse Source 
* build shelf tree model async on pool thread and show loading icon

GitOrigin-RevId: 1fad7362914f2a8e112a05d030902aa5b7249194
This commit is contained in:
Nadya Zabrodina
2019-06-09 10:06:43 +03:00
committed by intellij-monorepo-bot
parent 92618aa563
commit 0c901a37ff
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java
+11 -6
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.util.BackgroundTaskUtil;
import com.intellij.openapi.project.DumbAwareRunnable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.startup.StartupManager;
@@ -56,10 +57,7 @@ import com.intellij.util.ui.update.MergingUpdateQueue;
import com.intellij.util.ui.update.Update;
import com.intellij.vcsUtil.VcsUtil;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.CalledInAwt;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.*;
import javax.swing.*;
import javax.swing.event.CellEditorListener;
@@ -371,10 +369,17 @@ public class ShelvedChangesViewManager implements Disposable {
@Override
public void rebuildTree() {
DefaultTreeModel newModel = buildTreeModel();
updateTreeModel(newModel);
myTree.setPaintBusy(true);
BackgroundTaskUtil.executeOnPooledThread(myProject, () -> {
final DefaultTreeModel newModel = buildTreeModel();
ApplicationManager.getApplication().invokeLater(() -> {
updateTreeModel(newModel);
myTree.setPaintBusy(false);
});
});
}
@CalledInBackground
private DefaultTreeModel buildTreeModel() {
MyShelvedTreeModelBuilder modelBuilder = new MyShelvedTreeModelBuilder();
final List<ShelvedChangeList> changeLists = new ArrayList<>(myShelveChangesManager.getShelvedChangeLists());