Skip to content

Commit

Permalink
Merge branch 'JENKINS-33808' of github.com:recena/branch-api-plugin i…
Browse files Browse the repository at this point in the history
…nto JENKINS-33808
  • Loading branch information
recena committed Apr 11, 2016
2 parents 65d718b + 2fd013c commit ac53bac
Showing 1 changed file with 5 additions and 5 deletions.
Expand Up @@ -59,19 +59,19 @@ public class CustomOrganizationFolderDescriptor extends TopLevelItemDescriptor {
super(TopLevelItem.class); // do not register as OrganizationFolder
this.delegate = delegate;
}

@Override
public String getId() {
return OrganizationFolder.class.getName() + "." + delegate.getId(); // must be distinct from OrganizationFolder.DescriptorImpl
}

@Override
public String getDisplayName() {
return delegate.getDisplayName();
}

/**
* Needed if it wants SCMNavigatorDescriptor implementations are categorized in Jenkins 2.x.
* Needed if it wants SCMNavigator implementations are categorized in Jenkins 2.x.
*
* TODO: Override when the baseline is upgraded to 2.x
*
Expand All @@ -82,7 +82,7 @@ public String getDescription() {
}

/**
* Needed if it wants SCMNavigatorDescriptor implementations are categorized in Jenkins 2.x.
* Needed if it wants SCMNavigator implementations are categorized in Jenkins 2.x.
*
* TODO: Override when the baseline is upgraded to 2.x
*
Expand All @@ -93,7 +93,7 @@ public String getCategoryId() {
}

/**
* Needed if it wants SCMNavigatorDescriptor implementations are categorized in Jenkins 2.x.
* Needed if it wants SCMNavigator implementations are categorized in Jenkins 2.x.
*
* TODO: Override when the baseline is upgraded to 2.x
*
Expand Down

0 comments on commit ac53bac

Please sign in to comment.