Corrected backward incompatible signature changes in 70c1065814.

core/src/main/java/hudson/ExtensionFinder.java

@@ -25,10 +25,10 @@ package hudson;
 
 import com.google.common.collect.ImmutableList;
 import hudson.init.InitMilestone;
+import hudson.model.Hudson;
 import jenkins.model.Jenkins;
 import net.java.sezpoz.Index;
 import net.java.sezpoz.IndexItem;
-import hudson.model.Descriptor;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -59,10 +59,10 @@ import java.lang.reflect.Method;
 public abstract class ExtensionFinder implements ExtensionPoint {
     /**
      * @deprecated as of 1.356
-     *      Use and implement {@link #find(Class, jenkins.model.Jenkins)} that allows us to put some metadata.
+     *      Use and implement {@link #find(Class,Hudson)} that allows us to put some metadata.
      */
     @Restricted(NoExternalUse.class)
-    public <T> Collection<T> findExtensions(Class<T> type, Jenkins hudson) {
+    public <T> Collection<T> findExtensions(Class<T> type, Hudson hudson) {
         return Collections.emptyList();
     }
 
@@ -82,15 +82,15 @@ public abstract class ExtensionFinder implements ExtensionPoint {
      * @return
      *      Can be empty but never null.
      * @since 1.356
-     *      Older implementations provide {@link #findExtensions(Class, jenkins.model.Jenkins)}
+     *      Older implementations provide {@link #findExtensions(Class,Hudson)}
      */
-    public abstract <T> Collection<ExtensionComponent<T>> find(Class<T> type, Jenkins hudson);
+    public abstract <T> Collection<ExtensionComponent<T>> find(Class<T> type, Hudson hudson);
 
     /**
      * A pointless function to work around what appears to be a HotSpot problem. See JENKINS-5756 and bug 6933067
      * on BugParade for more details.
      */
-    public <T> Collection<ExtensionComponent<T>> _find(Class<T> type, Jenkins hudson) {
+    public <T> Collection<ExtensionComponent<T>> _find(Class<T> type, Hudson hudson) {
         return find(type,hudson);
     }
 
@@ -115,7 +115,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
      * This inconsistent locking order results in a dead lock, you see.
      *
      * <p>
-     * So to reduce the likelihood, this method is called in prior to {@link #find(Class, jenkins.model.Jenkins)} invocation,
+     * So to reduce the likelihood, this method is called in prior to {@link #find(Class,Hudson)} invocation,
      * but from outside the lock. The implementation is expected to perform all the class initialization activities
      * from here.
      *
@@ -124,7 +124,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
      * Also see http://kohsuke.org/2010/09/01/deadlock-that-you-cant-avoid/ for how class initialization
      * can results in a dead lock.
      */
-    public void scout(Class extensionType, Jenkins hudson) {
+    public void scout(Class extensionType, Hudson hudson) {
     }
 
     /**
@@ -158,7 +158,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
             return indices;
         }
 
-        public <T> Collection<ExtensionComponent<T>> find(Class<T> type, Jenkins hudson) {
+        public <T> Collection<ExtensionComponent<T>> find(Class<T> type, Hudson hudson) {
             List<ExtensionComponent<T>> result = new ArrayList<ExtensionComponent<T>>();
 
             for (IndexItem<Extension,Object> item : getIndices()) {
@@ -194,7 +194,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
         }
 
         @Override
-        public void scout(Class extensionType, Jenkins hudson) {
+        public void scout(Class extensionType, Hudson hudson) {
             for (IndexItem<Extension,Object> item : getIndices()) {
                 try {
                     // we might end up having multiple threads concurrently calling into element(),