[FIXED JENKINS-28011] Using the standard f:dropdownDescriptorSelector.

jenkinsci · Apr 20, 2015 · e1a8809 · e1a8809
1 parent d574c00
commit e1a8809
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/hudson/plugins/copyartifact/CopyArtifact.java b/src/main/java/hudson/plugins/copyartifact/CopyArtifact.java
@@ -26,7 +26,6 @@
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 
 import hudson.AbortException;
-import hudson.DescriptorExtensionList;
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
@@ -268,10 +267,15 @@ public String getParameters() {
         return parameters;
     }
 
+    @Deprecated
     public BuildSelector getBuildSelector() {
         return selector;
     }
 
+    public BuildSelector getSelector() {
+        return selector;
+    }
+
     public String getFilter() {
         return filter;
     }
@@ -523,9 +527,6 @@ public String getDisplayName() {
             return Messages.CopyArtifact_DisplayName();
         }
 
-        public DescriptorExtensionList<BuildSelector,Descriptor<BuildSelector>> getBuildSelectors() {
-            return Hudson.getInstance().<BuildSelector,Descriptor<BuildSelector>>getDescriptorList(BuildSelector.class);
-        }
     }
 
     // Listen for project renames and update property here if needed.

diff --git a/src/main/resources/hudson/plugins/copyartifact/CopyArtifact/config.jelly b/src/main/resources/hudson/plugins/copyartifact/CopyArtifact/config.jelly
@@ -26,8 +26,7 @@ THE SOFTWARE.
   <f:entry title="${%Project name}" field="projectName">
     <f:editableComboBox items="${app.topLevelItemNames}" clazz="setting-input"/>
   </f:entry>
-  <ca:selectorList currentSelector="${instance.buildSelector}"
-      name="selector" title="${%Which build}"/>
+  <f:dropdownDescriptorSelector field="selector" title="${%Which build}"/>
   <f:entry title="${%Artifacts to copy}" field="filter">
     <f:textbox/>
   </f:entry>

diff --git a/src/test/java/hudson/plugins/copyartifact/CopyArtifactTest.java b/src/test/java/hudson/plugins/copyartifact/CopyArtifactTest.java
@@ -1160,7 +1160,6 @@ public void testFieldValidation() throws Exception {
         // Other descriptor methods
         assertTrue(descriptor.isApplicable(null));
         assertTrue(descriptor.getDisplayName().length() > 0);
-        assertTrue(descriptor.getBuildSelectors().size() > 0);
     }
 
     @LocalData