From 41a7e46579d12e36c583aa8c2418e49c3f4c29a4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 18 Mar 2014 17:21:47 -0400
Subject: Style: changed manager order to reflect dependency chain

Managers are mostly declared in dependency order.  Managers with fewer dependencies are first.  They are likely to be components of other managers. Also eliminated import artifacts from the cherry-pick.
---
 src/main/java/com/gitblit/DaggerModule.java | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/main/java/com/gitblit/DaggerModule.java')

diff --git a/src/main/java/com/gitblit/DaggerModule.java b/src/main/java/com/gitblit/DaggerModule.java
index 1805c4ec..e448867a 100644
--- a/src/main/java/com/gitblit/DaggerModule.java
+++ b/src/main/java/com/gitblit/DaggerModule.java
@@ -19,17 +19,17 @@ import javax.inject.Singleton;
 
 import com.gitblit.manager.AuthenticationManager;
 import com.gitblit.manager.FederationManager;
-import com.gitblit.manager.PluginManager;
 import com.gitblit.manager.IAuthenticationManager;
 import com.gitblit.manager.IFederationManager;
 import com.gitblit.manager.IGitblit;
-import com.gitblit.manager.IPluginManager;
 import com.gitblit.manager.INotificationManager;
+import com.gitblit.manager.IPluginManager;
 import com.gitblit.manager.IProjectManager;
 import com.gitblit.manager.IRepositoryManager;
 import com.gitblit.manager.IRuntimeManager;
 import com.gitblit.manager.IUserManager;
 import com.gitblit.manager.NotificationManager;
+import com.gitblit.manager.PluginManager;
 import com.gitblit.manager.ProjectManager;
 import com.gitblit.manager.RepositoryManager;
 import com.gitblit.manager.RuntimeManager;
@@ -57,6 +57,7 @@ import dagger.Provides;
 
 			// core managers
 			IRuntimeManager.class,
+			IPluginManager.class,
 			INotificationManager.class,
 			IUserManager.class,
 			IAuthenticationManager.class,
@@ -64,7 +65,6 @@ import dagger.Provides;
 			IRepositoryManager.class,
 			IProjectManager.class,
 			IFederationManager.class,
-			IPluginManager.class,
 
 			// the monolithic manager
 			IGitblit.class,
@@ -83,6 +83,10 @@ public class DaggerModule {
 		return new RuntimeManager(settings);
 	}
 
+	@Provides @Singleton IPluginManager providePluginManager(IRuntimeManager runtimeManager) {
+		return new PluginManager(runtimeManager);
+	}
+
 	@Provides @Singleton INotificationManager provideNotificationManager(IStoredSettings settings) {
 		return new NotificationManager(settings);
 	}
@@ -91,10 +95,6 @@ public class DaggerModule {
 		return new UserManager(runtimeManager);
 	}
 
-	@Provides @Singleton IPluginManager providePluginManager(IRuntimeManager runtimeManager) {
-		return new PluginManager(runtimeManager);
-	}
-
 	@Provides @Singleton IAuthenticationManager provideAuthenticationManager(
 			IRuntimeManager runtimeManager,
 			IUserManager userManager) {
@@ -162,25 +162,25 @@ public class DaggerModule {
 
 	@Provides @Singleton IGitblit provideGitblit(
 			IRuntimeManager runtimeManager,
+			IPluginManager pluginManager,
 			INotificationManager notificationManager,
 			IUserManager userManager,
 			IAuthenticationManager authenticationManager,
 			IPublicKeyManager publicKeyManager,
 			IRepositoryManager repositoryManager,
 			IProjectManager projectManager,
-			IFederationManager federationManager,
-			IPluginManager pluginManager) {
+			IFederationManager federationManager) {
 
 		return new GitBlit(
 				runtimeManager,
+				pluginManager,
 				notificationManager,
 				userManager,
 				authenticationManager,
 				publicKeyManager,
 				repositoryManager,
 				projectManager,
-				federationManager,
-				pluginManager);
+				federationManager);
 	}
 
 	@Provides @Singleton GitBlitWebApp provideWebApplication(
-- 
cgit v1.2.3