diff -r d77ad0923e4e java.sourceui/apichanges.xml
--- a/java.sourceui/apichanges.xml	Mon Sep 12 17:56:46 2011 +0200
+++ b/java.sourceui/apichanges.xml	Tue Sep 13 11:26:42 2011 +0200
@@ -3,7 +3,7 @@
 <!--
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
 
 Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 Other names may be trademarks of their respective owners.
@@ -30,7 +30,7 @@
 Contributor(s):
 
 The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2011 Sun
 Microsystems, Inc. All Rights Reserved.
 
 If you wish your version of this file to be governed by only the CDDL
@@ -109,6 +109,19 @@
 
     <changes>
 
+        <change id="TypeElementFinder-find">
+            <api name="general"/>
+            <summary>Added overload method for TypeElementFinder.find which allows to specify the prefilled initial text</summary>
+            <version major="1" minor="24"/>
+            <date day="20" month="9" year="2011"/>
+            <author login="jlahoda"/>
+            <compatibility addition="yes" binary="compatible" deletion="no" deprecation="no" modification="no" semantic="compatible" source="compatible"/>
+            <description>
+                Added overload method for <code>TypeElementFinder.find</code> which allows to specify the prefilled initial text.
+            </description>
+            <class package="org.netbeans.api.java.source.ui" name="TypeElementFinder"/>
+            <issue number="125811"/>
+        </change>
         <change id="ElementJavadoc-getTextAsync">
             <api name="general"/>
             <summary>Added asynchronous version of getText method into ElementJavadoc </summary>
diff -r d77ad0923e4e java.sourceui/nbproject/project.properties
--- a/java.sourceui/nbproject/project.properties	Mon Sep 12 17:56:46 2011 +0200
+++ b/java.sourceui/nbproject/project.properties	Tue Sep 13 11:26:42 2011 +0200
@@ -2,4 +2,4 @@
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.6
 javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.23.0
+spec.version.base=1.24.0
diff -r d77ad0923e4e java.sourceui/nbproject/project.xml
--- a/java.sourceui/nbproject/project.xml	Mon Sep 12 17:56:46 2011 +0200
+++ b/java.sourceui/nbproject/project.xml	Tue Sep 13 11:26:42 2011 +0200
@@ -6,6 +6,15 @@
             <code-name-base>org.netbeans.modules.java.sourceui</code-name-base>
             <module-dependencies>
                 <dependency>
+                    <code-name-base>org.netbeans.api.annotations.common</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.10</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.netbeans.api.java</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
@@ -98,7 +107,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.20</specification-version>
+                        <specification-version>1.25</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff -r d77ad0923e4e java.sourceui/src/org/netbeans/api/java/source/ui/TypeElementFinder.java
--- a/java.sourceui/src/org/netbeans/api/java/source/ui/TypeElementFinder.java	Mon Sep 12 17:56:46 2011 +0200
+++ b/java.sourceui/src/org/netbeans/api/java/source/ui/TypeElementFinder.java	Tue Sep 13 11:26:42 2011 +0200
@@ -46,6 +46,8 @@
 
 import java.util.Set;
 import javax.lang.model.element.TypeElement;
+import org.netbeans.api.annotations.common.CheckForNull;
+import org.netbeans.api.annotations.common.NullAllowed;
 import org.netbeans.api.java.source.ClassIndex;
 import org.netbeans.api.java.source.ClasspathInfo;
 import org.netbeans.api.java.source.ElementHandle;
@@ -67,14 +69,29 @@
 
     /**
      * Searches for classes on given classpath using defined restrictions.
+     *
+     * @param cpInfo classpath used for search; optional, can be null,
+     * everything available will be searched
+     * @param customizer possibility to add restrictions to search result;
+     * optional, can be null, no restriction will be applied
+     * @return found type or null if dialog was canceled
+     */
+    public static @CheckForNull ElementHandle<TypeElement> find(@NullAllowed ClasspathInfo cpInfo, @NullAllowed final Customizer customizer) {
+        return find(cpInfo, null, customizer);
+    }
+
+    /**
+     * Searches for classes on given classpath using defined restrictions.
      * 
      * @param cpInfo classpath used for search; optional, can be null,
      * everything available will be searched
+     * @param initialText text that should be prefilled in the type name text field, or null to prefill text automatically from the context
      * @param customizer possibility to add restrictions to search result; 
      * optional, can be null, no restriction will be applied
      * @return found type or null if dialog was canceled
+     * @since 1.24
      */
-    public static ElementHandle<TypeElement> find(ClasspathInfo cpInfo, final Customizer customizer) {
+    public static @CheckForNull ElementHandle<TypeElement> find(@NullAllowed ClasspathInfo cpInfo, @NullAllowed String initialText, @NullAllowed final Customizer customizer) {
 
         // create filter only if client wants to customize the result
         TypeBrowser.Filter typeBrowserFilter = null;
@@ -91,7 +108,8 @@
         }
         
         TypeDescriptor typeDescriptor = TypeBrowser.browse(
-                NbBundle.getMessage(TypeElementFinder.class, "DLG_FindType"), 
+                NbBundle.getMessage(TypeElementFinder.class, "DLG_FindType"),
+                initialText,
                 typeBrowserFilter,
                 new JavaTypeProvider(cpInfo, customizer == null ? null : customizer)
                 );