Merge pull request #178 from res0nance/override-todo

Fix some override TODOs

src/main/java/jenkins/branch/CustomOrganizationFolderDescriptor.java

@@ -79,34 +79,25 @@ public String getDisplayName() {
     }
 
     /**
-     * Needed if it wants SCMNavigator implementations are categorized in Jenkins 2.x.
-     *
-     * TODO: Override when the baseline is upgraded to 2.x
-     *
-     * @return A string with the Item description.
+     * {@inheritDoc}
      */
+    @Override
     public String getDescription() {
         return delegate.getDescription();
     }
 
     /**
-     * Needed if it wants SCMNavigator implementations are categorized in Jenkins 2.x.
-     *
-     * TODO: Override when the baseline is upgraded to 2.x
-     *
-     * @return A string it represents a ItemCategory identifier.
+     * {@inheritDoc}
      */
+    @Override
     public String getCategoryId() {
         return delegate.getCategoryId();
     }
 
     /**
-     * Needed if it wants SCMNavigator implementations are categorized in Jenkins 2.x.
-     *
-     * TODO: Override when the baseline is upgraded to 2.x
-     *
-     * @return A string it represents a URL pattern to get the Item icon in different sizes.
+     * {@inheritDoc}
      */
+    @Override
     public String getIconFilePathPattern() {
         return delegate.getIconFilePathPattern();
     }

src/main/java/jenkins/branch/MultiBranchProject.java

@@ -2369,7 +2369,11 @@ public final XmlFile getStateFile() {
      */
     @Extension
     public static class CopyItemVeto extends ItemListener {
-        //@Override // TODO once Jenkins 2.51+ which has JENKINS-34691 merged
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
         public void onCheckCopy(Item item, ItemGroup parent) throws Failure {
             if (item.getParent() instanceof MultiBranchProject) {
                 throw new Failure(Messages.MultiBranchProject_CopyItemVeto_reason());