提交 2a30cc36 编写于 作者: K Kohsuke Kawaguchi

a few more follow up Hudson->Jenkins changes

上级 d5c24703
......@@ -684,7 +684,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable {
private List<String> getPossibleViewNames(String baseName) {
List<String> names = new ArrayList<String>();
for (Facet f : WebApp.get(Hudson.getInstance().servletContext).facets) {
for (Facet f : WebApp.get(Jenkins.getInstance().servletContext).facets) {
if (f instanceof JellyCompatibleFacet) {
JellyCompatibleFacet jcf = (JellyCompatibleFacet) f;
names.add(baseName +jcf.getDefaultScriptExtension());
......
......@@ -79,7 +79,7 @@ public class Hudson extends Jenkins {
public Hudson(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
super(root, context, pluginManager);
}
}
/**
* Gets all the installed {@link ItemListener}s.
......
......@@ -28,6 +28,7 @@ import hudson.ExtensionPoint;
import hudson.model.Hudson;
import hudson.remoting.Callable;
import hudson.remoting.Channel;
import jenkins.model.Jenkins;
import org.dom4j.io.SAXReader;
import java.io.IOException;
......@@ -67,13 +68,13 @@ public abstract class ParserConfigurator implements ExtensionPoint, Serializable
* Returns all the registered {@link ParserConfigurator}s.
*/
public static ExtensionList<ParserConfigurator> all() {
return Hudson.getInstance().getExtensionList(ParserConfigurator.class);
return Jenkins.getInstance().getExtensionList(ParserConfigurator.class);
}
public static void applyConfiguration(SAXReader reader, Object context) throws IOException, InterruptedException {
Collection<ParserConfigurator> all = Collections.emptyList();
if (Hudson.getInstance()==null) {
if (Jenkins.getInstance()==null) {
Channel ch = Channel.current();
if (ch!=null)
all = ch.call(new Callable<Collection<ParserConfigurator>, IOException>() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册