[Fixed JENKINS-14522] Checking for null display and setting to ALL by…

… default.
jenkinsci · Jul 22, 2012 · bb4a0b3 · bb4a0b3
1 parent 7d7b93b
commit bb4a0b3
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 21 deletions.
diff --git a/src/main/java/hudson/plugins/view/dashboard/Dashboard.java b/src/main/java/hudson/plugins/view/dashboard/Dashboard.java
@@ -141,7 +141,7 @@ protected synchronized void submit(StaplerRequest req)
       try {
          req.setCharacterEncoding("UTF-8");
       } catch (UnsupportedEncodingException ex) {
-         DashboardLog.error(ex.getLocalizedMessage());
+         DashboardLog.error("Dashboard", ex.getLocalizedMessage());
       }
       JSONObject json = req.getSubmittedForm();
 
@@ -165,7 +165,15 @@ protected synchronized void submit(StaplerRequest req)
 
       topPortlets = Descriptor.newInstancesFromHeteroList(req, json, "topPortlet", DashboardPortlet.all());
       leftPortlets = Descriptor.newInstancesFromHeteroList(req, json, "leftPortlet", DashboardPortlet.all());
+//      for (DashboardPortlet p: leftPortlets)
+//      {
+//         DashboardLog.debug("Dashboard", p.getDisplayName() + " " + p.getId());
+//      }
       rightPortlets = Descriptor.newInstancesFromHeteroList(req, json, "rightPortlet", DashboardPortlet.all());
+//      for (DashboardPortlet p: rightPortlets)
+//      {
+//         DashboardLog.debug("Dashboard", p.getDisplayName() + " " + p.getId());
+//      }
       bottomPortlets = Descriptor.newInstancesFromHeteroList(req, json, "bottomPortlet", DashboardPortlet.all());
    }
 

diff --git a/src/main/java/hudson/plugins/view/dashboard/DashboardLog.java b/src/main/java/hudson/plugins/view/dashboard/DashboardLog.java
@@ -11,23 +11,24 @@ public class DashboardLog {
 
    private static String loggerName = "DashboardView";
 
-   public static void debug(String msg) {
+   public static void debug(String component, String msg) {
       Logger l = Logger.getLogger(loggerName);
-      l.log(Level.FINEST, msg);
+      l.log(Level.FINEST, "[" + component + "] " + msg);
    }
 
-   public static void info(String msg) {
+   public static void info(String component, String msg) {
       Logger l = Logger.getLogger(loggerName);
-      l.log(Level.INFO, msg);
+      l.log(Level.INFO, "[" + component + "] " + msg);
    }
 
-   public static void warning(String msg) {
+   public static void warning(String component, String msg) {
       Logger l = Logger.getLogger(loggerName);
-      l.log(Level.WARNING, msg);
+      l.log(Level.WARNING, "[" + component + "] " + msg);
    }
 
-   public static void error(String msg) {
+   public static void error(String component, String msg) {
       Logger l = Logger.getLogger(loggerName);
-      l.log(Level.SEVERE, msg);
+      l.log(Level.SEVERE, "[" + component + "] " + msg);
    }
+
 }
diff --git a/src/main/java/hudson/plugins/view/dashboard/DashboardPortlet.java b/src/main/java/hudson/plugins/view/dashboard/DashboardPortlet.java
@@ -13,6 +13,7 @@
 import org.kohsuke.stapler.StaplerRequest;
 
 import java.util.Comparator;
+import java.util.Random;
 
 /**
  * Report that can summarize project data across multiple projects and display
@@ -22,15 +23,17 @@
  */
 public abstract class DashboardPortlet implements ModelObject, Describable<DashboardPortlet>, ExtensionPoint {
 
-   private static int counter = 0;
-   private String id;
+   private static Random generator = new Random();
+   private String id = null;
    private String name;
 
    public DashboardPortlet(String name) {
-      counter++;
-      this.id = "dashboard_portlet_" + counter;
+      if (this.id == null)
+      {
+         this.id = "dashboard_portlet_" + generator.nextInt(32000);
+      }
       this.name = name;
-      DashboardLog.debug("DashboardPortlet: " + name + " - " + id);
+      DashboardLog.debug("DashboardPortlet", name + " - " + id);
    }
 
    public String getId() {

diff --git a/src/main/java/hudson/plugins/view/dashboard/test/TestTrendChart.java b/src/main/java/hudson/plugins/view/dashboard/test/TestTrendChart.java
@@ -4,6 +4,7 @@
 import hudson.model.Descriptor;
 import hudson.model.Job;
 import hudson.model.Run;
+import hudson.plugins.view.dashboard.DashboardLog;
 import hudson.plugins.view.dashboard.DashboardPortlet;
 import hudson.util.ColorPalette;
 import hudson.util.DataSetBuilder;
@@ -34,7 +35,6 @@
 public class TestTrendChart extends DashboardPortlet {
 
    public enum DisplayStatus {
-
       ALL, SUCCESS, SKIPPED, FAILED
    }
    private int graphWidth = 300;
@@ -49,8 +49,10 @@ public TestTrendChart(String name, int graphWidth, int graphHeight,
       this.graphWidth = graphWidth;
       this.graphHeight = graphHeight;
       this.dateRange = dateRange;
-
-      this.display = DisplayStatus.valueOf(display.toUpperCase());
+      this.display = (display == null)
+              ? DisplayStatus.ALL
+              : DisplayStatus.valueOf(display.toUpperCase());
+      DashboardLog.debug("TestTrendChart", "ctor");
    }
 
    public int getDateRange() {
@@ -65,8 +67,13 @@ public int getGraphHeight() {
       return graphHeight <= 0 ? 220 : graphHeight;
    }
 
-   public String getDisplay() {
-      return display.toString();
+   public DisplayStatus getDisplay() {
+      if (display == null)
+      {
+         display = DisplayStatus.ALL;
+         DashboardLog.info("TestTrendChart", "display is null - setting to ALL");
+      }
+      return display;
    }
 
    /**
@@ -178,7 +185,7 @@ protected JFreeChart createGraph() {
             StackedAreaRenderer ar = new StackedAreaRenderer2();
             plot.setRenderer(ar);
 
-            switch (display) {
+            switch (getDisplay()) {
                case SUCCESS:
                   ar.setSeriesPaint(0, ColorPalette.BLUE);
                   break;
@@ -209,7 +216,7 @@ private CategoryDataset buildDataSet(
       for (Map.Entry<LocalDate, TestResultSummary> entry : summaries.entrySet()) {
          LocalDateLabel label = new LocalDateLabel(entry.getKey());
 
-         switch (display) {
+         switch (getDisplay()) {
             case SUCCESS:
                dsb.add(entry.getValue().getSuccess(),
                        Messages.Dashboard_Total(), label);

diff --git a/src/main/resources/hudson/plugins/view/dashboard/Dashboard/main.jelly b/src/main/resources/hudson/plugins/view/dashboard/Dashboard/main.jelly
@@ -23,6 +23,7 @@ THE SOFTWARE.
 -->
 
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+  <div align="right"><a href="./configure"><img height="16" alt="" width="16" src="${imagesURL}/16x16/notepad.png" />configure</a></div>
   <j:set var="views" value="${it.owner.views}" />
   <j:set var="currentView" value="${it}" />
   <j:choose>