Eliminate nearly all direct GitBlit singleton references in Wicket

This is the first step towards modularization and injection.  All
direct references to the GitBlit singleton within the Wicket pages
and panels have been replaced to proxy methods in the GitBlitWebApp
singleton.  There are still two Wicket classes which rely on the
GitBlit singleton; those require manual instantiation (servlet 3).

Change-Id: I0cdbbcf87959d590c446c99abb09c07c87c737bc

1 files changed, 4 insertions, 5 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
index 86a426ca..4d4545a5 100644
--- a/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
@@ -32,7 +32,6 @@ import org.apache.wicket.model.Model;
 import org.eclipse.jgit.lib.Constants;

 

 import com.gitblit.Constants.SearchType;

-import com.gitblit.GitBlit;

 import com.gitblit.Keys;

 import com.gitblit.models.RepositoryModel;

 import com.gitblit.models.SearchResult;

@@ -65,7 +64,7 @@ public class LuceneSearchPage extends RootPage {
 		ArrayList<String> repositories = new ArrayList<String>();

 		String query = "";

 		int page = 1;

-		int pageSize = GitBlit.getInteger(Keys.web.itemsPerPage, 50);

+		int pageSize = app().settings().getInteger(Keys.web.itemsPerPage, 50);

 

 		if (params != null) {

 			String repository = WicketUtils.getRepositoryName(params);

@@ -100,12 +99,12 @@ public class LuceneSearchPage extends RootPage {
 		// display user-accessible selections

 		UserModel user = GitBlitWebSession.get().getUser();

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

-		for (RepositoryModel model : GitBlit.self().getRepositoryModels(user)) {

+		for (RepositoryModel model : app().repositories().getRepositoryModels(user)) {

 			if (model.hasCommits && !ArrayUtils.isEmpty(model.indexedBranches)) {

 				availableRepositories.add(model.name);

 			}

 		}

-		boolean luceneEnabled = GitBlit.getBoolean(Keys.web.allowLuceneIndexing, true);

+		boolean luceneEnabled = app().settings().getBoolean(Keys.web.allowLuceneIndexing, true);

 		if (luceneEnabled) {

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

 				info(getString("gb.noIndexedRepositoriesWarning"));

@@ -158,7 +157,7 @@ public class LuceneSearchPage extends RootPage {
 		// execute search

 		final List<SearchResult> results = new ArrayList<SearchResult>();

 		if (!ArrayUtils.isEmpty(searchRepositories) && !StringUtils.isEmpty(query)) {

-			results.addAll(GitBlit.self().search(query, page, pageSize, searchRepositories));

+			results.addAll(app().repositories().search(query, page, pageSize, searchRepositories));

 		}

 

 		// results header