Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-43507] Fix trait drop-down list population
  • Loading branch information
stephenc committed Jun 24, 2017
1 parent 1c1c664 commit 1743eab
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
24 changes: 22 additions & 2 deletions src/main/java/jenkins/plugins/git/traits/BranchDiscoveryTrait.java
Expand Up @@ -25,11 +25,15 @@

import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import jenkins.plugins.git.GitSCMBuilder;
import jenkins.plugins.git.GitSCMSource;
import jenkins.plugins.git.GitSCMSourceContext;
import jenkins.scm.api.SCMHead;
import jenkins.scm.api.SCMHeadCategory;
import jenkins.scm.api.SCMHeadOrigin;
import jenkins.scm.api.SCMRevision;
import jenkins.scm.api.SCMSource;
import jenkins.scm.api.trait.SCMBuilder;
import jenkins.scm.api.trait.SCMHeadAuthority;
import jenkins.scm.api.trait.SCMHeadAuthorityDescriptor;
import jenkins.scm.api.trait.SCMSourceContext;
Expand Down Expand Up @@ -89,8 +93,24 @@ public String getDisplayName() {
* {@inheritDoc}
*/
@Override
public boolean isApplicableToContext(@NonNull Class<? extends SCMSourceContext> contextClass) {
return GitSCMSourceContext.class.isAssignableFrom(contextClass);
public Class<? extends SCMBuilder> getBuilderClass() {
return GitSCMBuilder.class;
}

/**
* {@inheritDoc}
*/
@Override
public Class<? extends SCMSourceContext> getContextClass() {
return GitSCMSourceContext.class;
}

/**
* {@inheritDoc}
*/
@Override
public Class<? extends SCMSource> getSourceClass() {
return GitSCMSource.class;
}
}

Expand Down
Expand Up @@ -169,14 +169,6 @@ public Class<? extends SCMBuilder> getBuilderClass() {
return GitSCMBuilder.class;
}

/**
* {@inheritDoc}
*/
@Override
public Class<? extends SCMSourceContext> getContextClass() {
return GitSCMSourceContext.class;
}

/**
* {@inheritDoc}
*/
Expand Down

0 comments on commit 1743eab

Please sign in to comment.