Merge pull request #43 from reinholdfuereder/patch-4

[JENKINS-48887] Pass all PlotBuilder CTOR params to Plot
jenkinsci · Jan 24, 2018 · 15727e5 · 15727e5
2 parents bcc82db + 55c67fc
commit 15727e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/hudson/plugins/plot/Plot.java b/src/main/java/hudson/plugins/plot/Plot.java
@@ -810,7 +810,6 @@ private void generatePlot(boolean forceGenerate) {
         // selected
         if (isLogarithmic()) {
             LogarithmicAxis logAxis = new LogarithmicAxis(getYaxis());
-            logAxis.setExpTickLabelsFlag(true);
             categoryPlot.setRangeAxis(logAxis);
         }
 

diff --git a/src/main/java/hudson/plugins/plot/PlotBuilder.java b/src/main/java/hudson/plugins/plot/PlotBuilder.java
@@ -39,10 +39,10 @@ public class PlotBuilder extends Builder implements SimpleBuildStep {
     private final String numBuilds;
     private final String yaxis;
     private final String style;
-    private final Boolean useDescr;
-    private final Boolean exclZero;
-    private final Boolean logarithmic;
-    private final Boolean keepRecords;
+    private final boolean useDescr;
+    private final boolean exclZero;
+    private final boolean logarithmic;
+    private final boolean keepRecords;
     private final String yaxisMinimum;
     private final String yaxisMaximum;
     @SuppressWarnings("visibilitymodifier")
@@ -63,7 +63,7 @@ public class PlotBuilder extends Builder implements SimpleBuildStep {
     @SuppressWarnings("parameternumber")
     @DataBoundConstructor
     public PlotBuilder(String group, String title, String numBuilds, String yaxis, String style,
-                       Boolean useDescr, Boolean exclZero, Boolean logarithmic, Boolean keepRecords,
+                       boolean useDescr, boolean exclZero, boolean logarithmic, boolean keepRecords,
                        String yaxisMinimum, String yaxisMaximum, String csvFileName,
                        List<CSVSeries> csvSeries, List<PropertiesSeries> propertiesSeries,
                        List<XMLSeries> xmlSeries) {
@@ -114,19 +114,19 @@ public String getStyle() {
         return style;
     }
 
-    public Boolean getUseDescr() {
+    public boolean getUseDescr() {
         return useDescr;
     }
 
-    public Boolean getExclZero() {
+    public boolean getExclZero() {
         return exclZero;
     }
 
-    public Boolean getLogarithmic() {
+    public boolean getLogarithmic() {
         return logarithmic;
     }
 
-    public Boolean getKeepRecords() {
+    public boolean getKeepRecords() {
         return keepRecords;
     }
 
@@ -159,7 +159,8 @@ public void perform(Run<?, ?> build, FilePath workspace, Launcher launcher,
                         TaskListener listener) {
         List<Plot> plots = new ArrayList<>();
         Plot plot = new Plot(title, yaxis, group, numBuilds, csvFileName, style,
-                false, false, false, false, yaxisMinimum, yaxisMaximum);
+                useDescr, keepRecords, exclZero, logarithmic,
+                yaxisMinimum, yaxisMaximum);
         plot.series = series;
         plot.addBuild(build, listener.getLogger(), workspace);
         plots.add(plot);