Merge pull request #35 from mjdetullio/JENKINS-32178

[JENKINS-32178] Fix broken links to branches from custom views
jenkinsci · May 25, 2016 · c478564 · c478564
2 parents 394c563 + 02e6a00
commit c478564
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/src/main/java/jenkins/branch/MultiBranchProject.java b/src/main/java/jenkins/branch/MultiBranchProject.java
@@ -420,7 +420,9 @@ public P getItem(String name) {
      *
      * @param name the name of the branch
      * @return the named branch job or {@code null} if no such branch exists.
+     * @deprecated use {@link #getItem(String)} or {@link #getJob(String)} directly
      */
+    @Deprecated
     @CheckForNull
     @SuppressWarnings("unused")// by stapler for URL binding
     public P getBranch(String name) {
@@ -452,15 +454,6 @@ public boolean hasPermission(Authentication a, Permission permission) {
     }
     private static final Set<Permission> SUPPRESSED_PERMISSIONS = ImmutableSet.of(Item.CONFIGURE, Item.DELETE, View.CONFIGURE, View.CREATE, View.DELETE);
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @NonNull
-    public String getUrlChildPrefix() {
-        return "branch";
-    }
-
     /**
      * {@inheritDoc}
      */