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: remove duplicate commit action; always use action that will correctly look for any changed file if nothing is specially selected

Browse Source
This commit is contained in:
irengrig
2010-08-31 17:45:38 +04:00
parent 126f1ecf0b
commit 353a172abd
2 changed files with 1 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/idea/VcsActions.xml
+1 -1
View File
@@ -70,7 +70,7 @@
<group id="ChangesViewToolbar">
<action id="ChangesView.Refresh" class="com.intellij.openapi.vcs.changes.actions.RefreshAction"
icon="/actions/sync.png"/>
<action id="ChangesView.Commit" class="com.intellij.openapi.vcs.changes.actions.CommitAction"
<action id="ChangesView.Commit" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction"
icon="/actions/commit.png"/>
<action id="ChangesView.Rollback" class="com.intellij.openapi.vcs.changes.actions.RollbackAction"
icon="/actions/rollback.png"/>
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CommitAction.java
-84
View File
@@ -1,84 +0,0 @@
/*
* Copyright 2000-2009 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* Created by IntelliJ IDEA.
* User: yole
* Date: 02.11.2006
* Time: 21:53:06
*/
package com.intellij.openapi.vcs.changes.actions;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.AbstractVcs;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.VcsDataKeys;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.openapi.vcs.changes.ui.CommitChangeListDialog;
import java.util.Arrays;
import java.util.List;
public class CommitAction extends AnAction implements DumbAware {
public void update(AnActionEvent e) {
Project project = e.getData(PlatformDataKeys.PROJECT);
boolean enabled = false;
if (project != null) {
if (ProjectLevelVcsManager.getInstance(project).isBackgroundVcsOperationRunning()) {
e.getPresentation().setEnabled(false);
return;
}
Change[] changes = e.getData(VcsDataKeys.CHANGES);
if (changes != null && ChangesUtil.allChangesInOneList(project, changes)) {
for(Change c: changes) {
final AbstractVcs vcs = ChangesUtil.getVcsForChange(c, project);
if (vcs != null && vcs.getCheckinEnvironment() != null) {
enabled = true;
break;
}
}
}
}
e.getPresentation().setEnabled(enabled);
}
public void actionPerformed(AnActionEvent e) {
final Project project = e.getData(PlatformDataKeys.PROJECT);
if (project == null) return;
if (ProjectLevelVcsManager.getInstance(project).isBackgroundVcsOperationRunning()) {
return;
}
final Change[] changes = e.getData(VcsDataKeys.CHANGES);
final ChangeList list = ChangesUtil.getChangeListIfOnlyOne(project, changes);
if ((list == null) || (! (list instanceof LocalChangeList))) return;
ChangeListManager.getInstance(project).invokeAfterUpdate(new Runnable() {
public void run() {
final List<Change> changesList = Arrays.asList(changes);
final List<CommitExecutor> executors = CommitChangeListDialog.collectExecutors(project, changesList);
CommitChangeListDialog.commitChanges(project, changesList, (LocalChangeList) list,
executors, true, null);
}
}, InvokeAfterUpdateMode.SYNCHRONOUS_CANCELLABLE, VcsBundle.message("waiting.changelists.update.for.show.commit.dialog.message"), null);
}
}