From cacf8bff097fbb66a7be1bfe267b5da2605145f8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:46 -0500
Subject: [PATCH] Use Dagger to inject managers into all filters and servlets

---
 src/main/java/com/gitblit/wicket/panels/UsersPanel.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/panels/UsersPanel.java b/src/main/java/com/gitblit/wicket/panels/UsersPanel.java
index f5b95e2..9c1667f 100644
--- a/src/main/java/com/gitblit/wicket/panels/UsersPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/UsersPanel.java
@@ -26,7 +26,6 @@
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.markup.repeater.data.ListDataProvider;
 
-import com.gitblit.GitBlit;
 import com.gitblit.models.UserModel;
 import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.WicketUtils;
@@ -41,10 +40,10 @@
 
 		Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);
 		adminLinks.add(new BookmarkablePageLink<Void>("newUser", EditUserPage.class)
-				.setVisible(GitBlit.self().supportsAddUser()));
+				.setVisible(app().users().supportsAddUser()));
 		add(adminLinks.setVisible(showAdmin));
 
-		final List<UserModel> users = GitBlit.self().getAllUsers();
+		final List<UserModel> users = app().users().getAllUsers();
 		DataView<UserModel> usersView = new DataView<UserModel>("userRow",
 				new ListDataProvider<UserModel>(users)) {
 			private static final long serialVersionUID = 1L;
@@ -56,13 +55,14 @@
 				counter = 0;
 			}
 
+			@Override
 			public void populateItem(final Item<UserModel> item) {
 				final UserModel entry = item.getModelObject();
 				LinkPanel editLink = new LinkPanel("username", "list", entry.username,
 						EditUserPage.class, WicketUtils.newUsernameParameter(entry.username));
 				WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.getDisplayName());
 				item.add(editLink);
-				
+
 				if (StringUtils.isEmpty(entry.displayName)) {
 					item.add(new Label("displayName").setVisible(false));
 				} else {
@@ -94,7 +94,7 @@
 
 					@Override
 					public void onClick() {
-						if (GitBlit.self().deleteUser(entry.username)) {
+						if (app().users().deleteUser(entry.username)) {
 							users.remove(entry);
 							info(MessageFormat.format(getString("gb.userDeleted"), entry.username));
 						} else {

--
Gitblit v1.9.1