From 8e6a3f7f03c8cdd93f1fb352088bac9cd2676c49 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Wed, 24 Apr 2013 12:00:58 -0700
Subject: [PATCH] Converted the build queue and executors into Widgets.

---
 core/src/main/java/hudson/widgets/Widget.java  |  3 +++
 .../java/jenkins/widgets/BuildQueueWidget.java | 18 ++++++++++++++++++
 .../java/jenkins/widgets/ExecutorsWidget.java  | 17 +++++++++++++++++
 .../hudson/model/View/sidepanel.jelly          |  3 +--
 .../jenkins/model/Jenkins/sidepanel.jelly      |  2 +-
 .../widgets/BuildQueueWidget/index.groovy      |  7 +++++++
 .../widgets/ExecutorsWidget/index.groovy       |  5 +++++
 7 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 core/src/main/java/jenkins/widgets/BuildQueueWidget.java
 create mode 100644 core/src/main/java/jenkins/widgets/ExecutorsWidget.java
 create mode 100644 core/src/main/resources/jenkins/widgets/BuildQueueWidget/index.groovy
 create mode 100644 core/src/main/resources/jenkins/widgets/ExecutorsWidget/index.groovy

diff --git a/core/src/main/java/hudson/widgets/Widget.java b/core/src/main/java/hudson/widgets/Widget.java
index 69153ff3e3..71dad38530 100644
--- a/core/src/main/java/hudson/widgets/Widget.java
+++ b/core/src/main/java/hudson/widgets/Widget.java
@@ -24,6 +24,7 @@
 package hudson.widgets;
 
 import hudson.ExtensionPoint;
+import hudson.model.View;
 
 /**
  * Box to be rendered in the side panel.
@@ -32,6 +33,8 @@ import hudson.ExtensionPoint;
  * <ul>
  * <li><b>index.jelly</b> should display the widget. It should have:
  *   &lt;l:pane width="2" title="..."> ...body... &lt;/l:pane> structure.
+ *   In this view, "it" points to the {@link Widget} and "view" points to {@link View}
+ *   that's rendering the widget.
  *
  * @author Kohsuke Kawaguchi
  * @since 1.146
diff --git a/core/src/main/java/jenkins/widgets/BuildQueueWidget.java b/core/src/main/java/jenkins/widgets/BuildQueueWidget.java
new file mode 100644
index 0000000000..93538aada4
--- /dev/null
+++ b/core/src/main/java/jenkins/widgets/BuildQueueWidget.java
@@ -0,0 +1,18 @@
+package jenkins.widgets;
+
+import hudson.Extension;
+import hudson.widgets.Widget;
+import jenkins.model.Jenkins;
+
+/**
+ * Show the default build queue.
+ *
+ * A plugin may remove this from {@link Jenkins#getWidgets()} and swap in their own.
+ *
+ * @author Kohsuke Kawaguchi
+ * @sine 1.514
+ */
+@Extension(ordinal=200) // historically this was the top most widget
+public class BuildQueueWidget extends Widget {
+
+}
diff --git a/core/src/main/java/jenkins/widgets/ExecutorsWidget.java b/core/src/main/java/jenkins/widgets/ExecutorsWidget.java
new file mode 100644
index 0000000000..4dba7bd61b
--- /dev/null
+++ b/core/src/main/java/jenkins/widgets/ExecutorsWidget.java
@@ -0,0 +1,17 @@
+package jenkins.widgets;
+
+import hudson.Extension;
+import hudson.widgets.Widget;
+import jenkins.model.Jenkins;
+
+/**
+ * The default executors widget.
+ *
+ * A plugin may remove this from {@link Jenkins#getWidgets()} and swap in their own.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 1.514
+ */
+@Extension(ordinal=100) // historically this was above normal widgets and below BuildQueueWidget
+public class ExecutorsWidget extends Widget {
+}
diff --git a/core/src/main/resources/hudson/model/View/sidepanel.jelly b/core/src/main/resources/hudson/model/View/sidepanel.jelly
index 599e8a3dc8..0e6336039a 100644
--- a/core/src/main/resources/hudson/model/View/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/View/sidepanel.jelly
@@ -70,9 +70,8 @@ THE SOFTWARE.
       <st:include page="tasks-bottom.jelly" it="${it.owner}" optional="true" />
       <t:actions />
     </l:tasks>
-    <t:queue items="${it.approximateQueueItemsQuickly}" />
-    <t:executors computers="${it.computers}" />
     <j:forEach var="w" items="${it.widgets}">
+      <j:set var="view" value="${it}" /><!-- expose the view that's rendering this sidepanel to the widget -->
       <st:include it="${w}" page="index.jelly" />
     </j:forEach>
   </l:side-panel>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/sidepanel.jelly b/core/src/main/resources/jenkins/model/Jenkins/sidepanel.jelly
index 9ddff73647..98697bf4a4 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/sidepanel.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/sidepanel.jelly
@@ -22,5 +22,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<?jelly escape-by-default='true'?>
+Li<?jelly escape-by-default='true'?>
 <st:include it="${it.primaryView}" page="sidepanel.jelly" xmlns:st="jelly:stapler" />
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/widgets/BuildQueueWidget/index.groovy b/core/src/main/resources/jenkins/widgets/BuildQueueWidget/index.groovy
new file mode 100644
index 0000000000..7001a82644
--- /dev/null
+++ b/core/src/main/resources/jenkins/widgets/BuildQueueWidget/index.groovy
@@ -0,0 +1,7 @@
+package jenkins.widgets.BuildQueueWidget;
+
+def t = namespace(lib.JenkinsTagLib.class)
+
+text(request.ancestors.last().object)
+
+t.queue(items:view.approximateQueueItemsQuickly)
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/widgets/ExecutorsWidget/index.groovy b/core/src/main/resources/jenkins/widgets/ExecutorsWidget/index.groovy
new file mode 100644
index 0000000000..f963db4849
--- /dev/null
+++ b/core/src/main/resources/jenkins/widgets/ExecutorsWidget/index.groovy
@@ -0,0 +1,5 @@
+package jenkins.widgets.ExecutorsWidget
+
+def t = namespace(lib.JenkinsTagLib.class)
+
+t.executors(computers:view.computers)
\ No newline at end of file
-- 
GitLab