From 9da97003c7f33a64ae5060f413f9c4c5d26efe78 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 May 2011 19:01:45 -0400
Subject: [PATCH] Critical fix for servlet.
---
src/com/gitblit/wicket/pages/SummaryPage.java | 254 +++++++++++++++++++++++++++-----------------------
1 files changed, 136 insertions(+), 118 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index 84e78b4..d83f596 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -1,149 +1,167 @@
package com.gitblit.wicket.pages;
-import java.util.Date;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.text.MessageFormat;
import java.util.List;
-import java.util.Map;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
+import org.wicketstuff.googlecharts.AbstractChartData;
+import org.wicketstuff.googlecharts.Chart;
+import org.wicketstuff.googlecharts.ChartAxis;
+import org.wicketstuff.googlecharts.ChartAxisType;
+import org.wicketstuff.googlecharts.ChartProvider;
+import org.wicketstuff.googlecharts.ChartType;
+import org.wicketstuff.googlecharts.IChartData;
+import org.wicketstuff.googlecharts.LineStyle;
+import org.wicketstuff.googlecharts.MarkerType;
+import org.wicketstuff.googlecharts.ShapeMarker;
+import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.GitBlit;
+import com.gitblit.Keys;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.wicket.GitBlitWebApp;
-import com.gitblit.wicket.GitBlitWebSession;
-import com.gitblit.wicket.LinkPanel;
+import com.gitblit.utils.TimeUtils;
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.models.RefModel;
-import com.gitblit.wicket.panels.HeadLinksPanel;
-import com.gitblit.wicket.panels.RefsPanel;
-import com.gitblit.wicket.panels.ShortLogLinksPanel;
-import com.gitblit.wicket.panels.TagLinksPanel;
-
+import com.gitblit.wicket.models.Metric;
+import com.gitblit.wicket.panels.BranchesPanel;
+import com.gitblit.wicket.panels.LogPanel;
+import com.gitblit.wicket.panels.TagsPanel;
public class SummaryPage extends RepositoryPage {
public SummaryPage(PageParameters params) {
- super(params, "summary");
+ super(params);
+
+ int numCommitsDef = 20;
+ int numRefsDef = 5;
+
+ int numberCommits = GitBlit.self().settings().getInteger(Keys.web.summaryCommitCount, numCommitsDef);
+ if (numberCommits <= 0) {
+ numberCommits = numCommitsDef;
+ }
+
+ int numberRefs = GitBlit.self().settings().getInteger(Keys.web.summaryRefsCount, numRefsDef);
+ if (numberRefs <= 0) {
+ numberRefs = numRefsDef;
+ }
Repository r = getRepository();
- final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);
-
- 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 = null;
+ Metric metricsTotal = null;
+ if (GitBlit.self().settings().getBoolean(Keys.web.generateActivityGraph, true)) {
+ metrics = JGitUtils.getDateMetrics(r);
+ metricsTotal = metrics.remove(0);
+ }
// 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("repositoryDescription", getRepositoryModel().description));
+ add(new Label("repositoryOwner", getRepositoryModel().owner));
- int summaryCount = 16;
+ add(WicketUtils.createTimestampLabel("repositoryLastChange", JGitUtils.getLastChange(r), getTimeZone()));
+ if (metricsTotal == null) {
+ add(new Label("repositoryStats", ""));
+ } else {
+ add(new Label("repositoryStats", MessageFormat.format("{0} commits and {1} tags in {2}", metricsTotal.count, metricsTotal.tag, TimeUtils.duration(metricsTotal.duration))));
+ }
+
+ AccessRestrictionType accessRestriction = getRepositoryModel().accessRestriction;
+ switch (accessRestriction) {
+ case NONE:
+ add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false));
+ break;
+ case PUSH:
+ add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png", getAccessRestrictions().get(accessRestriction)));
+ break;
+ case CLONE:
+ add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png", getAccessRestrictions().get(accessRestriction)));
+ break;
+ case VIEW:
+ add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png", getAccessRestrictions().get(accessRestriction)));
+ break;
+ default:
+ add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false));
+ }
+ add(new Label("repositoryCloneUrl", GitBlit.self().getCloneUrl(repositoryName)));
- // shortlog
- add(new LinkPanel("shortlog", "title", "shortlog", ShortLogPage.class, newRepositoryParameter()));
+ add(new LogPanel("commitsPanel", repositoryName, null, r, numberCommits, 0));
+ add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs));
+ add(new BranchesPanel("branchesPanel", getRepositoryModel(), r, numberRefs));
- List<RevCommit> commits = JGitUtils.getRevLog(r, summaryCount);
- ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);
- DataView<RevCommit> shortlogView = new DataView<RevCommit>("commit", dp) {
+ // Display an activity line graph
+ insertActivityGraph(metrics);
+ }
+
+ @Override
+ protected String getPageName() {
+ return getString("gb.summary");
+ }
+
+ private void insertActivityGraph(List<Metric> metrics) {
+ if (metrics.size() > 0 && GitBlit.self().settings().getBoolean(Keys.web.generateActivityGraph, true)) {
+ IChartData data = getChartData(metrics);
+
+ ChartProvider provider = new ChartProvider(new Dimension(400, 100), ChartType.LINE, data);
+ ChartAxis dateAxis = new ChartAxis(ChartAxisType.BOTTOM);
+ 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(metrics)) });
+ provider.addAxis(commitAxis);
+
+ provider.setLineStyles(new LineStyle[] {new LineStyle(2, 4, 0), new LineStyle(0, 4, 1)});
+ provider.addShapeMarker(new ShapeMarker(MarkerType.CIRCLE, Color.BLUE, 1, -1, 5));
+
+ add(new Chart("commitsChart", provider));
+ } else {
+ add(WicketUtils.newBlankImage("commitsChart"));
+ }
+ }
+
+ protected IChartData getChartData(List<Metric> metrics) {
+ final double[] commits = new double[metrics.size()];
+ final double[] tags = new double[metrics.size()];
+ int i = 0;
+ double max = 0;
+ for (Metric m : metrics) {
+ commits[i] = m.count;
+ if (m.tag > 0) {
+ tags[i] = m.count;
+ } else {
+ tags[i] = -1d;
+ }
+ max = Math.max(max, m.count);
+ i++;
+ }
+ IChartData data = new AbstractChartData(max) {
private static final long serialVersionUID = 1L;
- int counter = 0;
- public void populateItem(final Item<RevCommit> item) {
- RevCommit entry = item.getModelObject();
- Date date = JGitUtils.getCommitDate(entry);
-
- item.add(createShortlogDateLabel("commitDate", date));
-
- String author = entry.getAuthorIdent().getName();
- item.add(createAuthorLabel("commitAuthor", author));
-
- String shortMessage = entry.getShortMessage();
- String trimmedMessage = trimShortLog(shortMessage);
- LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, newCommitParameter(entry.getName()));
- if (!shortMessage.equals(trimmedMessage)) {
- WicketUtils.setHtmlTitle(shortlog, shortMessage);
- }
- item.add(shortlog);
-
- item.add(new RefsPanel("commitRefs", entry, allRefs));
-
- item.add(new ShortLogLinksPanel("commitLinks", repositoryName, entry.getName()));
-
- setAlternatingBackground(item, counter);
- counter++;
+ public double[][] getData() {
+ return new double[][] { commits, tags };
}
};
- add(shortlogView);
- add(new LinkPanel("shortlogMore", "link", "...", ShortLogPage.class, newRepositoryParameter()));
+ return data;
+ }
- // tags
- List<RefModel> tags = JGitUtils.getTags(r, summaryCount);
- add(new LinkPanel("tags", "title", "tags", TagsPage.class, newRepositoryParameter()));
+ protected String[] getNames(List<Metric> results) {
+ String[] names = new String[results.size()];
+ for (int i = 0; i < results.size(); i++) {
+ names[i] = results.get(i).name;
+ }
+ return names;
+ }
- ListDataProvider<RefModel> tagsDp = new ListDataProvider<RefModel>(tags);
- DataView<RefModel> tagView = new DataView<RefModel>("tag", tagsDp) {
- private static final long serialVersionUID = 1L;
- int counter = 0;
-
- public void populateItem(final Item<RefModel> item) {
- final RefModel entry = item.getModelObject();
-
- item.add(createDateLabel("tagDate", entry.getDate()));
-
- item.add(new LinkPanel("tagName", "list name", entry.getDisplayName(), CommitPage.class, newCommitParameter(entry.getCommitId().getName())));
-
- if (entry.getCommitId().equals(entry.getObjectId())) {
- // lightweight tag on commit object
- item.add(new Label("tagDescription", ""));
- } else {
- // tag object
- item.add(new LinkPanel("tagDescription", "list subject", entry.getShortLog(), TagPage.class, newCommitParameter(entry.getObjectId().getName())));
- }
-
- item.add(new TagLinksPanel("tagLinks", repositoryName, entry));
-
- setAlternatingBackground(item, counter);
- counter++;
+ protected double maxValue(List<Metric> metrics) {
+ double max = Double.MIN_VALUE;
+ for (Metric m : metrics) {
+ if (m.count > max) {
+ max = m.count;
}
- };
- add(tagView);
- add(new LinkPanel("tagsMore", "link", "...", TagsPage.class, newRepositoryParameter()));
- // heads
- List<RefModel> heads = JGitUtils.getHeads(r, summaryCount);
- add(new LinkPanel("heads", "title", "heads", HeadsPage.class, newRepositoryParameter()));
-
- ListDataProvider<RefModel> headsDp = new ListDataProvider<RefModel>(heads);
- DataView<RefModel> headsView = new DataView<RefModel>("head", headsDp) {
- private static final long serialVersionUID = 1L;
- int counter = 0;
-
- public void populateItem(final Item<RefModel> item) {
- final RefModel entry = item.getModelObject();
-
- item.add(createDateLabel("headDate", entry.getDate()));
-
- item.add(new LinkPanel("headName", "list name", entry.getDisplayName(), ShortLogPage.class, newCommitParameter(entry.getName())));
-
- item.add(new HeadLinksPanel("headLinks", repositoryName, entry));
-
- setAlternatingBackground(item, counter);
- counter++;
- }
- };
- add(headsView);
-
- // close the repository
- r.close();
-
- // footer
- addFooter();
+ }
+ return max;
}
}
--
Gitblit v1.9.1