Let Wicket manage resources and use markup inheritance.

James Moger

2011-04-07 cebf455f3fd54b72e530942f308097ec54b408cd

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

@@ -17,13 +17,14 @@
import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.PathModel;

import com.gitblit.wicket.panels.PathBreadcrumbsPanel;

import com.gitblit.wicket.panels.TreeBlobLinksPanel;

import com.gitblit.wicket.panels.TreeLinksPanel;





public class TreePage extends RepositoryPage {



   public TreePage(PageParameters params) {

      super(params, "tree");

      super(params);



      final String basePath = params.getString("f", null);



@@ -38,10 +39,8 @@
      add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));



      // breadcrumbs

      if (basePath == null || basePath.trim().length() == 0) {

         add(new Label("breadcrumbs", "").setVisible(false));

      } else {

         add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, basePath, commitId));

      add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, basePath, commitId));			
      if (basePath != null && basePath.trim().length() > 0) {

         paths.add(0, PathModel.getParentPath(basePath, commitId));

      }



@@ -58,20 +57,21 @@
            item.add(new Label("pathPermissions", JGitUtils.getPermissionsFromMode(entry.mode)));

            if (entry.isParentPath) {

               // parent .. path

               item.add(new Label("pathSize", "").setVisible(false));

               item.add(new Label("pathSize", ""));

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

               item.add(new Label("treeLinks", "").setVisible(false));

               item.add(new Label("treeLinks", ""));

            } else {

               if (entry.isTree()) {

                  // folder/tree link

                  item.add(new Label("pathSize", "-"));

                  item.add(new Label("pathSize", ""));

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

                  item.add(new TreeLinksPanel("treeLinks", repositoryName, entry));

               } else {

                  // blob link

                  item.add(new Label("pathSize", byteFormat.format(entry.size)));

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

                  item.add(new TreeBlobLinksPanel("treeLinks", repositoryName, entry));

               }

               item.add(new TreeLinksPanel("treeLinks", repositoryName, entry));

            }

            String clazz = counter % 2 == 0 ? "dark" : "light";

            WicketUtils.setCssClass(item, clazz);

@@ -80,10 +80,12 @@
      };

      add(pathsView);



      // close repository

      r.close();



      // footer

      addFooter();

   }

	
   @Override

   protected String getPageName() {

      return "tree";

   }

}