Settings overhaul. Fixes to authentication. Bind interface feature.

James Moger

2011-04-15 87cc1ed60735a419a3ea23f20614fc0a3f9bab60

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
package com.gitblit.wicket.panels; 
 
import java.util.Date; 
import java.util.List; 
import java.util.Map; 
 
import org.apache.wicket.markup.html.basic.Label; 
import org.apache.wicket.markup.html.link.BookmarkablePageLink; 
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.apache.wicket.model.StringResourceModel; 
import org.eclipse.jgit.lib.ObjectId; 
import org.eclipse.jgit.lib.Repository; 
import org.eclipse.jgit.revwalk.RevCommit; 
 
import com.gitblit.GitBlit; 
import com.gitblit.Keys; 
import com.gitblit.utils.JGitUtils; 
import com.gitblit.utils.StringUtils; 
import com.gitblit.wicket.LinkPanel; 
import com.gitblit.wicket.WicketUtils; 
import com.gitblit.wicket.pages.CommitDiffPage; 
import com.gitblit.wicket.pages.CommitPage; 
import com.gitblit.wicket.pages.LogPage; 
import com.gitblit.wicket.pages.SummaryPage; 
import com.gitblit.wicket.pages.TreePage; 
 
public class LogPanel extends BasePanel { 
 
    private static final long serialVersionUID = 1L; 
 
    public LogPanel(String wicketId, final String repositoryName, String objectId, Repository r, int limit, int pageOffset) { 
        super(wicketId); 
        boolean pageResults = limit <= 0; 
        int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.logPageCommitCount, 50); 
        if (itemsPerPage <= 1) { 
            itemsPerPage = 50; 
        } 
 
        final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r); 
        List<RevCommit> commits; 
        if (pageResults) { 
            // Paging result set 
            commits = JGitUtils.getRevLog(r, objectId, pageOffset * itemsPerPage, itemsPerPage); 
        } else { 
            // Fixed size result set 
            commits = JGitUtils.getRevLog(r, objectId, 0, limit); 
        } 
 
        // header 
        if (pageResults) { 
            // shortlog page 
            // show repository summary page link 
            add(new LinkPanel("header", "title", repositoryName, SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryName))); 
        } else { 
            // summary page 
            // show shortlog page link 
            add(new LinkPanel("header", "title", new StringResourceModel("gb.log", this, null), LogPage.class, WicketUtils.newRepositoryParameter(repositoryName))); 
        } 
 
        ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits); 
        DataView<RevCommit> logView = new DataView<RevCommit>("commit", dp) { 
            private static final long serialVersionUID = 1L; 
            int counter = 0; 
 
            public void populateItem(final Item<RevCommit> item) { 
                final RevCommit entry = item.getModelObject(); 
                final Date date = JGitUtils.getCommitDate(entry); 
 
                item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone())); 
 
                String author = entry.getAuthorIdent().getName(); 
                item.add(WicketUtils.createAuthorLabel("commitAuthor", author)); 
 
                String shortMessage = entry.getShortMessage(); 
                String trimmedMessage = StringUtils.trimShortLog(shortMessage); 
                LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())); 
                if (!shortMessage.equals(trimmedMessage)) { 
                    WicketUtils.setHtmlTitle(shortlog, shortMessage); 
                } 
                item.add(shortlog); 
 
                item.add(new RefsPanel("commitRefs", repositoryName, entry, allRefs)); 
 
                item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()))); 
                item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()))); 
                item.add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()))); 
 
                WicketUtils.setAlternatingBackground(item, counter); 
                counter++; 
            } 
        }; 
        add(logView); 
 
        // determine to show pager, more, or neither 
        if (limit <= 0) { 
            // no display limit 
            add(new Label("moreLogs", "").setVisible(false)); 
        } else { 
            if (pageResults) { 
                // paging 
                add(new Label("moreLogs", "").setVisible(false)); 
            } else { 
                // more 
                if (commits.size() == limit) { 
                    // show more 
                    add(new LinkPanel("moreLogs", "link", new StringResourceModel("gb.moreLogs", this, null), LogPage.class, WicketUtils.newRepositoryParameter(repositoryName))); 
                } else { 
                    // no more 
                    add(new Label("moreLogs", "").setVisible(false)); 
                } 
            } 
        } 
    } 
}