From ab07d0d86d8b64b4f7c88b45bc81f1eec22105db Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:00:05 -0400
Subject: [PATCH] Preserve key index when re-adding an existing key
---
src/main/java/com/gitblit/wicket/GitblitWicketFilter.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/GitblitWicketFilter.java b/src/main/java/com/gitblit/wicket/GitblitWicketFilter.java
index 9e55470..7865fb3 100644
--- a/src/main/java/com/gitblit/wicket/GitblitWicketFilter.java
+++ b/src/main/java/com/gitblit/wicket/GitblitWicketFilter.java
@@ -28,6 +28,7 @@
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
+import com.gitblit.dagger.DaggerWicketFilter;
import com.gitblit.manager.IProjectManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
@@ -35,6 +36,8 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
+
+import dagger.ObjectGraph;
/**
*
@@ -44,26 +47,25 @@
* @author James Moger
*
*/
-public class GitblitWicketFilter extends WicketFilter {
+public class GitblitWicketFilter extends DaggerWicketFilter {
- private final IStoredSettings settings;
+ private IStoredSettings settings;
- private final IRuntimeManager runtimeManager;
+ private IRuntimeManager runtimeManager;
- private final IRepositoryManager repositoryManager;
+ private IRepositoryManager repositoryManager;
- private final IProjectManager projectManager;
+ private IProjectManager projectManager;
- private final GitBlitWebApp webapp;
+ private GitBlitWebApp webapp;
- public GitblitWicketFilter(GitBlitWebApp webapp) {
-
- super();
- this.settings = webapp.settings();
- this.runtimeManager = webapp.runtime();
- this.repositoryManager = webapp.repositories();
- this.projectManager = webapp.projects();
- this.webapp = webapp;
+ @Override
+ protected void inject(ObjectGraph dagger) {
+ this.settings = dagger.get(IStoredSettings.class);
+ this.runtimeManager = dagger.get(IRuntimeManager.class);
+ this.repositoryManager = dagger.get(IRepositoryManager.class);
+ this.projectManager = dagger.get(IProjectManager.class);
+ this.webapp = dagger.get(GitBlitWebApp.class);
}
@Override
--
Gitblit v1.9.1