From 48cb1304c5c4138c97d6817f68c30a50e447ee35 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Tue, 4 Feb 2014 15:25:31 +0100
Subject: [PATCH] Removed "Jenkins" prefix from plugin display names.

Since sorting of plugins in the update manager is based on displayName
this name should not have a common prefix otherwise it's hard to find
a given plugin name.
---
 core/src/main/java/hudson/PluginWrapper.java             | 3 ++-
 core/src/main/java/hudson/model/UpdateSite.java          | 9 +++++++--
 .../main/resources/hudson/PluginManager/installed.jelly  | 2 +-
 test/src/main/resources/plugins/tasks-update-center.json | 2 +-
 test/src/test/java/hudson/model/UpdateSiteTest.java      | 3 +++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java
index 9ac22a3eab..870930f7de 100644
--- a/core/src/main/java/hudson/PluginWrapper.java
+++ b/core/src/main/java/hudson/PluginWrapper.java
@@ -45,6 +45,7 @@ import java.util.jar.Manifest;
 import java.util.logging.Logger;
 import static java.util.logging.Level.WARNING;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.LogFactory;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
@@ -213,7 +214,7 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
     }
 
     public String getDisplayName() {
-        return getLongName();
+        return StringUtils.removeStart(getLongName(), "Jenkins ");
     }
 
     public Api getApi() {
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 470ecaccab..8966234e6c 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -40,6 +40,7 @@ import jenkins.model.Jenkins;
 import jenkins.util.JSONSignatureValidator;
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
@@ -637,8 +638,12 @@ public class UpdateSite {
         }
 
         public String getDisplayName() {
-            if(title!=null) return title;
-            return name;
+            String displayName;
+            if(title!=null)
+                displayName = title;
+            else
+                displayName = name;
+            return StringUtils.removeStart(displayName, "Jenkins ");
         }
 
         /**
diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly
index 3900d7ed42..8464c812b3 100644
--- a/core/src/main/resources/hudson/PluginManager/installed.jelly
+++ b/core/src/main/resources/hudson/PluginManager/installed.jelly
@@ -63,7 +63,7 @@ THE SOFTWARE.
                 <td class="pane">
                   <div>
                     <a href="${p.url}">
-                      ${p.updateInfo.title?:p.longName}
+                      ${p.updateInfo.displayName?:p.displayName}
                     </a>
                   </div>
                   <div class="excerpt">
diff --git a/test/src/main/resources/plugins/tasks-update-center.json b/test/src/main/resources/plugins/tasks-update-center.json
index dd5468496c..092d90d382 100644
--- a/test/src/main/resources/plugins/tasks-update-center.json
+++ b/test/src/main/resources/plugins/tasks-update-center.json
@@ -16,7 +16,7 @@ updateCenter.post(
             "name": "tasks",
             "requiredCore": "1.264",
             "sha1": "wtzlciUKiMcg90H5CTYkGX6+r8Y=",
-            "title": "Hudson Task Scanner Plug-in",
+            "title": "Jenkins Task Scanner Plug-in",
             "url": "tasks.jpi",
             "version": "2.23"
         },
diff --git a/test/src/test/java/hudson/model/UpdateSiteTest.java b/test/src/test/java/hudson/model/UpdateSiteTest.java
index b75d479eeb..b609be6205 100644
--- a/test/src/test/java/hudson/model/UpdateSiteTest.java
+++ b/test/src/test/java/hudson/model/UpdateSiteTest.java
@@ -116,6 +116,9 @@ public class UpdateSiteTest {
         assertEquals(new HashSet<String>(Arrays.asList("tasks", "dummy")), data.plugins.keySet());
         assertEquals(new URL(url, "tasks.jpi").toString(), data.plugins.get("tasks").url);
         assertEquals("http://nowhere.net/dummy.hpi", data.plugins.get("dummy").url);
+
+        UpdateSite.Plugin tasksPlugin = data.plugins.get("tasks");
+        assertEquals("Wrong name of plugin found", "Task Scanner Plug-in", tasksPlugin.getDisplayName());
     }
 
     @Test public void updateDirectlyWithJson() throws Exception {
-- 
GitLab