diff options
author | James Moger <james.moger@gitblit.com> | 2014-09-17 10:31:35 -0600 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2014-09-17 10:31:35 -0600 |
commit | 18d3e302f595b14ef87420305af56738490730cb (patch) | |
tree | 4a998b32429fb7191508ffec3c48a9e8aabd3f3b /src/main/java/com/gitblit/wicket/pages/MetricsPage.java | |
parent | 113172aa6a857c8e42d6e88057379fcba4881fb8 (diff) | |
parent | 5d5e557f029aa9efe8e81cbc43e9e969fa750b80 (diff) | |
download | gitblit-18d3e302f595b14ef87420305af56738490730cb.tar.gz gitblit-18d3e302f595b14ef87420305af56738490730cb.zip |
Merged #180 "Explicitly declare RepositoryPage subclasses that reference commits"
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages/MetricsPage.java')
-rw-r--r-- | src/main/java/com/gitblit/wicket/pages/MetricsPage.java | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/MetricsPage.java b/src/main/java/com/gitblit/wicket/pages/MetricsPage.java index 7ae4e4ed..96113b0f 100644 --- a/src/main/java/com/gitblit/wicket/pages/MetricsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MetricsPage.java @@ -61,24 +61,24 @@ public class MetricsPage extends RepositoryPage { MessageFormat.format(getString("gb.branchStats"), metricsTotal.count,
metricsTotal.tag, getTimeUtils().duration(metricsTotal.duration))));
}
-
+
Charts charts = new Flotr2Charts();
-
+
add(WicketUtils.newBlankImage("commitsChart"));
add(WicketUtils.newBlankImage("dayOfWeekChart"));
add(WicketUtils.newBlankImage("authorsChart"));
-
+
createLineChart(charts, "commitsChart", metrics);
createBarChart(charts, "dayOfWeekChart", getDayOfWeekMetrics(r, objectId));
createPieChart(charts, "authorsChart", getAuthorMetrics(r, objectId));
-
+
add(new HeaderContributor(charts));
}
private void createLineChart(Charts charts, String id, List<Metric> metrics) {
if ((metrics != null) && (metrics.size() > 0)) {
-
+
Chart chart = charts.createLineChart(id, "", "day",
getString("gb.commits"));
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -102,22 +102,22 @@ public class MetricsPage extends RepositoryPage { chart.addHighlight(date, (int)metric.count);
}
}
- charts.addChart(chart);
+ charts.addChart(chart);
}
}
-
+
private void createPieChart(Charts charts, String id, List<Metric> metrics) {
if ((metrics != null) && (metrics.size() > 0)) {
-
+
Chart chart = charts.createPieChart(id, "", "day",
getString("gb.commits"));
for (Metric metric : metrics) {
chart.addValue(metric.name, (int)metric.count);
}
- charts.addChart(chart);
+ charts.addChart(chart);
}
}
-
+
private void createBarChart(Charts charts, String id, List<Metric> metrics) {
if ((metrics != null) && (metrics.size() > 0)) {
Chart chart = charts.createBarChart(id, "", "day",
@@ -125,7 +125,7 @@ public class MetricsPage extends RepositoryPage { for (Metric metric : metrics) {
chart.addValue(metric.name, (int)metric.count);
}
- charts.addChart(chart);
+ charts.addChart(chart);
}
}
@@ -179,6 +179,11 @@ public class MetricsPage extends RepositoryPage { }
@Override
+ protected boolean isCommitPage() {
+ return true;
+ }
+
+ @Override
protected Class<? extends BasePage> getRepoNavPageClass() {
return SummaryPage.class;
}
|