if there's only one installation, better to resolve to that one.

After all, that's the installation the user is most likely going to choose, and if there's only one installation.

Plus when there's only one installation, there's no drop-down to select the Maven installation in the config UI, so the user is asked to do a rather unnatural "open config page" > "just click save" workflow.
This commit is contained in:
Kohsuke Kawaguchi committed 2012-12-06 09:01:47 -08:00
1 parent a2a398ed0c
commit b89b4ddedf
1 file changed
+7 -4
@@ -373,7 +373,7 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
* Use {@link #MavenModuleSet(ItemGroup, String)}
*/
public MavenModuleSet(String name) {
this(Jenkins.getInstance(),name);
this(Jenkins.getInstance(), name);
}
public MavenModuleSet(ItemGroup parent, String name) {
@@ -1042,10 +1042,13 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
* If null, we pick any random Maven installation.
*/
public MavenInstallation getMaven() {
for( MavenInstallation i : DESCRIPTOR.getMavenDescriptor().getInstallations() ) {
MavenInstallation[] installations = DESCRIPTOR.getMavenDescriptor().getInstallations();
for( MavenInstallation i : installations) {
if(mavenName==null || i.getName().equals(mavenName))
return i;
}
if (installations.length==1)
return installations[0];
return null;
}
@@ -1129,10 +1132,10 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
archivingDisabled = req.hasParameter("maven.archivingDisabled");
resolveDependencies = req.hasParameter( "maven.resolveDependencies" );
processPlugins = req.hasParameter( "maven.processPlugins" );
mavenValidationLevel = NumberUtils.toInt( req.getParameter( "maven.validationLevel" ), -1 );
mavenValidationLevel = NumberUtils.toInt(req.getParameter("maven.validationLevel"), -1);
reporters.rebuild(req,json,MavenReporters.getConfigurableList());
publishers.rebuildHetero(req, json, Publisher.all(), "publisher");
buildWrappers.rebuild(req,json,BuildWrappers.getFor(this));
buildWrappers.rebuild(req, json, BuildWrappers.getFor(this));
disableTriggerDownstreamProjects = req.hasParameter("maven.disableTriggerDownstreamProjects");
runPostStepsIfResult = Result.fromString(req.getParameter( "post-steps.runIfResult"));