diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareDirectoriesAction.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareDirectoriesAction.java
index 687e55d5c938..7bb751765ced 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareDirectoriesAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareDirectoriesAction.java
@@ -15,6 +15,7 @@
*/
package com.intellij.openapi.diff.actions;
+import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.ide.diff.DirDiffSettings;
import com.intellij.ide.diff.VirtualFileDiffElement;
import com.intellij.openapi.actionSystem.AnAction;
@@ -34,6 +35,7 @@ public class CompareDirectoriesAction extends AnAction {
public void actionPerformed(AnActionEvent e) {
final Project project = getEventProject(e);
final VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY);
+ FeatureUsageTracker.getInstance().triggerFeatureUsed("dir.diff");
if (project != null && files != null) {
VirtualFileDiffElement src = null;
VirtualFileDiffElement trg = null;
diff --git a/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties b/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
index 36f379cc0036..be8938e0755b 100644
--- a/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
+++ b/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
@@ -103,6 +103,7 @@ group.ui=UI Usability Features
group.ant=Ant support features
# suppress inspection "UnusedProperty"
group.tools=Tools support
+group.diff=Diff Tools
navigation.popup.action=Go to action
@@ -116,3 +117,5 @@ codeassists.highlight.throws=Highlight method throws
find.recent.search=Recent searches history
find.completion=Completion in Find Bar
switcher=Switcher
+dir.diff=Directory Diff
+jar.diff=Jar Files Diff
diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffDialog.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffDialog.java
index d48dd4d4dfe6..376731daafdb 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffDialog.java
@@ -65,4 +65,9 @@ public class DirDiffDialog extends DialogWrapper {
public JComponent getPreferredFocusedComponent() {
return myDiffPanel.getTable();
}
+
+ @Override
+ protected Action[] createActions() {
+ return new Action[]{};
+ }
}
diff --git a/resources-en/src/tips/DirDiff.html b/resources-en/src/tips/DirDiff.html
new file mode 100644
index 000000000000..50a01202427a
--- /dev/null
+++ b/resources-en/src/tips/DirDiff.html
@@ -0,0 +1,9 @@
+
+
+
+
+
To compare two directories select one or both of them in Project View and press &shortcut:CompareDirs;
+
+
+
+
\ No newline at end of file
diff --git a/resources-en/src/tips/JarDiff.html b/resources-en/src/tips/JarDiff.html
new file mode 100644
index 000000000000..d2e1d80d8003
--- /dev/null
+++ b/resources-en/src/tips/JarDiff.html
@@ -0,0 +1,9 @@
+
+
+
+
+
To compare two jar files select one or both of them in Project View and press &shortcut:CompareJars;
+
+
+
+
\ No newline at end of file
diff --git a/resources-en/src/tips/tips.xml b/resources-en/src/tips/tips.xml
index 303b31ef3eec..b36abc7afeeb 100644
--- a/resources-en/src/tips/tips.xml
+++ b/resources-en/src/tips/tips.xml
@@ -140,4 +140,6 @@
+
+
diff --git a/resources/src/ProductivityFeaturesRegistry.xml b/resources/src/ProductivityFeaturesRegistry.xml
index 7662364d87a1..5abe2c063c29 100644
--- a/resources/src/ProductivityFeaturesRegistry.xml
+++ b/resources/src/ProductivityFeaturesRegistry.xml
@@ -466,5 +466,19 @@
first-show="6"
successive-show="10"
min-usage-count="1"/>
-
+
+
+
+
+