From e2dfad080a46368950f387c88103561e07c9afa6 Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 10 Apr 2014 12:07:54 -0400 Subject: Remove remaining GoogleCharts code and update documentation --- src/main/java/com/gitblit/wicket/WicketUtils.java | 55 ----------------------- src/site/design.mkd | 3 +- 2 files changed, 2 insertions(+), 56 deletions(-) (limited to 'src') diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java index bba3f79a..8598447e 100644 --- a/src/main/java/com/gitblit/wicket/WicketUtils.java +++ b/src/main/java/com/gitblit/wicket/WicketUtils.java @@ -38,8 +38,6 @@ import org.apache.wicket.markup.html.image.ContextImage; import org.apache.wicket.protocol.http.WebRequest; import org.apache.wicket.resource.ContextRelativeResource; import org.eclipse.jgit.diff.DiffEntry.ChangeType; -import org.wicketstuff.googlecharts.AbstractChartData; -import org.wicketstuff.googlecharts.IChartData; import com.gitblit.Constants; import com.gitblit.Constants.AccessPermission; @@ -632,32 +630,6 @@ public class WicketUtils { return label; } - public static IChartData getChartData(Collection metrics) { - final double[] commits = new double[metrics.size()]; - final double[] tags = new double[metrics.size()]; - int i = 0; - double max = 0; - for (Metric m : metrics) { - commits[i] = m.count; - if (m.tag > 0) { - tags[i] = m.count; - } else { - tags[i] = -1d; - } - max = Math.max(max, m.count); - i++; - } - IChartData data = new AbstractChartData(max) { - private static final long serialVersionUID = 1L; - - @Override - public double[][] getData() { - return new double[][] { commits, tags }; - } - }; - return data; - } - public static double maxValue(Collection metrics) { double max = Double.MIN_VALUE; for (Metric m : metrics) { @@ -667,31 +639,4 @@ public class WicketUtils { } return max; } - - public static IChartData getScatterData(Collection metrics) { - final double[] y = new double[metrics.size()]; - final double[] x = new double[metrics.size()]; - int i = 0; - double max = 0; - for (Metric m : metrics) { - y[i] = m.count; - if (m.duration > 0) { - x[i] = m.duration; - } else { - x[i] = -1d; - } - max = Math.max(max, m.count); - i++; - } - IChartData data = new AbstractChartData(max) { - private static final long serialVersionUID = 1L; - - @Override - public double[][] getData() { - return new double[][] { x, y }; - } - }; - return data; - } - } diff --git a/src/site/design.mkd b/src/site/design.mkd index 8351dd9c..6d4b29ca 100644 --- a/src/site/design.mkd +++ b/src/site/design.mkd @@ -17,6 +17,8 @@ The following dependencies are bundled with Gitblit. - [Clippy](https://github.com/mojombo/clippy) (MIT) - [google-code-prettify](http://code.google.com/p/google-code-prettify) (Apache 2.0) - [Commons Daemon](http://commons.apache.org/daemon) (Apache 2.0) +- [jQuery](https://jquery.org) (MIT) +- [flotr2](http://humblesoftware.com/flotr2) (BSD) - magnifying glass search icon courtesy of [Gnome](http://gnome.org) (Creative Commons CC-BY) - Git logo originally designed by [Jason Long](http://git-scm.com/downloads/logos) - modified Git logo originally designed by [Henrik Nyh](http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon) @@ -28,7 +30,6 @@ The following dependencies are automatically downloaded by Gitblit GO (or alread - [JGit][jgit] (EDL 1.0) - [Wicket](http://wicket.apache.org) (Apache 2.0) -- [WicketStuff GoogleCharts](https://github.com/wicketstuff/core/wiki/GoogleCharts) (Apache 2.0) - [Jetty](http://eclipse.org/jetty) (Apache 2.0, EPL 1.0) - [SLF4J](http://www.slf4j.org) (MIT/X11) - [Log4j](http://logging.apache.org/log4j) (Apache 2.0) -- cgit v1.2.3