From 2d4bc1d2cb7c9674b732fde12e2a420a46b43b70 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 19 Sep 2011 17:20:43 +0200
Subject: [PATCH] NPE fix

---
 .../propertyInspector/editors/string/KeyChooserDialog.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java
index 45db8b446006..f47b38764a74 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java
@@ -114,7 +114,7 @@ public final class KeyChooserDialog extends DialogWrapper{
     final Dimension size = DimensionService.getInstance().getSize(getDimensionServiceKey(), projectGuess);
     final FontMetrics metrics = myTable.getFontMetrics(myTable.getFont());
     int minWidth = 200;
-    int maxWidth = size.width / 2;
+    int maxWidth = size != null ? size.width / 2 : Integer.MAX_VALUE;
     if (minWidth > maxWidth) {
       minWidth = maxWidth;
     }
@@ -187,6 +187,7 @@ public final class KeyChooserDialog extends DialogWrapper{
     myTable.scrollRectToVisible(myTable.getCellRect(index, 0, true));
   }
 
+  @NotNull
   protected String getDimensionServiceKey() {
     return getClass().getName();
   }