diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogUsageTriggerCollector.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogUsageTriggerCollector.java index 5c9273930357..8ab44def26e5 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogUsageTriggerCollector.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogUsageTriggerCollector.java @@ -9,11 +9,10 @@ import org.jetbrains.annotations.NotNull; public class VcsLogUsageTriggerCollector { - public static void triggerUsage(@NotNull AnActionEvent e) { - String text = e.getPresentation().getText(); - if (text != null) { - triggerUsage(e, text); - } + public static void triggerUsage(@NotNull AnActionEvent e, @NotNull Object action) { + String name = action.getClass().getName(); + if (name.contains(".")) name = name.substring(name.lastIndexOf(".") + 1); + triggerUsage(e, name); } public static void triggerUsage(@NotNull AnActionEvent e, @NotNull String text) { diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/CollapseOrExpandGraphAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/CollapseOrExpandGraphAction.java index e8a5c429ff44..a2875a269169 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/CollapseOrExpandGraphAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/CollapseOrExpandGraphAction.java @@ -39,7 +39,7 @@ abstract class CollapseOrExpandGraphAction extends DumbAwareAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); VcsLogUi ui = e.getRequiredData(VcsLogDataKeys.VCS_LOG_UI); executeAction((VcsLogUiImpl)ui); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/CompareRevisionsFromLogAction.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/CompareRevisionsFromLogAction.kt index 8c4baa031326..d5c8799ef1ac 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/CompareRevisionsFromLogAction.kt +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/CompareRevisionsFromLogAction.kt @@ -36,7 +36,7 @@ open class CompareRevisionsFromLogAction : DumbAwareAction() { val handler = e.getRequiredData(VcsLogInternalDataKeys.LOG_DIFF_HANDLER) val filePath = getFilePath(e)!! - VcsLogUsageTriggerCollector.triggerUsage(e) + VcsLogUsageTriggerCollector.triggerUsage(e, this) val commits = log.selectedCommits if (commits.size == 2) { diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/FocusTextFilterAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/FocusTextFilterAction.java index 1596a7147419..83c87027d43d 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/FocusTextFilterAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/FocusTextFilterAction.java @@ -41,7 +41,7 @@ public class FocusTextFilterAction extends DumbAwareAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); Project project = e.getRequiredData(CommonDataKeys.PROJECT); MainFrame mainFrame = ((VcsLogUiImpl)e.getRequiredData(VcsLogDataKeys.VCS_LOG_UI)).getMainFrame(); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToHashOrRefAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToHashOrRefAction.java index 695b25a07a18..9d777beb1b13 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToHashOrRefAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToHashOrRefAction.java @@ -35,7 +35,7 @@ public class GoToHashOrRefAction extends DumbAwareAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); Project project = e.getRequiredData(CommonDataKeys.PROJECT); VcsLog log = e.getRequiredData(VcsLogDataKeys.VCS_LOG); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToParentOrChildAction.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToParentOrChildAction.kt index 7465fbc07d98..b91a84b01e72 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToParentOrChildAction.kt +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/GoToParentOrChildAction.kt @@ -28,7 +28,7 @@ open class GoToParentOrChildAction(val parent: Boolean) : DumbAwareAction() { } override fun actionPerformed(e: AnActionEvent) { - VcsLogUsageTriggerCollector.triggerUsage(e) + VcsLogUsageTriggerCollector.triggerUsage(e, this) val ui = e.getRequiredData(VcsLogDataKeys.VCS_LOG_UI) as AbstractVcsLogUi val rows = getRowsToJump(ui) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/OpenAnotherLogTabAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/OpenAnotherLogTabAction.java index 6ea168eda986..b9bab05de967 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/OpenAnotherLogTabAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/OpenAnotherLogTabAction.java @@ -46,7 +46,7 @@ public class OpenAnotherLogTabAction extends DumbAwareAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); Project project = e.getRequiredData(CommonDataKeys.PROJECT); VcsProjectLog.getInstance(project).getTabsManager().openAnotherLogTab(e.getRequiredData(VcsLogInternalDataKeys.LOG_MANAGER)); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/RefreshLogAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/RefreshLogAction.java index 8aa9879170ab..37227a2343b0 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/RefreshLogAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/RefreshLogAction.java @@ -38,7 +38,7 @@ public class RefreshLogAction extends RefreshAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); VcsLogManager logManager = e.getRequiredData(VcsLogInternalDataKeys.LOG_MANAGER); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ShowCommitTooltipAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ShowCommitTooltipAction.java index 4bd084ddaf36..391c9586f0a0 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ShowCommitTooltipAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ShowCommitTooltipAction.java @@ -46,7 +46,7 @@ public class ShowCommitTooltipAction extends DumbAwareAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); VcsLogGraphTable table = ((AbstractVcsLogUi)e.getRequiredData(VcsLogDataKeys.VCS_LOG_UI)).getTable(); int row = table.getSelectedRow(); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ShowDiffAfterWithLocalFromLogActionProvider.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ShowDiffAfterWithLocalFromLogActionProvider.java index d36b56385734..285470b0145b 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ShowDiffAfterWithLocalFromLogActionProvider.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ShowDiffAfterWithLocalFromLogActionProvider.java @@ -65,7 +65,7 @@ public class ShowDiffAfterWithLocalFromLogActionProvider implements AnActionExte @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); Project project = e.getRequiredData(CommonDataKeys.PROJECT); VcsLog log = e.getRequiredData(VcsLogDataKeys.VCS_LOG); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java index 287b1128ce5e..5123ee810d58 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java @@ -44,7 +44,7 @@ public class VcsLogCreatePatchActionProvider implements AnActionExtensionProvide @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); Change[] changes = e.getRequiredData(VcsDataKeys.CHANGES); String commitMessage = e.getData(VcsDataKeys.PRESET_COMMIT_MESSAGE); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromFileHistoryActionProvider.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromFileHistoryActionProvider.java index 204d174c44ba..253b26c109a7 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromFileHistoryActionProvider.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromFileHistoryActionProvider.java @@ -49,7 +49,7 @@ public class CompareRevisionsFromFileHistoryActionProvider implements AnActionEx @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); Project project = e.getRequiredData(CommonDataKeys.PROJECT); Change[] changes = e.getData(VcsDataKeys.SELECTED_CHANGES); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java index 9636834dc7ce..50d8421cd3f7 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java @@ -74,7 +74,7 @@ public class CreatePatchFromHistoryActionProvider implements AnActionExtensionPr @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); Project project = e.getRequiredData(CommonDataKeys.PROJECT); FileHistoryUi ui = e.getRequiredData(VcsLogInternalDataKeys.FILE_HISTORY_UI); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/FileHistorySingleCommitAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/FileHistorySingleCommitAction.java index 4972fa2acc85..171441c4bb63 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/FileHistorySingleCommitAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/FileHistorySingleCommitAction.java @@ -67,7 +67,7 @@ public abstract class FileHistorySingleCommitAction @Override public void actionPerformed(@NotNull AnActionEvent e) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); Project project = e.getRequiredData(CommonDataKeys.PROJECT); FileHistoryUi ui = e.getRequiredData(VcsLogInternalDataKeys.FILE_HISTORY_UI); diff --git a/plugins/git4idea/src/git4idea/branch/DeepCompareAction.java b/plugins/git4idea/src/git4idea/branch/DeepCompareAction.java index f44143f2a4ca..933fa16516f4 100644 --- a/plugins/git4idea/src/git4idea/branch/DeepCompareAction.java +++ b/plugins/git4idea/src/git4idea/branch/DeepCompareAction.java @@ -66,7 +66,7 @@ public class DeepCompareAction extends ToggleAction implements DumbAware { } final DeepComparator dc = DeepComparator.getInstance(project, dataProvider, ui); if (selected) { - VcsLogUsageTriggerCollector.triggerUsage(e); + VcsLogUsageTriggerCollector.triggerUsage(e, this); VcsLogDataPack dataPack = ui.getDataPack(); String singleBranchName = VcsLogUtil.getSingleFilteredBranch(ui.getFilterUi().getFilters(), dataPack.getRefs());