Merge pull request #510 from basil/override

Prepare for removal of `recordLegacyName`

Author: jglick

src/main/java/jenkins/branch/MultiBranchProjectDescriptor.java

@@ -264,7 +264,7 @@ public String dirNameFromLegacy(@NonNull MultiBranchProject<P, R> parent, @NonNu
             return NameMangler.apply(NameEncoder.decode(legacyDirName));
         }
 
-        @Override
+        // TODO remove after it is removed in cloudbees-folder
         public void recordLegacyName(MultiBranchProject<P, R> parent, P item, String legacyDirName) throws IOException {
             // no-op because we already tracked the name in Branch.getName()
         }

src/main/java/jenkins/branch/OrganizationFolder.java

@@ -885,7 +885,7 @@ public String dirNameFromLegacy(@NonNull OrganizationFolder parent, @NonNull Str
             return NameMangler.apply(NameEncoder.decode(legacyDirName));
         }
 
-        @Override
+        // TODO remove after it is removed in cloudbees-folder
         public void recordLegacyName(OrganizationFolder parent, MultiBranchProject<?, ?> item, String legacyDirName)
                 throws IOException {
             item.addProperty(new ProjectNameProperty(legacyDirName));