From 2c616775b21ab4cd76ff170dfd5e818c9c3b79fb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 02 Jul 2013 15:08:28 -0400
Subject: [PATCH] Fixed git servlet unit test
---
src/main/java/com/gitblit/wicket/charting/GooglePieChart.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java b/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
index 119a824..1f5ae70 100644
--- a/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
+++ b/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
@@ -16,7 +16,9 @@
package com.gitblit.wicket.charting;
import java.text.MessageFormat;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import com.gitblit.utils.StringUtils;
@@ -44,10 +46,19 @@
line(sb, MessageFormat.format("{0}.addRows({1,number,0});", dName, values.size()));
Collections.sort(values);
-
+ List<ChartValue> list = new ArrayList<ChartValue>();
+
+ int maxSlices = 10;
+
+ if (values.size() > maxSlices) {
+ list.addAll(values.subList(0, maxSlices));
+ } else {
+ list.addAll(values);
+ }
+
StringBuilder colors = new StringBuilder("colors:[");
- for (int i = 0; i < values.size(); i++) {
- ChartValue value = values.get(i);
+ for (int i = 0; i < list.size(); i++) {
+ ChartValue value = list.get(i);
colors.append('\'');
colors.append(StringUtils.getColor(value.name));
colors.append('\'');
@@ -68,8 +79,8 @@
cName, tagId));
line(sb,
MessageFormat
- .format("{0}.draw({1}, '{'width: {2,number,0}, height: {3,number,0}, chartArea:'{'left:20,top:20'}', title: ''{4}'', {5} '}');",
- cName, dName, width, height, title, colors.toString()));
+ .format("{0}.draw({1}, '{' title: ''{4}'', {5}, legend: '{' position:''{6}'' '}' '}');",
+ cName, dName, width, height, title, colors.toString(), showLegend ? "right" : "none"));
line(sb, "");
}
}
\ No newline at end of file
--
Gitblit v1.9.1