Merge branch 'add-icons-to-command-palette' of github.com:janfaracik/…

…jenkins into add-icons-to-command-palette
janfaracik · Dec 11, 2024 · 1b9faa8 · 1b9faa8
2 parents d6868c9 + 2673844
commit 1b9faa8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
@@ -1109,11 +1109,6 @@ public String getSearchUrl() {
         return getUrl();
     }
 
-    @Override
-    public String getSearchIcon() {
-        return this.getIconClassName();
-    }
-
     /**
      * {@link RetentionStrategy} associated with this computer.
      *

diff --git a/core/src/main/java/jenkins/model/IComputer.java b/core/src/main/java/jenkins/model/IComputer.java
@@ -35,6 +35,7 @@
 import jenkins.agents.IOfflineCause;
 import org.jenkins.ui.icon.Icon;
 import org.jenkins.ui.icon.IconSet;
+import org.jenkins.ui.icon.IconSpec;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.Beta;
 
@@ -44,7 +45,7 @@
  * @since 2.480
  */
 @Restricted(Beta.class)
-public interface IComputer extends AccessControlled {
+public interface IComputer extends AccessControlled, IconSpec {
     /**
      * Returns {@link Node#getNodeName() the name of the node}.
      */