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 | 122 +++++++++++++++++++++++++---------------
1 files changed, 76 insertions(+), 46 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index 273de57..d83f596 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -1,25 +1,31 @@
package com.gitblit.wicket.pages;
+import java.awt.Color;
import java.awt.Dimension;
+import java.text.MessageFormat;
import java.util.List;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.image.ContextImage;
import org.eclipse.jgit.lib.Repository;
+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.codecommit.wicket.AbstractChartData;
-import com.codecommit.wicket.Chart;
-import com.codecommit.wicket.ChartAxis;
-import com.codecommit.wicket.ChartAxisType;
-import com.codecommit.wicket.ChartProvider;
-import com.codecommit.wicket.ChartType;
-import com.codecommit.wicket.IChartData;
-import com.gitblit.StoredSettings;
+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.utils.TimeUtils;
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;
@@ -29,57 +35,76 @@
public SummaryPage(PageParameters params) {
super(params);
-
+
int numCommitsDef = 20;
int numRefsDef = 5;
-
- int numberCommits = StoredSettings.getInteger("summaryCommitCount", numCommitsDef);
+
+ int numberCommits = GitBlit.self().settings().getInteger(Keys.web.summaryCommitCount, numCommitsDef);
if (numberCommits <= 0) {
numberCommits = numCommitsDef;
}
- int numberRefs = StoredSettings.getInteger("summaryRefsCount", numRefsDef);
+ int numberRefs = GitBlit.self().settings().getInteger(Keys.web.summaryRefsCount, numRefsDef);
if (numberRefs <= 0) {
numberRefs = numRefsDef;
}
-
- Repository r = getRepository();
- List<Metric> metrics = JGitUtils.getDateMetrics(r);
-
- long numberOfCommits = 0;
- for (Metric m : metrics) {
- numberOfCommits += m.count;
+
+ Repository r = getRepository();
+ List<Metric> metrics = null;
+ Metric metricsTotal = null;
+ if (GitBlit.self().settings().getBoolean(Keys.web.generateActivityGraph, true)) {
+ metrics = JGitUtils.getDateMetrics(r);
+ metricsTotal = metrics.remove(0);
}
- String owner = JGitUtils.getRepositoryOwner(r);
- GitBlitWebSession session = GitBlitWebSession.get();
- String lastchange = session.formatDateTimeLong(JGitUtils.getLastChange(r));
- String cloneurl = GitBlitWebApp.get().getCloneUrl(repositoryName);
-
// 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));
+
+ 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)));
add(new LogPanel("commitsPanel", repositoryName, null, r, numberCommits, 0));
add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs));
- add(new BranchesPanel("branchesPanel", repositoryName, r, numberRefs));
-
+ add(new BranchesPanel("branchesPanel", getRepositoryModel(), r, numberRefs));
+
// Display an activity line graph
insertActivityGraph(metrics);
}
-
+
@Override
protected String getPageName() {
return getString("gb.summary");
}
private void insertActivityGraph(List<Metric> metrics) {
- if (StoredSettings.getBoolean("generateActivityGraph", true)) {
+ if (metrics.size() > 0 && GitBlit.self().settings().getBoolean(Keys.web.generateActivityGraph, true)) {
IChartData data = getChartData(metrics);
- ChartProvider provider = new ChartProvider(new Dimension(400, 80), ChartType.LINE, data);
+ 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);
@@ -88,30 +113,35 @@
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(new ContextImage("commitsChart", "blank.png"));
+ add(WicketUtils.newBlankImage("commitsChart"));
}
}
protected IChartData getChartData(List<Metric> metrics) {
- final double[] counts = new double[metrics.size()];
+ final double[] commits = new double[metrics.size()];
+ final double[] tags = new double[metrics.size()];
int i = 0;
double max = 0;
for (Metric m : metrics) {
- counts[i++] = m.count;
+ commits[i] = m.count;
+ if (m.tag > 0) {
+ tags[i] = m.count;
+ } else {
+ tags[i] = -1d;
+ }
max = Math.max(max, m.count);
+ i++;
}
- final double dmax = max;
- IChartData data = new AbstractChartData() {
+ IChartData data = new AbstractChartData(max) {
private static final long serialVersionUID = 1L;
public double[][] getData() {
- return new double[][] { counts };
- }
-
- public double getMax() {
- return dmax;
+ return new double[][] { commits, tags };
}
};
return data;
--
Gitblit v1.9.1