Clarified page hierarchy. Fixed TicGit pages.

James Moger

2011-09-30 d376abaca317746fed3b557045432302b8f0b82f

 src/com/gitblit/wicket/pages/CommitDiffPage.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.ArrayList;

@@ -9,17 +24,20 @@
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.eclipse.jgit.diff.DiffEntry.ChangeType;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.utils.DiffUtils;

import com.gitblit.utils.DiffUtils.DiffOutputType;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.JGitUtils.DiffOutputType;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.PathModel.PathChangeModel;

import com.gitblit.wicket.panels.CommitHeaderPanel;

import com.gitblit.wicket.panels.CommitLegendPanel;

import com.gitblit.wicket.panels.LinkPanel;



public class CommitDiffPage extends RepositoryPage {



@@ -27,9 +45,10 @@
      super(params);



      Repository r = getRepository();

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

      DiffOutputType diffType = DiffOutputType.forName(GitBlit.self().settings().getString(Keys.web.diffStyle, DiffOutputType.GITBLIT.name()));

      String diff = JGitUtils.getCommitDiff(r, commit, diffType);

      RevCommit commit = getCommit();

      DiffOutputType diffType = DiffOutputType.forName(GitBlit.getString(Keys.web.diffStyle,

            DiffOutputType.GITBLIT.name()));

      String diff = DiffUtils.getCommitDiff(r, commit, diffType);



      List<String> parents = new ArrayList<String>();

      if (commit.getParentCount() > 0) {

@@ -42,19 +61,23 @@
      if (parents.size() == 0) {

         add(new Label("parentLink", "none"));

      } else {

         add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8), CommitDiffPage.class, newCommitParameter(parents.get(0))));

         add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8),

               CommitDiffPage.class, newCommitParameter(parents.get(0))));

      }

      add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

      add(new BookmarkablePageLink<Void>("commitLink", CommitPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

      add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,

            WicketUtils.newObjectParameter(repositoryName, objectId)));

      add(new BookmarkablePageLink<Void>("commitLink", CommitPage.class,

            WicketUtils.newObjectParameter(repositoryName, objectId)));



      add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));

      add(new CommitHeaderPanel("commitHeader", repositoryName, commit));



      // changed paths list

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

      add(new CommitLegendPanel("commitLegend", paths));

      ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(paths);

      DataView<PathChangeModel> pathsView = new DataView<PathChangeModel>("changedPath", pathsDp) {

         private static final long serialVersionUID = 1L;

         int counter = 0;

         int counter;



         public void populateItem(final Item<PathChangeModel> item) {

            final PathChangeModel entry = item.getModelObject();

@@ -64,15 +87,24 @@
            item.add(changeType);



            if (entry.isTree()) {

               item.add(new LinkPanel("pathName", null, entry.path, TreePage.class, newPathParameter(entry.path)));

               item.add(new LinkPanel("pathName", null, entry.path, TreePage.class,

                     WicketUtils

                           .newPathParameter(repositoryName, entry.commitId, entry.path)));

            } else {

               item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, newPathParameter(entry.path)));

               item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class,

                     WicketUtils

                           .newPathParameter(repositoryName, entry.commitId, 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", HistoryPage.class, newPathParameter(entry.path)));

            item.add(new BookmarkablePageLink<Void>("patch", PatchPage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path)));

            item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path)));

            item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path)));

            item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils

                  .newPathParameter(repositoryName, entry.commitId, entry.path))

                  .setEnabled(!entry.changeType.equals(ChangeType.ADD)));



            WicketUtils.setAlternatingBackground(item, counter);

            counter++;