From c8e1be6df5b79b20eabf36bee94e474dc506e23b Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 5 Aug 2013 14:53:40 -0400
Subject: [PATCH] Follow-ups to #893 (search improvements for folders).

---
 changelog.html                                      |  1 +
 core/src/main/java/hudson/search/Search.java        |  4 ++--
 core/src/main/java/hudson/search/SuggestedItem.java | 11 +----------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/changelog.html b/changelog.html
index 26a7931175..d58bcb396a 100644
--- a/changelog.html
+++ b/changelog.html
@@ -64,6 +64,7 @@ Upcoming changes</a>
   <li class=rfe>
     Improve search to locate items inside folders.
     (<a href="https://github.com/jenkinsci/jenkins/pull/848">pull request 848</a>)
+    (<a href="https://github.com/jenkinsci/jenkins/pull/893">pull request 893</a>)
   <li class=bug>
     Windows path separators not correctly escaped in Maven properties configuration.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10539">issue 10539</a>)
diff --git a/core/src/main/java/hudson/search/Search.java b/core/src/main/java/hudson/search/Search.java
index b70168ad00..f6f5d1051a 100644
--- a/core/src/main/java/hudson/search/Search.java
+++ b/core/src/main/java/hudson/search/Search.java
@@ -247,7 +247,7 @@ public class Search {
     /**
      * Performs a search and returns the match, or null if no match was found
      * or more than one match was found.
-     * @since XXX
+     * @since 1.527
      */
     public static SuggestedItem find(SearchIndex index, String query, SearchableModelObject searchContext) {
         List<SuggestedItem> r = find(Mode.FIND, index, query, searchContext);
@@ -274,7 +274,7 @@ public class Search {
     }
 
     /**
-     * @since XXX
+     * @since 1.527
      */
     public static List<SuggestedItem> suggest(SearchIndex index, final String tokenList, SearchableModelObject searchContext) {
 
diff --git a/core/src/main/java/hudson/search/SuggestedItem.java b/core/src/main/java/hudson/search/SuggestedItem.java
index 7431c9dc6d..1dbcad9c3d 100644
--- a/core/src/main/java/hudson/search/SuggestedItem.java
+++ b/core/src/main/java/hudson/search/SuggestedItem.java
@@ -88,20 +88,11 @@ public class SuggestedItem {
         return new SuggestedItem(top);
     }
     
-    /**
-     * @since 1.527
-     * @deprecated Use {@link SuggestedItem#build(SearchableModelObject, SearchItem) instead.}
-     */
-    @Deprecated
-    public static SuggestedItem build(SearchItem si) {
-        return build(null, si);
-    }
-    
     /**
      * Given a SearchItem, builds a SuggestedItem hierarchy by looking up parent items (if applicable).
      * This allows search results for items not contained within the same {@link ItemGroup} to be distinguished.
      * If provided searchContext is null, results will be interpreted from the root {@link jenkins.model.Jenkins} object
-     * @since XXX
+     * @since 1.527
      */
     public static SuggestedItem build(SearchableModelObject searchContext, SearchItem si) {
         if (si instanceof Item) {
-- 
GitLab