From 2a7306a1d92522569a8bb6e5a7c0bcdd5cf4cfaa Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 26 May 2011 17:11:38 -0400 Subject: Findbugs. CodePro Audit. Checkstyle. Unit test refactoring. --- src/com/gitblit/wicket/pages/TreePage.java | 48 +++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 14 deletions(-) (limited to 'src/com/gitblit/wicket/pages/TreePage.java') diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java index 10da7eb3..761b82e0 100644 --- a/src/com/gitblit/wicket/pages/TreePage.java +++ b/src/com/gitblit/wicket/pages/TreePage.java @@ -53,9 +53,13 @@ public class TreePage extends RepositoryPage { List paths = JGitUtils.getFilesInPath(r, path, commit); // tree page links - add(new BookmarkablePageLink("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, path))); - add(new BookmarkablePageLink("headLink", TreePage.class, WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path))); - add(new ExternalLink("zipLink", DownloadZipServlet.asLink(getRequest().getRelativePathPrefixToContextRoot(), repositoryName, objectId, path)).setVisible(GitBlit.self().settings().getBoolean(Keys.web.allowZipDownloads, true))); + add(new BookmarkablePageLink("historyLink", HistoryPage.class, + WicketUtils.newPathParameter(repositoryName, objectId, path))); + add(new BookmarkablePageLink("headLink", TreePage.class, + WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path))); + add(new ExternalLink("zipLink", DownloadZipServlet.asLink(getRequest() + .getRelativePathPrefixToContextRoot(), repositoryName, objectId, path)) + .setVisible(GitBlit.getBoolean(Keys.web.allowZipDownloads, true))); add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); @@ -71,7 +75,7 @@ public class TreePage extends RepositoryPage { ListDataProvider pathsDp = new ListDataProvider(paths); DataView pathsView = new DataView("changedPath", pathsDp) { private static final long serialVersionUID = 1L; - int counter = 0; + int counter; public void populateItem(final Item item) { PathModel entry = item.getModelObject(); @@ -80,33 +84,49 @@ public class TreePage extends RepositoryPage { // parent .. path item.add(WicketUtils.newBlankImage("pathIcon")); item.add(new Label("pathSize", "")); - item.add(new LinkPanel("pathName", null, entry.name, TreePage.class, newPathParameter(entry.path))); + item.add(new LinkPanel("pathName", null, entry.name, TreePage.class, + newPathParameter(entry.path))); item.add(new Label("pathLinks", "")); } else { if (entry.isTree()) { // folder/tree link item.add(WicketUtils.newImage("pathIcon", "folder_16x16.png")); item.add(new Label("pathSize", "")); - item.add(new LinkPanel("pathName", "list", entry.name, TreePage.class, newPathParameter(entry.path))); + item.add(new LinkPanel("pathName", "list", entry.name, TreePage.class, + newPathParameter(entry.path))); // links Fragment links = new Fragment("pathLinks", "treeLinks", this); - links.add(new BookmarkablePageLink("tree", TreePage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path))); - links.add(new BookmarkablePageLink("history", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path))); - links.add(new ExternalLink("zip", DownloadZipServlet.asLink(getRequest().getRelativePathPrefixToContextRoot(), repositoryName, objectId, entry.path)).setVisible(GitBlit.self().settings().getBoolean(Keys.web.allowZipDownloads, true))); + links.add(new BookmarkablePageLink("tree", TreePage.class, + WicketUtils.newPathParameter(repositoryName, entry.commitId, + entry.path))); + links.add(new BookmarkablePageLink("history", HistoryPage.class, + WicketUtils.newPathParameter(repositoryName, entry.commitId, + entry.path))); + links.add(new ExternalLink("zip", DownloadZipServlet.asLink(getRequest() + .getRelativePathPrefixToContextRoot(), repositoryName, objectId, + entry.path)).setVisible(GitBlit.getBoolean( + Keys.web.allowZipDownloads, true))); item.add(links); } else { // blob link item.add(WicketUtils.getFileImage("pathIcon", entry.name)); 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 LinkPanel("pathName", "list", entry.name, BlobPage.class, + newPathParameter(entry.path))); // links Fragment links = new Fragment("pathLinks", "blobLinks", this); - links.add(new BookmarkablePageLink("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path))); - links.add(new BookmarkablePageLink("raw", RawPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path))); - links.add(new BookmarkablePageLink("blame", BlobPage.class).setEnabled(false)); - links.add(new BookmarkablePageLink("history", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path))); + links.add(new BookmarkablePageLink("view", BlobPage.class, + WicketUtils.newPathParameter(repositoryName, entry.commitId, + entry.path))); + links.add(new BookmarkablePageLink("raw", RawPage.class, WicketUtils + .newPathParameter(repositoryName, entry.commitId, entry.path))); + links.add(new BookmarkablePageLink("blame", BlobPage.class) + .setEnabled(false)); + links.add(new BookmarkablePageLink("history", HistoryPage.class, + WicketUtils.newPathParameter(repositoryName, entry.commitId, + entry.path))); item.add(links); } } -- cgit v1.2.3