From d982647de21b43b9221d2c1720a1413b46536fc4 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 19 Mar 2016 14:03:12 -0700 Subject: [PATCH] Field descriptor fixup --- .../node_monitors/TemporarySpaceMonitor.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java b/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java index 07e99b8866..65cd414469 100644 --- a/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java +++ b/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java @@ -61,7 +61,18 @@ public class TemporarySpaceMonitor extends AbstractDiskSpaceMonitor { return Jenkins.getInstance().hasPermission(Jenkins.ADMINISTER) ? super.getColumnCaption() : null; } - public static final DiskSpaceMonitorDescriptor DESCRIPTOR = new DiskSpaceMonitorDescriptor() { + /** + * @deprecated as of 2.0 + * Use injection + */ + public static /*almost final*/ DiskSpaceMonitorDescriptor DESCRIPTOR; + + @Extension + public static class DescriptorImpl extends DiskSpaceMonitorDescriptor { + public DescriptorImpl() { + DESCRIPTOR = this; + } + public String getDisplayName() { return Messages.TemporarySpaceMonitor_DisplayName(); } @@ -76,9 +87,11 @@ public class TemporarySpaceMonitor extends AbstractDiskSpaceMonitor { return p.asCallableWith(new GetTempSpace()); } - }; + } - @Extension + /** + * @deprecated as of 2.0 + */ public static DiskSpaceMonitorDescriptor install() { return DESCRIPTOR; } -- GitLab