search index should include m2 modules.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@4751 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/maven/MavenModuleSet.java

@@ -211,10 +211,10 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
     @Override
     protected SearchIndexBuilder makeSearchIndex() {
         return super.makeSearchIndex()
-            .add(new CollectionSearchIndex() {// for computers
+            .add(new CollectionSearchIndex<MavenModule>() {// for computers
                 protected MavenModule get(String key) {
                     for (MavenModule m : modules.values()) {
-                        if(m.getName().equals(key))
+                        if(m.getDisplayName().equals(key))
                             return m;
                     }
                     return null;
@@ -222,6 +222,9 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
                 protected Collection<MavenModule> all() {
                     return modules.values();
                 }
+                protected String getName(MavenModule o) {
+                    return o.getName();
+                }
             });
     }
 

core/src/main/java/hudson/search/CollectionSearchIndex.java

@@ -9,7 +9,7 @@ import java.util.Map;
  * 
  * @author Kohsuke Kawaguchi
  */
-public abstract class CollectionSearchIndex implements SearchIndex {
+public abstract class CollectionSearchIndex<SMT extends SearchableModelObject> implements SearchIndex {
     /**
      * Gets a single item that exactly matches the given key.
      */
@@ -19,7 +19,7 @@ public abstract class CollectionSearchIndex implements SearchIndex {
      * Returns all items in the map.
      * The collection can include null items.
      */
-    protected abstract Collection<? extends SearchableModelObject> all();
+    protected abstract Collection<SMT> all();
 
     public void find(String token, List<SearchItem> result) {
         SearchItem p = get(token);
@@ -28,11 +28,15 @@ public abstract class CollectionSearchIndex implements SearchIndex {
     }
 
     public void suggest(String token, List<SearchItem> result) {
-        Collection<? extends SearchableModelObject> items = all();
+        Collection<SMT> items = all();
         if(items==null)     return;
-        for (SearchableModelObject o : items) {
-            if(o!=null && o.getDisplayName().contains(token))
+        for (SMT o : items) {
+            if(o!=null && getName(o).contains(token))
                 result.add(o);
         }
     }
+
+    protected String getName(SMT o) {
+        return o.getDisplayName();
+    }
 }