From 99d0d4fd66f3490b61c700065b7d16bc4e73f226 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 26 Nov 2013 16:07:04 -0500 Subject: [PATCH] Eliminate nearly all direct GitBlit singleton references in Wicket --- src/main/java/com/gitblit/wicket/pages/PatchPage.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/PatchPage.java b/src/main/java/com/gitblit/wicket/pages/PatchPage.java index be959d0..ece4136 100644 --- a/src/main/java/com/gitblit/wicket/pages/PatchPage.java +++ b/src/main/java/com/gitblit/wicket/pages/PatchPage.java @@ -16,12 +16,10 @@ package com.gitblit.wicket.pages; import org.apache.wicket.PageParameters; -import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; -import com.gitblit.GitBlit; import com.gitblit.utils.DiffUtils; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.StringUtils; @@ -31,7 +29,7 @@ import com.gitblit.wicket.WicketUtils; @CacheControl(LastModified.BOOT) -public class PatchPage extends WebPage { +public class PatchPage extends SessionPage { public PatchPage(PageParameters params) { super(params); @@ -47,7 +45,7 @@ final String objectId = WicketUtils.getObject(params); final String blobPath = WicketUtils.getPath(params); - Repository r = GitBlit.self().getRepository(repositoryName); + Repository r = app().repositories().getRepository(repositoryName); if (r == null) { GitBlitWebSession.get().cacheErrorMessage(getString("gb.canNotLoadRepository") + " " + repositoryName); redirectToInterceptPage(new RepositoriesPage()); -- Gitblit v1.9.1