From b578b67f8c2e161c2bf5d3663a538833958f3d09 Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@github.com>
Date: Mon, 30 Jun 2014 01:26:56 +0200
Subject: [PATCH] Reuse Computer.getUrl() for ModelHyperlinkNote and
 getSearchUrl()s

---
 .../main/java/hudson/console/ModelHyperlinkNote.java | 12 ++++++------
 core/src/main/java/hudson/model/Computer.java        |  4 ++--
 core/src/main/java/hudson/model/Node.java            | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/hudson/console/ModelHyperlinkNote.java b/core/src/main/java/hudson/console/ModelHyperlinkNote.java
index 1e73056ddf..5e415b58bb 100644
--- a/core/src/main/java/hudson/console/ModelHyperlinkNote.java
+++ b/core/src/main/java/hudson/console/ModelHyperlinkNote.java
@@ -1,11 +1,7 @@
 package hudson.console;
 
 import hudson.Extension;
-import hudson.model.Item;
-import hudson.model.ModelObject;
-import hudson.model.Node;
-import hudson.model.Run;
-import hudson.model.User;
+import hudson.model.*;
 import jenkins.model.Jenkins;
 
 import java.io.IOException;
@@ -50,8 +46,12 @@ public class ModelHyperlinkNote extends HyperlinkNote {
     }
 
     public static String encodeTo(Node node) {
+        Computer c = node.toComputer();
+        if (c != null) {
+            return encodeTo("/" + c.getUrl(), node.getDisplayName());
+        }
         String nodePath = node == Jenkins.getInstance() ? "(master)" : node.getNodeName();
-        return encodeTo("/computer/"+ nodePath, node.getDisplayName());
+        return encodeTo("/computer/" + nodePath, node.getDisplayName());
     }
 
     public static String encodeTo(String url, String text) {
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index d47ec82447..cfb6ce5d05 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -626,7 +626,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     }
 
     public String getUrl() {
-        return "computer/" + Util.rawEncode(getDisplayName()) + "/";
+        return "computer/" + Util.rawEncode(getName()) + "/";
     }
 
     /**
@@ -865,7 +865,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     }
 
     public String getSearchUrl() {
-        return "computer/"+nodeName;
+        return getUrl();
     }
 
     /**
diff --git a/core/src/main/java/hudson/model/Node.java b/core/src/main/java/hudson/model/Node.java
index fe9fbe0841..9e63422d54 100644
--- a/core/src/main/java/hudson/model/Node.java
+++ b/core/src/main/java/hudson/model/Node.java
@@ -25,11 +25,7 @@
 package hudson.model;
 
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import hudson.Extension;
-import hudson.ExtensionPoint;
-import hudson.FilePath;
-import hudson.FileSystemProvisioner;
-import hudson.Launcher;
+import hudson.*;
 import hudson.model.Descriptor.FormException;
 import hudson.model.Queue.Task;
 import hudson.model.labels.LabelAtom;
@@ -103,7 +99,11 @@ public abstract class Node extends AbstractModelObject implements Reconfigurable
     }
 
     public String getSearchUrl() {
-        return "computer/"+getNodeName();
+        Computer c = toComputer();
+        if (c != null) {
+            return c.getUrl();
+        }
+        return "computer/" + Util.rawEncode(getNodeName());
     }
 
     public boolean isHoldOffLaunchUntilSave() {
-- 
GitLab