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

CVS: no need to check if on dispatch thread

Browse Source
This commit is contained in:
Bas Leijdekkers
2015-07-04 14:24:26 +02:00
parent 1ca026d6a3
commit a089b89198
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AddFileOrDirectoryAction.java
+5 -11
View File
@@ -31,11 +31,11 @@ import com.intellij.cvsSupport2.cvsoperations.cvsAdd.ui.AbstractAddOptionsDialog
import com.intellij.cvsSupport2.ui.CvsTabbedWindow;
import com.intellij.cvsSupport2.ui.Options;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.vcs.actions.VcsContext;
import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
import com.intellij.openapi.vfs.VirtualFile;
@@ -106,23 +106,17 @@ public class AddFileOrDirectoryAction extends ActionOnSelectedElement {
if (!showDialog) {
return CommandCvsHandler.createAddFilesHandler(project, roots);
}
final CvsHandler[] handler = new CvsHandler[1];
final Ref<CvsHandler> handler = new Ref<CvsHandler>();
final Runnable runnable = new Runnable() {
@Override
public void run() {
final AbstractAddOptionsDialog dialog = AbstractAddOptionsDialog.createDialog(project, roots, dialogOptions);
handler[0] = !dialog.showAndGet() ? CvsHandler.NULL : CommandCvsHandler.createAddFilesHandler(project, roots);
handler.set(!dialog.showAndGet() ? CvsHandler.NULL : CommandCvsHandler.createAddFilesHandler(project, roots));
}
};
final Application application = ApplicationManager.getApplication();
if (application.isDispatchThread()) {
runnable.run();
}
else {
application.invokeAndWait(runnable, ModalityState.any());
}
ApplicationManager.getApplication().invokeAndWait(runnable, ModalityState.any());
return handler[0];
return handler.get();
}
@Override