From ff369d23bd12f501b59726cbec77512e2f39fd13 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 18 Apr 2011 17:50:03 -0400
Subject: [PATCH] Fix Eclipse complaints about illegal tag location.
---
src/com/gitblit/wicket/pages/CommitDiffPage.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.java b/src/com/gitblit/wicket/pages/CommitDiffPage.java
index 7f6d347..87e8110 100644
--- a/src/com/gitblit/wicket/pages/CommitDiffPage.java
+++ b/src/com/gitblit/wicket/pages/CommitDiffPage.java
@@ -25,15 +25,15 @@
Repository r = getRepository();
RevCommit commit = JGitUtils.getCommit(r, objectId);
- String diff = JGitUtils.getCommitDiff(r, commit, true);
-
+ String diff = JGitUtils.getCommitDiff(r, commit, true);
+
List<String> parents = new ArrayList<String>();
if (commit.getParentCount() > 0) {
for (RevCommit parent : commit.getParents()) {
parents.add(parent.name());
}
}
-
+
// commit page links
if (parents.size() == 0) {
add(new Label("parentLink", "none"));
@@ -46,7 +46,7 @@
add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));
// changed paths list
- List<PathModel> paths = JGitUtils.getFilesInCommit(r, commit);
+ List<PathModel> paths = JGitUtils.getFilesInCommit(r, commit);
ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);
DataView<PathModel> pathsView = new DataView<PathModel>("changedPath", pathsDp) {
private static final long serialVersionUID = 1L;
@@ -59,11 +59,11 @@
} else {
item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, newPathParameter(entry.path)));
}
-
+
item.add(new BookmarkablePageLink<Void>("patch", PatchPage.class, newPathParameter(entry.path)));
item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, newPathParameter(entry.path)));
item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));
- item.add(new BookmarkablePageLink<Void>("history", BlobPage.class).setEnabled(false));
+ item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, newPathParameter(entry.path)));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
@@ -72,7 +72,7 @@
add(pathsView);
add(new Label("diffText", diff).setEscapeModelStrings(false));
}
-
+
@Override
protected String getPageName() {
return getString("gb.commitdiff");
--
Gitblit v1.9.1