提交 bd8b38d7 编写于 作者: C Christoph Kutzinski

Use getFullName() instead of toString() when proposing nearest job name...

Use getFullName() instead of toString() when proposing nearest job name matches (based on pull request https://github.com/jenkinsci/jenkins/pull/290)
上级 eb899712
......@@ -39,6 +39,7 @@ import org.kohsuke.MetaInfServices;
* @author Kohsuke Kawaguchi
*/
@MetaInfServices
@SuppressWarnings("rawtypes")
public class AbstractProjectOptionHandler extends OptionHandler<AbstractProject> {
public AbstractProjectOptionHandler(CmdLineParser parser, OptionDef option, Setter<AbstractProject> setter) {
super(parser, option, setter);
......@@ -53,7 +54,7 @@ public class AbstractProjectOptionHandler extends OptionHandler<AbstractProject>
if (s==null) {
AbstractProject nearest = AbstractProject.findNearest(src);
if (nearest!=null)
throw new CmdLineException(owner, "No such job '"+src+"' perhaps you meant "+ nearest +"?");
throw new CmdLineException(owner, "No such job '"+src+"' perhaps you meant '"+ nearest.getFullName() +"'?");
else
throw new CmdLineException(owner, "No such job '"+src+"'");
}
......
......@@ -23,13 +23,20 @@ public class TopLevelItemOptionHandler extends OptionHandler<TopLevelItem> {
}
@Override
@SuppressWarnings("rawtypes")
public int parseArguments(Parameters params) throws CmdLineException {
Jenkins h = Jenkins.getInstance();
String src = params.getParameter(0);
TopLevelItem s = h.getItem(src);
if (s==null)
throw new CmdLineException(owner, "No such job '"+src+"' perhaps you meant "+ AbstractProject.findNearest(src)+"?");
if (s==null) {
AbstractProject nearest = AbstractProject.findNearest(src);
if (nearest!=null)
throw new CmdLineException(owner, "No such job '"+src+"' perhaps you meant '"+ nearest.getFullName() +"'?");
else
throw new CmdLineException(owner, "No such job '"+src+"'");
}
setter.addValue(s);
return 1;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册