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, 10 insertions, 4 deletions

diff --git a/src/main/java/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java b/src/main/java/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java
index 2d65d37b..4f67a4ab 100644
--- a/src/main/java/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java
+++ b/src/main/java/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java
@@ -25,7 +25,7 @@ import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

 

-import com.gitblit.GitBlit;

+import com.gitblit.IStoredSettings;

 import com.gitblit.Keys;

 

 /**

@@ -42,6 +42,8 @@ public class GitblitParamUrlCodingStrategy extends MixedParamUrlCodingStrategy {
 

 	private Logger logger = LoggerFactory.getLogger(GitblitParamUrlCodingStrategy.class);

 

+	private IStoredSettings settings;

+

 	/**

 	 * Construct.

 	 *

@@ -53,9 +55,13 @@ public class GitblitParamUrlCodingStrategy extends MixedParamUrlCodingStrategy {
 	 * @param parameterNames

 	 *            the parameter names (not null)

 	 */

-	public <C extends Page> GitblitParamUrlCodingStrategy(String mountPath,

+	public <C extends Page> GitblitParamUrlCodingStrategy(

+			IStoredSettings settings,

+			String mountPath,

 			Class<C> bookmarkablePageClass, String[] parameterNames) {

+

 		super(mountPath, bookmarkablePageClass, parameterNames);

+		this.settings = settings;

 	}

 

 	/**

@@ -67,7 +73,7 @@ public class GitblitParamUrlCodingStrategy extends MixedParamUrlCodingStrategy {
 	 */

 	@Override

 	protected String urlEncodePathComponent(String string) {

-		char altChar = GitBlit.getChar(Keys.web.forwardSlashCharacter, '/');

+		char altChar = settings.getChar(Keys.web.forwardSlashCharacter, '/');

 		if (altChar != '/') {

 			string = string.replace('/', altChar);

 		}

@@ -83,7 +89,7 @@ public class GitblitParamUrlCodingStrategy extends MixedParamUrlCodingStrategy {
 	 */

 	@Override

 	protected String urlDecodePathComponent(String value) {

-		char altChar = GitBlit.getChar(Keys.web.forwardSlashCharacter, '/');

+		char altChar = settings.getChar(Keys.web.forwardSlashCharacter, '/');

 		if (altChar != '/') {

 			value = value.replace(altChar, '/');

 		}