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: commit action text should not depend on order of affected vcses

Browse Source 
* fix case, when one of affected vcses doesn't have a CheckinEnvironment
This commit is contained in:
Aleksey Pivovarov
2018-04-10 16:17:35 +03:00
parent 53d621eb92
commit 5d5e35cae6
1 changed files with 6 additions and 9 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
+6 -9
View File
@@ -761,17 +761,14 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
@NotNull
private static String getCommitActionName(@NotNull Collection<AbstractVcs> affectedVcses) {
String name = null;
for (AbstractVcs vcs : affectedVcses) {
Set<String> names = map2SetNotNull(affectedVcses, vcs -> {
CheckinEnvironment checkinEnvironment = vcs.getCheckinEnvironment();
if (name == null && checkinEnvironment != null) {
name = checkinEnvironment.getCheckinOperationName();
}
else {
name = VcsBundle.getString("commit.dialog.default.commit.operation.name");
}
return checkinEnvironment != null ? checkinEnvironment.getCheckinOperationName() : null;
});
if (names.size() == 1) {
return notNull(ContainerUtil.getFirstItem(names));
}
return name != null ? name : VcsBundle.getString("commit.dialog.default.commit.operation.name");
return VcsBundle.getString("commit.dialog.default.commit.operation.name");
}
private boolean checkComment() {