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

vcs: extract method

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-10-11 13:11:16 +03:00
parent 9d503543a4
commit dcf3962619
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ScheduleForAdditionAction.java
+24 -20
View File
@@ -67,29 +67,33 @@ public class ScheduleForAdditionAction extends AnAction implements DumbAware {
@NotNull List<VirtualFile> files,
@NotNull Condition<FileStatus> unversionedFileCondition,
@Nullable ChangesBrowserBase browser) {
boolean result = true;
LocalChangeList targetChangeList = null;
Consumer<List<Change>> changeConsumer = null;
if (!files.isEmpty()) {
FileDocumentManager.getInstance().saveAllDocuments();
Consumer<List<Change>> consumer = browser == null ? null : changes -> {
browser.getViewer().includeChanges(changes);
};
ChangeListManagerImpl manager = ChangeListManagerImpl.getInstanceImpl(project);
LocalChangeList targetChangeList;
if (browser instanceof CommitDialogChangesBrowser) {
targetChangeList = ((CommitDialogChangesBrowser)browser).getSelectedChangeList();
}
else {
targetChangeList = manager.getDefaultChangeList();
}
List<VcsException> exceptions = manager.addUnversionedFiles(targetChangeList, files, unversionedFileCondition, consumer);
result = exceptions.isEmpty();
if (browser instanceof CommitDialogChangesBrowser) {
targetChangeList = ((CommitDialogChangesBrowser)browser).getSelectedChangeList();
}
return result;
if (browser != null) {
changeConsumer = changes -> browser.getViewer().includeChanges(changes);
}
return addUnversioned(project, files, targetChangeList, changeConsumer, unversionedFileCondition);
}
private static boolean addUnversioned(@NotNull Project project,
@NotNull List<VirtualFile> files,
@Nullable LocalChangeList targetChangeList,
@Nullable Consumer<List<Change>> changesConsumer,
@NotNull Condition<FileStatus> unversionedFileCondition) {
if (files.isEmpty()) return true;
ChangeListManagerImpl manager = ChangeListManagerImpl.getInstanceImpl(project);
if (targetChangeList == null) targetChangeList = manager.getDefaultChangeList();
FileDocumentManager.getInstance().saveAllDocuments();
List<VcsException> exceptions = manager.addUnversionedFiles(targetChangeList, files, unversionedFileCondition, changesConsumer);
return exceptions.isEmpty();
}
@NotNull