From 61b094152515532b42aa5e918f5405d82cde0440 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 13 Apr 2011 16:27:17 -0400
Subject: [PATCH] Fixed ticgit pages.
---
src/com/gitblit/wicket/pages/SummaryPage.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index 72643a7..1dafb52 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -18,8 +18,8 @@
import com.gitblit.StoredSettings;
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.GitBlitWebApp;
-import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.RepositoryPage;
+import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.Metric;
import com.gitblit.wicket.panels.BranchesPanel;
import com.gitblit.wicket.panels.LogPanel;
@@ -44,24 +44,26 @@
}
Repository r = getRepository();
-
- String owner = JGitUtils.getRepositoryOwner(r);
- GitBlitWebSession session = GitBlitWebSession.get();
- String lastchange = session.formatDateTimeLong(JGitUtils.getLastChange(r));
- String cloneurl = GitBlitWebApp.get().getCloneUrl(repositoryName);
+ List<Metric> metrics = JGitUtils.getDateMetrics(r);
+
+ long numberOfCommits = 0;
+ for (Metric m : metrics) {
+ numberOfCommits += m.count;
+ }
// repository description
add(new Label("repositoryDescription", description));
- add(new Label("repositoryOwner", owner));
- add(new Label("repositoryLastChange", lastchange));
- add(new Label("repositoryCloneUrl", cloneurl));
+ add(new Label("repositoryOwner", JGitUtils.getRepositoryOwner(r)));
+
+ add(WicketUtils.createTimestampLabel("repositoryLastChange", JGitUtils.getLastChange(r), getTimeZone()));
+ add(new Label("repositoryCloneUrl", GitBlitWebApp.get().getCloneUrl(repositoryName)));
- add(new LogPanel("commitsPanel", repositoryName, r, numberCommits, false));
+ add(new LogPanel("commitsPanel", repositoryName, null, r, numberCommits, 0));
add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs));
add(new BranchesPanel("branchesPanel", repositoryName, r, numberRefs));
// Display an activity line graph
- insertActivityGraph(r);
+ insertActivityGraph(metrics);
}
@Override
@@ -69,18 +71,17 @@
return getString("gb.summary");
}
- private void insertActivityGraph(Repository r) {
- if (StoredSettings.getBoolean("generateActivityGraph", true)) {
- List<Metric> dates = JGitUtils.getDateMetrics(r);
- IChartData data = getChartData(dates);
+ private void insertActivityGraph(List<Metric> metrics) {
+ if (StoredSettings.getBoolean("generateActivityGraph", true)) {
+ IChartData data = getChartData(metrics);
ChartProvider provider = new ChartProvider(new Dimension(400, 80), ChartType.LINE, data);
ChartAxis dateAxis = new ChartAxis(ChartAxisType.BOTTOM);
- dateAxis.setLabels(new String[] { dates.get(0).name, dates.get(dates.size() / 2).name, dates.get(dates.size() - 1).name });
+ dateAxis.setLabels(new String[] { metrics.get(0).name, metrics.get(metrics.size() / 2).name, metrics.get(metrics.size() - 1).name });
provider.addAxis(dateAxis);
ChartAxis commitAxis = new ChartAxis(ChartAxisType.LEFT);
- commitAxis.setLabels(new String[] { "", String.valueOf((int) maxValue(dates)) });
+ commitAxis.setLabels(new String[] { "", String.valueOf((int) maxValue(metrics)) });
provider.addAxis(commitAxis);
add(new Chart("commitsChart", provider));
@@ -89,11 +90,11 @@
}
}
- protected IChartData getChartData(List<Metric> results) {
- final double[] counts = new double[results.size()];
+ protected IChartData getChartData(List<Metric> metrics) {
+ final double[] counts = new double[metrics.size()];
int i = 0;
double max = 0;
- for (Metric m : results) {
+ for (Metric m : metrics) {
counts[i++] = m.count;
max = Math.max(max, m.count);
}
--
Gitblit v1.9.1