Finished history tree/blob links.

James Moger

2011-04-17 e299e1e9071d02ceefa2b5154f0fd1af5cbe115e

Finished history tree/blob links.

 src/com/gitblit/wicket/panels/HistoryPanel.html

@@ -21,15 +21,27 @@
                 <td><div wicket:id="commitShortMessage">[commit short message]</div></td>

                 <td class="rightAlign"><div wicket:id="commitRefs">[commit refs]</div></td>                 

                 <td class="rightAlign">

                     <span class="link">

                        <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a> | <a wicket:id="difftocurrent"><wicket:message key="gb.difftocurrent"></wicket:message></a>

                    </span>

                     <span wicket:id="historyLinks">[history links]</span>

                </td>

               </tr>

        </tbody>

    </table>    

    <div wicket:id="moreHistory">[more...]</div>

    

    <!--  tree links -->

    <wicket:fragment wicket:id="treeLinks">

        <span class="link">

            <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a>

        </span>

    </wicket:fragment>

	
    <!-- blob links -->

    <wicket:fragment wicket:id="blobLinks">

        <span class="link">

            <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a> | <a wicket:id="difftocurrent"><wicket:message key="gb.difftocurrent"></wicket:message></a>

        </span>	
    </wicket:fragment>

	
</wicket:panel>

</body>

</html>

 src/com/gitblit/wicket/panels/HistoryPanel.java

@@ -6,6 +6,7 @@


import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.apache.wicket.markup.html.panel.Fragment;

import org.apache.wicket.markup.repeater.Item;

import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;

@@ -20,16 +21,19 @@
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.pages.BlobDiffPage;

import com.gitblit.wicket.pages.BlobPage;

import com.gitblit.wicket.pages.CommitDiffPage;

import com.gitblit.wicket.pages.CommitPage;

import com.gitblit.wicket.pages.HistoryPage;

import com.gitblit.wicket.pages.LogPage;

import com.gitblit.wicket.pages.TreePage;



public class HistoryPanel extends BasePanel {



    private static final long serialVersionUID = 1L;

	


    private boolean hasMore = false;



    public HistoryPanel(String wicketId, final String repositoryName, final String objectId, final String path, Repository r, int limit, int pageOffset) {

@@ -39,8 +43,19 @@
        if (itemsPerPage <= 1) {

            itemsPerPage = 50;

        }

		
        RevCommit commit = JGitUtils.getCommit(r, objectId);		


        RevCommit commit = JGitUtils.getCommit(r, objectId);

        List<PathModel> paths = JGitUtils.getFilesInCommit(r, commit);



        PathModel matchingPath = null;

        for (PathModel p : paths) {

            if (p.path.equals(path)) {

                matchingPath = p;

                break;

            }

        }

        final boolean isTree = matchingPath == null ? true : matchingPath.isTree();



        final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);

        List<RevCommit> commits;

        if (pageResults) {

@@ -50,9 +65,9 @@
            // Fixed size result set

            commits = JGitUtils.getRevLog(r, objectId, path, 0, limit);

        }

		


        // inaccurate way to determine if there are more commits.

        // works unless commits.size() represents the exact end. 
        // works unless commits.size() represents the exact end.

        hasMore = commits.size() >= itemsPerPage;



        // header

@@ -93,10 +108,18 @@


                item.add(new RefsPanel("commitRefs", repositoryName, entry, allRefs));



                // TODO links for folder

                item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

                item.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

                item.add(new BookmarkablePageLink<Void>("difftocurrent", BlobDiffPage.class, WicketUtils.newBlobDiffParameter(repositoryName, entry.getName(), objectId, path)).setEnabled(counter > 0));

                if (isTree) {

                    Fragment links = new Fragment("historyLinks", "treeLinks", this);

                    links.add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

                    links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

                    item.add(links);

                } else {

                    Fragment links = new Fragment("historyLinks", "blobLinks", this);

                    links.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, entry.getName(), path)));

                    links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

                    links.add(new BookmarkablePageLink<Void>("difftocurrent", BlobDiffPage.class, WicketUtils.newBlobDiffParameter(repositoryName, entry.getName(), objectId, path)).setEnabled(counter > 0));

                    item.add(links);

                }



                WicketUtils.setAlternatingBackground(item, counter);

                counter++;

@@ -124,7 +147,7 @@
            }

        }

    }

	


    public boolean hasMore() {

        return hasMore;

    }