Merge pull request #150 from bitwiseman/JENKINS-54992

[JENKINS-54992] Do not override pronoun on projects only on their scan
jenkinsci · Apr 17, 2019 · ac54352 · ac54352
2 parents f1ba42f + b050869
commit ac54352
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/jenkins/branch/MultiBranchProject.java b/src/main/java/jenkins/branch/MultiBranchProject.java
@@ -302,18 +302,18 @@ public String getIconClassName() {
  }
 
  /**
- * {@inheritDoc}
+ * Get the term used in the UI to represent the souce for this kind of
+ * {@link Item}. Must start with a capital letter.
  */
- @Override
- public String getPronoun() {
+ public String getSourcePronoun() {
  Set<String> result = new TreeSet<>();
  for (BranchSource source : sources) {
  String pronoun = Util.fixEmptyAndTrim(source.getSource().getPronoun());
  if (pronoun != null) {
  result.add(pronoun);
  }
  }
- return result.isEmpty() ? super.getPronoun() : StringUtils.join(result, " / ");
+ return result.isEmpty() ? this.getPronoun() : StringUtils.join(result, " / ");
  }
 
  /**
@@ -993,7 +993,7 @@ public File getLogFile() {
  */
  @Override
  public String getDisplayName() {
- return Messages.MultiBranchProject_BranchIndexing_displayName(getParent().getPronoun());
+ return Messages.MultiBranchProject_BranchIndexing_displayName(getParent().getSourcePronoun());
  }
 
  /**

diff --git a/src/main/java/jenkins/branch/OrganizationFolder.java b/src/main/java/jenkins/branch/OrganizationFolder.java
@@ -533,18 +533,18 @@ public String getIconClassName() {
  }
 
  /**
- * {@inheritDoc}
+ * Get the term used in the UI to represent the souce for this kind of
+ * {@link Item}. Must start with a capital letter.
  */
- @Override
- public String getPronoun() {
+ public String getSourcePronoun() {
  Set<String> result = new TreeSet<>();
  for (SCMNavigator navigator: navigators) {
  String pronoun = Util.fixEmptyAndTrim(navigator.getPronoun());
  if (pronoun != null) {
  result.add(pronoun);
  }
  }
- return result.isEmpty() ? super.getPronoun() : StringUtils.join(result, " / ");
+ return result.isEmpty() ? this.getPronoun() : StringUtils.join(result, " / ");
  }
 
  /**
@@ -922,7 +922,7 @@ public OrganizationScan(OrganizationFolder folder, FolderComputation<MultiBranch
  */
  @Override
  public String getDisplayName() {
- return Messages.OrganizationFolder_OrganizationScan_displayName(getParent().getPronoun());
+ return Messages.OrganizationFolder_OrganizationScan_displayName(((OrganizationFolder)getParent()).getSourcePronoun());
  }
 
  @Override