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

IDEA-141811 (Cannot Add Files to CVS in Unversioned Files Window)

Browse Source
This commit is contained in:
Bas Leijdekkers
2015-07-01 22:40:13 +02:00
parent a99d360907
commit 63de69e0fe
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AddFileOrDirectoryAction.java
+21 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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,6 +31,9 @@ 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.vcs.actions.VcsContext;
@@ -100,14 +103,26 @@ public class AddFileOrDirectoryAction extends ActionOnSelectedElement {
LOG.error(filesToAdd);
}
if (showDialog) {
final AbstractAddOptionsDialog dialog = AbstractAddOptionsDialog.createDialog(project, roots, dialogOptions);
if (!dialog.showAndGet()) {
return CvsHandler.NULL;
if (!showDialog) {
return CommandCvsHandler.createAddFilesHandler(project, roots);
}
final CvsHandler[] handler = new CvsHandler[1];
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);
}
};
final Application application = ApplicationManager.getApplication();
if (application.isDispatchThread()) {
runnable.run();
}
else {
application.invokeAndWait(runnable, ModalityState.any());
}
return CommandCvsHandler.createAddFilesHandler(project, roots);
return handler[0];
}
@Override