Tidy

Author: janfaracik

core/src/main/java/hudson/model/Actionable.java

@@ -121,12 +121,9 @@ public final List<? extends Action> getAllActions() {
 
     /**
      * TODO
+     * @since TODO
      */
-    public List<Action> getMagic() {
-        // How does this differ from getActions?
-        // How does this differ from getAllActions?
-        // TODO - Think of an appropriate name for this and see if we can combine the functions
-
+    public List<Action> getAppBarActions() {
         return getAllActions().stream()
                 .filter(e -> !(e instanceof Tab))
                 .filter(e -> {

core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java

@@ -298,7 +298,7 @@ public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest2 request
         public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest2 request, StaplerResponse2 response, String view) throws JellyException, IOException {
             // TODO - refactor this
             if (self instanceof Run) {
-                this.addAll(((Actionable) self).getMagic());
+                this.addAll(((Actionable) self).getAppBarActions());
                 return this;
             }
 

core/src/main/resources/lib/layout/app-bar-controls.jelly

@@ -23,25 +23,28 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
+  <st:documentation>
+    Generates a strip of controls based on the given actions parameter.
 
-  <!--  The point of this component is to generate the top right app bar controls/overflow menu -->
+    <st:attribute name="actions">
+      The actions to show.
+    </st:attribute>
+  </st:documentation>
 
-  <j:set var="actions" value="${it.object.magic}" />
   <j:if test="${actions != null}">
-<!--    <div class="jenkins-app-bar__controls">-->
-      <button id="auto-overflow" class="jenkins-button"
-              tooltip="${%More actions}"
-              type="button">
-        <div class="jenkins-overflow-button__ellipsis">
-          <span />
-          <span />
-          <span />
-        </div>
-      </button>
-      <template>
-        ${h.convertActionsToJson(actions)}
-      </template>
-<!--    </div>-->
+    <button id="auto-overflow"
+            class="jenkins-button"
+            tooltip="${%More actions}"
+            type="button">
+      <div class="jenkins-overflow-button__ellipsis">
+        <span />
+        <span />
+        <span />
+      </div>
+    </button>
+    <template>
+      ${h.convertActionsToJson(actions)}
+    </template>
   </j:if>
 </j:jelly>

core/src/main/resources/lib/layout/run-subpage.jelly

@@ -68,7 +68,7 @@ THE SOFTWARE.
             </div>
 
             <div class="app-build-bar__controls">
-              <l:app-bar-controls />
+              <l:app-bar-controls actions="${it.object.appBarActions}" />
             </div>
           </div>