From f66e89662c091e082bd1d2feb6ac91513ccff273 Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Sun, 21 Jul 2013 09:59:00 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit
---
src/main/java/com/gitblit/wicket/charting/GooglePieChart.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java b/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
index a9b4667..1f5ae70 100644
--- a/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
+++ b/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
@@ -49,19 +49,11 @@
List<ChartValue> list = new ArrayList<ChartValue>();
int maxSlices = 10;
- int maxCount = Math.min(maxSlices - 1, values.size());
- for (int i = 0; i < maxCount; i++) {
- ChartValue value = values.get(i);
- list.add(value);
- }
- if (values.size() >= maxSlices) {
- float others = 0;
- for (int i = maxSlices - 1; i < values.size(); i++) {
- others += values.get(i).value;
- }
- ChartValue other = new ChartValue("other", others);
- list.add(other);
+ if (values.size() > maxSlices) {
+ list.addAll(values.subList(0, maxSlices));
+ } else {
+ list.addAll(values);
}
StringBuilder colors = new StringBuilder("colors:[");
--
Gitblit v1.9.1