Plots - prepare for multiple series types

Author: Rob Langley

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PlotContext.groovy

@@ -64,7 +64,7 @@ class PlotContext implements Context {
     void propertiesFile(String fileName, Closure plotSeriesClosure = null) {
         checkArgument(!Strings.isNullOrEmpty(fileName), 'fileName must not be null or empty')
 
-        PlotSeriesContext plotSeriesContext = new PlotSeriesContext(fileName)
+        PlotSeriesContext plotSeriesContext = new PlotSeriesContext(fileName, 'properties', 'PropertiesSeries')
         ContextHelper.executeInContext(plotSeriesClosure, plotSeriesContext)
 
         dataSeriesList << plotSeriesContext

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PlotSeriesContext.groovy

@@ -5,9 +5,13 @@ import javaposse.jobdsl.dsl.Context
 class PlotSeriesContext implements Context {
     final String fileName
     String label
+    String fileType
+    String seriesType
 
-    PlotSeriesContext(String fileName) {
+    PlotSeriesContext(String fileName, String fileType, String seriesType) {
         this.fileName = fileName
+        this.fileType = fileType
+        this.seriesType = seriesType
     }
 
     void label(String label) {

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PublisherContext.groovy

@@ -376,10 +376,10 @@ class PublisherContext implements Context {
                         yaxis(plot.yAxis ?: '')
                         series {
                             plot.dataSeriesList.each { PlotSeriesContext data ->
-                                'hudson.plugins.plot.PropertiesSeries' {
+                                "hudson.plugins.plot.${data.seriesType}" {
                                     file(data.fileName)
                                     label(data.label ?: '')
-                                    fileType('properties')
+                                    fileType(data.fileType)
                                 }
                             }
                         }