[JENKINS-37331] No paragraphs, use commas to sperate

jenkinsci · Apr 19, 2017 · b80f632 · b80f632
1 parent 8ccee77
commit b80f632
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/hudson/plugins/git/GitBranchSpecifierColumn.java b/src/main/java/hudson/plugins/git/GitBranchSpecifierColumn.java
@@ -6,6 +6,7 @@
 import hudson.scm.SCM;
 import hudson.views.ListViewColumnDescriptor;
 import java.util.ArrayList;
+import java.util.List;
 import jenkins.triggers.SCMTriggerItem;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -20,24 +21,26 @@ public class GitBranchSpecifierColumn extends ListViewColumn {
     @DataBoundConstructor
     public GitBranchSpecifierColumn() { }
 
-    public String getBranchSpecifier( final Item item ) {
-        String branchSpec = "";
+    public List<String> getBranchSpecifier( final Item item ) {
+        List<String> branchSpec = new ArrayList<String>();
         SCMTriggerItem s = SCMTriggerItem.SCMTriggerItems.asSCMTriggerItem(item);
         if(s != null) {
             for(SCM scm : s.getSCMs()) {
                 if (scm instanceof GitSCM) {
                     GitSCM gitScm = (GitSCM)scm;
-                    ArrayList<String> branches = new ArrayList<String>();
                     for(BranchSpec spec : gitScm.getBranches()) {
-                        branches.add(spec.getName());
+                        branchSpec.add(spec.getName());
                     }
-                    branchSpec = StringUtils.join(branches, " ");
                 }
             }
         }
         return branchSpec;
     }
 
+    public String breakOutString(List<String> branches) {
+        return StringUtils.join(branches, ", ");
+    }
+
     @Extension
     public static class DescriptorImpl extends ListViewColumnDescriptor {
 

diff --git a/src/main/resources/hudson/plugins/git/GitBranchSpecifierColumn/column.jelly b/src/main/resources/hudson/plugins/git/GitBranchSpecifierColumn/column.jelly
@@ -2,8 +2,6 @@
 <j:jelly xmlns:j="jelly:core">
   <j:set var="branchSpec" value="${it.getBranchSpecifier(job)}"/>
   <td data="${branchSpec}">
-    <j:forEach items="${branchSpec.split(' ')}" var="i">
-        <p>${i}</p>
-    </j:forEach>
-</td>
+    ${it.breakOutString(branchSpec)}
+  </td>
 </j:jelly>