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: cleanup - rearrange methods

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-11-30 15:42:49 +03:00
parent 047ac2c207
commit d28b8cccea
1 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+41 -41
View File
@@ -129,6 +129,40 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
private String myLastSelectedListName;
public static void commitPaths(final Project project, Collection<FilePath> paths, final LocalChangeList initialSelection,
@Nullable final CommitExecutor executor, final String comment) {
final ChangeListManager manager = ChangeListManager.getInstance(project);
final Collection<Change> changes = new HashSet<>();
for (FilePath path : paths) {
changes.addAll(manager.getChangesIn(path));
}
commitChanges(project, changes, initialSelection, executor, comment);
}
public static boolean commitChanges(final Project project, final Collection<Change> changes, final LocalChangeList initialSelection,
@Nullable final CommitExecutor executor, final String comment) {
if (executor == null) {
return commitChanges(project, changes, initialSelection, collectExecutors(project, changes), true, comment, null);
}
else {
return commitChanges(project, changes, initialSelection, Collections.singletonList(executor), false, comment, null);
}
}
/**
* Shows the commit dialog, and performs the selected action: commit, commit & push, create patch, etc.
* @param customResultHandler If this is not null, after commit is completed, custom result handler is called instead of
* showing the default notification in case of commit or failure.
* @return true if user agreed to commit, false if he pressed "Cancel".
*/
public static boolean commitChanges(final Project project, final Collection<Change> changes, final LocalChangeList initialSelection,
final List<CommitExecutor> executors, final boolean showVcsCommit, final String comment,
@Nullable CommitResultHandler customResultHandler) {
return commitChanges(project, new ArrayList<>(changes), initialSelection, executors, showVcsCommit, comment,
customResultHandler, true);
}
public static boolean commitChanges(final Project project,
final List<Change> changes,
final LocalChangeList initialSelection,
@@ -188,34 +222,6 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
ProjectLevelVcsManager.getInstance(project).getAllActiveVcss());
}
// Used in plugins
@SuppressWarnings("unused")
@NotNull
public List<RefreshableOnComponent> getAdditionalComponents() {
return Collections.unmodifiableList(myAdditionalComponents);
}
public static void commitPaths(final Project project, Collection<FilePath> paths, final LocalChangeList initialSelection,
@Nullable final CommitExecutor executor, final String comment) {
final ChangeListManager manager = ChangeListManager.getInstance(project);
final Collection<Change> changes = new HashSet<>();
for (FilePath path : paths) {
changes.addAll(manager.getChangesIn(path));
}
commitChanges(project, changes, initialSelection, executor, comment);
}
public static boolean commitChanges(final Project project, final Collection<Change> changes, final LocalChangeList initialSelection,
@Nullable final CommitExecutor executor, final String comment) {
if (executor == null) {
return commitChanges(project, changes, initialSelection, collectExecutors(project, changes), true, comment, null);
}
else {
return commitChanges(project, changes, initialSelection, Collections.singletonList(executor), false, comment, null);
}
}
public static List<CommitExecutor> collectExecutors(@NotNull Project project, @NotNull Collection<Change> changes) {
List<CommitExecutor> result = new ArrayList<>();
for (AbstractVcs<?> vcs : ChangesUtil.getAffectedVcses(changes, project)) {
@@ -225,19 +231,6 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
return result;
}
/**
* Shows the commit dialog, and performs the selected action: commit, commit & push, create patch, etc.
* @param customResultHandler If this is not null, after commit is completed, custom result handler is called instead of
* showing the default notification in case of commit or failure.
* @return true if user agreed to commit, false if he pressed "Cancel".
*/
public static boolean commitChanges(final Project project, final Collection<Change> changes, final LocalChangeList initialSelection,
final List<CommitExecutor> executors, final boolean showVcsCommit, final String comment,
@Nullable CommitResultHandler customResultHandler) {
return commitChanges(project, new ArrayList<>(changes), initialSelection, executors, showVcsCommit, comment,
customResultHandler, true);
}
public static void commitAlienChanges(final Project project, final List<Change> changes, final AbstractVcs vcs,
final String changelistName, final String comment) {
final LocalChangeList lcl = new AlienLocalChangeList(changes, changelistName);
@@ -1115,6 +1108,13 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
}
}
// Used in plugins
@SuppressWarnings("unused")
@NotNull
public List<RefreshableOnComponent> getAdditionalComponents() {
return Collections.unmodifiableList(myAdditionalComponents);
}
private void updateButtons() {
if (myDisposed || myUpdateDisabled) return;
final boolean enabled = hasDiffs();