From 61efe6d3afb581180671170cccb0048fbdd0764e Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Mon, 12 Nov 2012 13:27:21 +0400
Subject: [PATCH] EA-40654

---
 .../propertyTable/actions/ShowJavadoc.java     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java
index b0059e0a1684..53dfcb9d6636 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java
@@ -55,26 +55,36 @@ public class ShowJavadoc extends AnAction implements IPropertyTableAction {
 
   @Override
   public void update(AnActionEvent e) {
-    setEnabled(myTable, e.getPresentation());
+    setEnabled(myTable, e, e.getPresentation());
   }
 
   @Override
   public void update() {
-    setEnabled(myTable, getTemplatePresentation());
+    setEnabled(myTable, null, getTemplatePresentation());
   }
 
-  private static void setEnabled(RadPropertyTable table, Presentation presentation) {
+  private static void setEnabled(RadPropertyTable table, AnActionEvent e, Presentation presentation) {
     Property property = table.getSelectionProperty();
-    presentation.setEnabled(property != null && (property.getJavadocElement() != null || !StringUtil.isEmpty(property.getJavadocText())));
+    presentation.setEnabled(property != null &&
+                            (property.getJavadocElement() != null || !StringUtil.isEmpty(property.getJavadocText())) &&
+                            (e == null || e.getProject() != null));
   }
 
   @Override
   public void actionPerformed(AnActionEvent e) {
     final Project project = e.getProject();
+    if (project == null) {
+      return;
+    }
+
     DocumentationManager documentationManager = DocumentationManager.getInstance(project);
     final DocumentationComponent component = new DocumentationComponent(documentationManager);
 
     final Property property = myTable.getSelectionProperty();
+    if (property == null) {
+      return;
+    }
+
     PsiElement javadocElement = property.getJavadocElement();
 
     ActionCallback callback;