diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:01:23 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:01:23 -0700 |
commit | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (patch) | |
tree | 2f4cc6d69645bd460aa253fdecb606d764fbd25d /platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CommonCheckinFilesAction.java | |
parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
download | idea-1aa2e09bdbd413eacb677e9fa4b50630530d0656.tar.gz |
Snapshot idea/138.1696 from git://git.jetbrains.org/idea/community.git
Change-Id: I50c97b83a815ce635e49a38380ba5b8765e4b16a
Diffstat (limited to 'platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CommonCheckinFilesAction.java')
-rw-r--r-- | platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CommonCheckinFilesAction.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CommonCheckinFilesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CommonCheckinFilesAction.java index 89d1f5695e63..1829413f0f7e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CommonCheckinFilesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CommonCheckinFilesAction.java @@ -23,12 +23,14 @@ import com.intellij.openapi.vcs.changes.LocalChangeList; import com.intellij.openapi.vcs.checkin.CheckinEnvironment; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.HashSet; +import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.Iterator; import java.util.Set; public class CommonCheckinFilesAction extends AbstractCommonCheckinAction { + @Override protected String getActionName(final VcsContext dataContext) { final String checkinActionName = getCheckinActionName(dataContext); return modifyCheckinActionName(dataContext, checkinActionName); @@ -125,14 +127,16 @@ public class CommonCheckinFilesAction extends AbstractCommonCheckinAction { return false; } - protected boolean isApplicableRoot(VirtualFile file, FileStatus status, VcsContext dataContext) { + protected boolean isApplicableRoot(@NotNull VirtualFile file, @NotNull FileStatus status, @NotNull VcsContext dataContext) { return status != FileStatus.UNKNOWN && status != FileStatus.IGNORED; } + @Override protected FilePath[] getRoots(final VcsContext context) { return context.getSelectedFilePaths(); } + @Override protected boolean filterRootsBeforeAction() { return true; } |