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 - make method static

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-04-10 16:16:33 +03:00
parent e1536c54e5
commit 53d621eb92
1 changed files with 10 additions and 2 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
+10 -2
View File
@@ -99,6 +99,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
@NotNull private final List<CommitExecutor> myExecutors;
@NotNull private final List<CheckinHandler> myHandlers = newArrayList();
private final boolean myAllOfDefaultChangeListChangesIncluded;
@NotNull private final String myCommitActionName;
@NotNull private final Map<String, String> myListComments;
@NotNull private final List<CommitExecutorAction> myExecutorActions;
@@ -357,7 +358,8 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
restoreState();
setTitle(myShowVcsCommit ? TITLE : trimEllipsis(executors.get(0).getActionText()));
myCommitAction = myShowVcsCommit ? new CommitAction(getCommitActionName()) : null;
myCommitActionName = getCommitActionName(myAffectedVcses);
myCommitAction = myShowVcsCommit ? new CommitAction(myCommitActionName) : null;
myExecutorActions = createExecutorActions(executors);
if (myCommitAction != null) {
myCommitAction.setOptions(myExecutorActions);
@@ -751,10 +753,16 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
PropertiesComponent.getInstance().setValue(DETAILS_SHOW_OPTION, myDetailsSplitter.isOn(), DETAILS_SHOW_OPTION_DEFAULT);
}
@NotNull
@Override
public String getCommitActionName() {
return myCommitActionName;
}
@NotNull
private static String getCommitActionName(@NotNull Collection<AbstractVcs> affectedVcses) {
String name = null;
for (AbstractVcs vcs : myAffectedVcses) {
for (AbstractVcs vcs : affectedVcses) {
CheckinEnvironment checkinEnvironment = vcs.getCheckinEnvironment();
if (name == null && checkinEnvironment != null) {
name = checkinEnvironment.getCheckinOperationName();