fixed build to allow builds where a proxy is needed for access to outside r...

Jason Pyeron

2012-08-19 d1231c63669f4bc3643985b9032de7f998612e08

 src/com/gitblit/wicket/pages/CommitDiffPage.java

@@ -31,9 +31,10 @@
import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.models.SubmoduleModel;

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.WicketUtils;

import com.gitblit.wicket.panels.CommitHeaderPanel;

import com.gitblit.wicket.panels.CommitLegendPanel;

@@ -59,7 +60,7 @@


      // commit page links

      if (parents.size() == 0) {

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

         add(new Label("parentLink", getString("gb.none")));

      } else {

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

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

@@ -86,22 +87,55 @@
            setChangeTypeTooltip(changeType, entry.changeType);

            item.add(changeType);



            boolean hasSubmodule = false;

            String submodulePath = null;

            if (entry.isTree()) {

               // tree

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

                     newPathParameter(entry.path)));

                     WicketUtils

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

            } else if (entry.isSubmodule()) {

               // submodule

               String submoduleId = entry.objectId;						
               SubmoduleModel submodule = getSubmodule(entry.path);

               submodulePath = submodule.gitblitPath;

               hasSubmodule = submodule.hasSubmodule;

					
               item.add(new LinkPanel("pathName", "list", entry.path + " @ " +

                     getShortObjectId(submoduleId), TreePage.class,

                     WicketUtils

                           .newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule));

            } else {

               // blob

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

                     newPathParameter(entry.path)));

                     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)).setEnabled(!entry.changeType.equals(ChangeType.ADD) && !entry.changeType.equals(ChangeType.DELETE)));



            // quick links

            if (entry.isSubmodule()) {

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

                     .newPathParameter(submodulePath, entry.objectId, entry.path)).setEnabled(false));

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

                     .newObjectParameter(submodulePath, entry.objectId)).setEnabled(hasSubmodule));

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

                     .newPathParameter(submodulePath, entry.objectId, entry.path)).setEnabled(false));

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

                     .newPathParameter(submodulePath, entry.objectId, entry.path))

                     .setEnabled(hasSubmodule));

            } else {

               // tree or blob

               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++;

         }