From de44b55568ffc764b7b93ed4b28996a794cafeff Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 16 Nov 2015 18:14:40 +0300 Subject: [PATCH] git: rename & move action to a more proper place --- .../git4idea/history/GitHistoryProvider.java | 4 ++-- .../GitShowCommitInLogAction.java} | 23 +++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) rename plugins/git4idea/src/git4idea/{history/wholeTree/SelectRevisionInGitLogAction.java => log/GitShowCommitInLogAction.java} (86%) diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java index 27d22010dcd8..982ad2572b43 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java @@ -38,7 +38,7 @@ import git4idea.GitVcs; import git4idea.changes.GitChangeUtils; import git4idea.config.GitExecutableValidator; import git4idea.history.browser.SHAHash; -import git4idea.history.wholeTree.SelectRevisionInGitLogAction; +import git4idea.log.GitShowCommitInLogAction; import git4idea.repo.GitRepository; import git4idea.repo.GitRepositoryManager; import org.jetbrains.annotations.NotNull; @@ -69,7 +69,7 @@ public class GitHistoryProvider implements VcsHistoryProviderEx, VcsCacheableHis return new AnAction[] { ShowAllAffectedGenericAction.getInstance(), ActionManager.getInstance().getAction(VcsActions.ACTION_COPY_REVISION_NUMBER), - new SelectRevisionInGitLogAction() }; + new GitShowCommitInLogAction() }; } public boolean isDateOmittable() { diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRevisionInGitLogAction.java b/plugins/git4idea/src/git4idea/log/GitShowCommitInLogAction.java similarity index 86% rename from plugins/git4idea/src/git4idea/history/wholeTree/SelectRevisionInGitLogAction.java rename to plugins/git4idea/src/git4idea/log/GitShowCommitInLogAction.java index de87bf2f5d42..f8ba847db57a 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRevisionInGitLogAction.java +++ b/plugins/git4idea/src/git4idea/log/GitShowCommitInLogAction.java @@ -1,4 +1,19 @@ -package git4idea.history.wholeTree; +/* + * Copyright 2000-2015 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. + */ +package git4idea.log; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; @@ -31,10 +46,10 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -public class SelectRevisionInGitLogAction extends DumbAwareAction { - private static final Logger LOG = Logger.getInstance(SelectRevisionInGitLogAction.class); +public class GitShowCommitInLogAction extends DumbAwareAction { + private static final Logger LOG = Logger.getInstance(GitShowCommitInLogAction.class); - public SelectRevisionInGitLogAction() { + public GitShowCommitInLogAction() { super(GitBundle.getString("vcs.history.action.gitlog")); }