From f9cf329ec8f5feddd2ae2d81398c4ea6bf1df175 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Thu, 20 Aug 2009 00:30:01 +0000
Subject: [PATCH] removed the Computer parameter as requested by lifeless.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20946 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../main/java/hudson/model/DynamicLabels.java   |  3 +--
 .../src/main/java/hudson/tasks/LabelFinder.java | 17 ++++-------------
 .../java/hudson/tasks/labelers/OSLabeler.java   |  5 ++---
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/hudson/model/DynamicLabels.java b/core/src/main/java/hudson/model/DynamicLabels.java
index d76fd52f6d..a6ceb2e003 100644
--- a/core/src/main/java/hudson/model/DynamicLabels.java
+++ b/core/src/main/java/hudson/model/DynamicLabels.java
@@ -24,7 +24,6 @@
 
 package hudson.model;
 
-import hudson.remoting.VirtualChannel;
 import hudson.tasks.LabelFinder;
 import java.util.HashSet;
 import java.util.Set;
@@ -70,7 +69,7 @@ public final class DynamicLabels {
 
         Set<Label> r = new HashSet<Label>();
         for (LabelFinder labeler : LabelFinder.all())
-            for (String label : labeler.findLabels(c.getNode(),c))
+            for (String label : labeler.findLabels(c.getNode()))
                 r.add(Hudson.getInstance().getLabel(label));
         return r;
     }
diff --git a/core/src/main/java/hudson/tasks/LabelFinder.java b/core/src/main/java/hudson/tasks/LabelFinder.java
index aecec9dfd5..8a321c1cfb 100644
--- a/core/src/main/java/hudson/tasks/LabelFinder.java
+++ b/core/src/main/java/hudson/tasks/LabelFinder.java
@@ -23,19 +23,12 @@
  */
 package hudson.tasks;
 
-import hudson.ExtensionListView;
-import hudson.ExtensionPoint;
-import hudson.ExtensionList;
-import hudson.UDPBroadcastFragment;
 import hudson.Extension;
-import hudson.model.Label;
-import hudson.model.Node;
-import hudson.model.Computer;
+import hudson.ExtensionList;
+import hudson.ExtensionPoint;
 import hudson.model.Hudson;
-import hudson.remoting.VirtualChannel;
+import hudson.model.Node;
 
-import java.util.List;
-import java.util.Set;
 import java.util.Collection;
 
 /**
@@ -62,10 +55,8 @@ public abstract class LabelFinder implements ExtensionPoint {
      *
      * @param node
      *      The node that receives labels. Never null.
-     * @param c
-     *      Computer that corresponds to the given node. This parameter is passed in for your convenience. Never null.
      * @return
      *      A set of labels to be added dynamically to the node. Can be empty but never null.
      */
-    public abstract Collection<String> findLabels(Node node, Computer c);
+    public abstract Collection<String> findLabels(Node node);
 }
diff --git a/core/src/main/java/hudson/tasks/labelers/OSLabeler.java b/core/src/main/java/hudson/tasks/labelers/OSLabeler.java
index 3ae384170a..5d60c3e201 100644
--- a/core/src/main/java/hudson/tasks/labelers/OSLabeler.java
+++ b/core/src/main/java/hudson/tasks/labelers/OSLabeler.java
@@ -25,7 +25,6 @@ package hudson.tasks.labelers;
 
 import hudson.remoting.Callable;
 import hudson.tasks.LabelFinder;
-import hudson.model.Computer;
 import hudson.model.Node;
 
 import java.util.Collections;
@@ -42,9 +41,9 @@ import java.util.Set;
  */
 // @Extension --- not live yet
 public class OSLabeler extends LabelFinder {
-    public Set<String> findLabels(Node node, Computer computer) {
+    public Set<String> findLabels(Node node) {
         try {
-            return computer.getChannel().call(new OSLabelFinder());
+            return node.getChannel().call(new OSLabelFinder());
         } catch (Exception e) {
             return Collections.emptySet();
         }