From a125cf6876e0edc5a2498df57a9df06d60b1f572 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 02 Jun 2011 22:40:23 -0400 Subject: [PATCH] Unit testing. Start of git-notes display feature. --- src/com/gitblit/wicket/pages/TagPage.java | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/com/gitblit/wicket/pages/TagPage.java b/src/com/gitblit/wicket/pages/TagPage.java index 7448ae5..7945231 100644 --- a/src/com/gitblit/wicket/pages/TagPage.java +++ b/src/com/gitblit/wicket/pages/TagPage.java @@ -1,3 +1,18 @@ +/* + * Copyright 2011 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.gitblit.wicket.pages; import java.util.List; @@ -6,12 +21,11 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import com.gitblit.models.RefModel; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.JGitUtils.SearchType; -import com.gitblit.wicket.LinkPanel; -import com.gitblit.wicket.RepositoryPage; import com.gitblit.wicket.WicketUtils; -import com.gitblit.wicket.models.RefModel; +import com.gitblit.wicket.panels.LinkPanel; public class TagPage extends RepositoryPage { @@ -19,8 +33,8 @@ super(params); Repository r = getRepository(); + RevCommit c = getCommit(); List<RefModel> tags = JGitUtils.getTags(r, -1); - RevCommit c = JGitUtils.getCommit(r, objectId); RefModel tagRef = null; // determine tag @@ -33,16 +47,21 @@ if (tagRef == null) { // point to commit - add(new LinkPanel("commit", "title", c.getShortMessage(), CommitPage.class, newCommitParameter())); - add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class, newCommitParameter(c.getName()))); + add(new LinkPanel("commit", "title", c.getShortMessage(), CommitPage.class, + newCommitParameter())); + add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class, + newCommitParameter(c.getName()))); } else { // TODO commit or tree or blob? - add(new LinkPanel("commit", "title", tagRef.getDisplayName(), CommitPage.class, newCommitParameter())); - add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class, newCommitParameter(c.getName()))); + add(new LinkPanel("commit", "title", tagRef.displayName, CommitPage.class, + newCommitParameter())); + add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class, + newCommitParameter(c.getName()))); } add(createPersonPanel("tagAuthor", c.getAuthorIdent(), SearchType.AUTHOR)); - add(WicketUtils.createTimestampLabel("tagDate", c.getAuthorIdent().getWhen(), getTimeZone())); + add(WicketUtils + .createTimestampLabel("tagDate", c.getAuthorIdent().getWhen(), getTimeZone())); addFullText("fullMessage", c.getFullMessage(), true); } -- Gitblit v1.9.1