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/ForkPage.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/ForkPage.java b/src/main/java/com/gitblit/wicket/pages/ForkPage.java
index fe316ff..1202012 100644
--- a/src/main/java/com/gitblit/wicket/pages/ForkPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ForkPage.java
@@ -21,9 +21,9 @@
import org.apache.wicket.markup.html.basic.Label;
import org.slf4j.LoggerFactory;
-import com.gitblit.GitBlit;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
+import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.GitblitRedirectException;
import com.gitblit.wicket.WicketUtils;
@@ -49,7 +49,7 @@
throw new GitblitRedirectException(SummaryPage.class, WicketUtils.newRepositoryParameter(repository.name));
}
- String fork = GitBlit.self().getFork(user.username, repository.name);
+ String fork = app().repositories().getFork(user.username, repository.name);
if (fork != null) {
// redirect to user's fork
throw new GitblitRedirectException(SummaryPage.class, WicketUtils.newRepositoryParameter(fork));
@@ -62,7 +62,7 @@
session.isForking(true);
// fork it
- ForkThread forker = new ForkThread(repository, session);
+ ForkThread forker = new ForkThread(app(), repository, session);
forker.start();
}
}
@@ -84,10 +84,12 @@
*/
private static class ForkThread extends Thread {
+ private final GitBlitWebApp app;
private final RepositoryModel repository;
private final GitBlitWebSession session;
- public ForkThread(RepositoryModel repository, GitBlitWebSession session) {
+ public ForkThread(GitBlitWebApp app, RepositoryModel repository, GitBlitWebSession session) {
+ this.app = app;
this.repository = repository;
this.session = session;
}
@@ -96,7 +98,7 @@
public void run() {
UserModel user = session.getUser();
try {
- GitBlit.self().fork(repository, user);
+ app.gitblit().fork(repository, user);
} catch (Exception e) {
LoggerFactory.getLogger(ForkPage.class).error(MessageFormat.format("Failed to fork {0} for {1}", repository.name, user.username), e);
} finally {
--
Gitblit v1.9.1