[JENKINS-21723] Use relative links in trend graphs.

jenkinsci · Feb 4, 2015 · cb09e77 · cb09e77
1 parent 3e382e2
commit cb09e77
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/src/main/java/hudson/plugins/analysis/graph/BuildResultGraph.java b/src/main/java/hudson/plugins/analysis/graph/BuildResultGraph.java
@@ -1,12 +1,11 @@
 package hudson.plugins.analysis.graph;
 
-import java.awt.Color;
+import javax.annotation.CheckForNull;
+import java.awt.*;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.GregorianCalendar;
 
-import javax.annotation.CheckForNull;
-
 import org.apache.commons.lang.StringUtils;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
@@ -18,9 +17,8 @@
 import org.jfree.data.xy.XYDataset;
 import org.jfree.ui.RectangleInsets;
 
-import hudson.plugins.analysis.core.ResultAction;
 import hudson.plugins.analysis.core.BuildResult;
-
+import hudson.plugins.analysis.core.ResultAction;
 import hudson.util.Graph;
 
 /**
@@ -87,7 +85,9 @@ public boolean isVisible() {
      * Sets the root URL to the specified value.
      *
      * @param rootUrl the value to set
+     * @deprecated as of 1.68 relative links are created
      */
+    @Deprecated
     public void setRootUrl(final String rootUrl) {
         this.rootUrl = rootUrl;
     }

diff --git a/src/main/java/hudson/plugins/analysis/graph/GraphConfigurationView.java b/src/main/java/hudson/plugins/analysis/graph/GraphConfigurationView.java
@@ -1,29 +1,26 @@
 package hudson.plugins.analysis.graph;
 
+import javax.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.servlet.ServletException;
-
-import net.sf.json.JSONObject;
-
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
 import com.google.common.collect.Lists;
 
-import hudson.model.ModelObject;
+import net.sf.json.JSONObject;
+
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
-
+import hudson.model.ModelObject;
 import hudson.plugins.analysis.core.AbstractHealthDescriptor;
 import hudson.plugins.analysis.core.BuildHistory;
-
 import hudson.util.Graph;
 
 /**
@@ -199,7 +196,6 @@ public Object getDynamic(final String graphId, final StaplerRequest request, fin
         try {
             BuildResultGraph graph = configuration.getGraph(graphId);
             if (hasMeaningfulGraph()) {
-                graph.setRootUrl(project.getAbsoluteUrl());
                 if (graph.isVisible()) {
                     return graph.getGraph(-1, configuration, null, buildHistory.getBaseline());
                 }
@@ -345,9 +341,7 @@ public String getDayCountString() {
      * @return the type
      */
     public BuildResultGraph getGraphType() {
-        BuildResultGraph graphType = configuration.getGraphType();
-        graphType.setRootUrl(getOwner().getAbsoluteUrl());
-        return graphType;
+        return configuration.getGraphType();
     }
 
     /**