From 5d5e557f029aa9efe8e81cbc43e9e969fa750b80 Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 17 Sep 2014 12:20:22 -0400 Subject: Explicitly declare RepositoryPage subclasses that reference commits --- .../java/com/gitblit/wicket/pages/MetricsPage.java | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'src/main/java/com/gitblit/wicket/pages/MetricsPage.java') 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 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 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 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); } } @@ -178,6 +178,11 @@ public class MetricsPage extends RepositoryPage { return getString("gb.metrics"); } + @Override + protected boolean isCommitPage() { + return true; + } + @Override protected Class getRepoNavPageClass() { return SummaryPage.class; -- cgit v1.2.3