James Moger
2011-04-21 c3f4f124f1b9e45d7696f3c16f958d1c81ff280a
src/com/gitblit/wicket/panels/HistoryPanel.java
@@ -5,6 +5,7 @@
import java.util.Map;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.image.ContextImage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
@@ -18,11 +19,12 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.JGitUtils.SearchType;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.PathModel;
import com.gitblit.wicket.models.PathModel.PathChangeModel;
import com.gitblit.wicket.pages.BlobDiffPage;
import com.gitblit.wicket.pages.BlobPage;
import com.gitblit.wicket.pages.CommitDiffPage;
@@ -47,7 +49,7 @@
      }
      RevCommit commit = JGitUtils.getCommit(r, objectId);
      List<PathModel> paths = JGitUtils.getFilesInCommit(r, commit);
      List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit);
      PathModel matchingPath = null;
      for (PathModel p : paths) {
@@ -103,6 +105,13 @@
            setPersonSearchTooltip(authorLink, author, SearchType.AUTHOR);
            item.add(authorLink);
            
            // merge icon
            if (entry.getParentCount() > 1) {
               item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/commit_merge_16x16.png"));
            } else {
               item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/blank.png"));
            }
            String shortMessage = entry.getShortMessage();
            String trimmedMessage = StringUtils.trimShortLog(shortMessage);
            LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()));