From 5c2f3aa071560e29e31f73fa9b8f7cc437e95ea1 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 5 Jan 2012 17:51:37 +0100
Subject: [PATCH] @NotNull

---
 .../src/com/intellij/codeInsight/lookup/LookupManager.java | 7 ++++---
 .../codeInsight/lookup/impl/LookupManagerImpl.java         | 4 ++--
 .../src/com/intellij/ui/TextFieldWithAutoCompletion.java   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupManager.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupManager.java
index 2f9ec88584e1..02592e7b3313 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupManager.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupManager.java
@@ -50,12 +50,13 @@ public abstract class LookupManager {
   }
 
   @Nullable
-  public LookupEx showLookup(Editor editor, @NotNull LookupElement[] items, String prefix) {
+  public LookupEx showLookup(Editor editor, @NotNull LookupElement[] items, @NotNull String prefix) {
     return showLookup(editor, items, prefix, LookupArranger.DEFAULT);
   }
 
   @Nullable
-  public abstract LookupEx showLookup(Editor editor, @NotNull LookupElement[] items, String prefix, @NotNull LookupArranger arranger);
+  public abstract LookupEx showLookup(Editor editor, @NotNull LookupElement[] items,
+                                      @NotNull String prefix, @NotNull LookupArranger arranger);
 
   public abstract void hideActiveLookup();
 
@@ -69,6 +70,6 @@ public abstract class LookupManager {
 
   //public abstract boolean isDisposed();
 
-  public abstract Lookup createLookup(Editor editor, @NotNull LookupElement[] items, final String prefix, LookupArranger arranger);
+  public abstract Lookup createLookup(Editor editor, @NotNull LookupElement[] items, @NotNull final String prefix, LookupArranger arranger);
 
 }
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java
index 5034b44b80e7..41beb94ba8c8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java
@@ -106,7 +106,7 @@ public class LookupManagerImpl extends LookupManager {
 
   public LookupEx showLookup(final Editor editor,
                            @NotNull LookupElement[] items,
-                           final String prefix,
+                           @NotNull final String prefix,
                            @NotNull final LookupArranger arranger) {
     for (LookupElement item : items) {
       assert item != null;
@@ -118,7 +118,7 @@ public class LookupManagerImpl extends LookupManager {
 
   public LookupImpl createLookup(final Editor editor,
                                  @NotNull LookupElement[] items,
-                                 final String prefix,
+                                 @NotNull final String prefix,
                                  @NotNull final LookupArranger arranger) {
     hideActiveLookup();
 
diff --git a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java
index 69b6e691aa40..80097f16e2e2 100644
--- a/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java
+++ b/platform/lang-impl/src/com/intellij/ui/TextFieldWithAutoCompletion.java
@@ -120,7 +120,7 @@ public class TextFieldWithAutoCompletion extends EditorTextField {
     final LookupImpl lookup =
       (LookupImpl)LookupManager.getInstance(getProject()).createLookup(editor,
                                                                        calcLookupItems(lookupPrefix),
-                                                                       lookupPrefix != null ? lookupPrefix : "",
+                                                                       StringUtil.notNullize(lookupPrefix),
                                                                        LookupArranger.DEFAULT);
     final String advertisementText = getAdvertisementText();
     if (!StringUtil.isEmpty(advertisementText)) {