diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-18 17:21:47 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-04-10 18:58:09 -0400 |
| commit | 41a7e46579d12e36c583aa8c2418e49c3f4c29a4 (patch) | |
| tree | bb96e0b1cf6e1fd4b8d42b5536d68f9aafcbd9fa /src/main/java/com/gitblit/manager | |
| parent | 821eb4bbe1a4fac8d17b4df96ab6441985df58d7 (diff) | |
| download | gitblit-41a7e46579d12e36c583aa8c2418e49c3f4c29a4.tar.gz gitblit-41a7e46579d12e36c583aa8c2418e49c3f4c29a4.zip | |
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.
Diffstat (limited to 'src/main/java/com/gitblit/manager')
| -rw-r--r-- | src/main/java/com/gitblit/manager/GitblitManager.java | 10 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/manager/IGitblit.java | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java index 34c101e2..cc670ea6 100644 --- a/src/main/java/com/gitblit/manager/GitblitManager.java +++ b/src/main/java/com/gitblit/manager/GitblitManager.java @@ -104,6 +104,8 @@ public class GitblitManager implements IGitblit { protected final IRuntimeManager runtimeManager; + protected final IPluginManager pluginManager; + protected final INotificationManager notificationManager; protected final IUserManager userManager; @@ -118,21 +120,20 @@ public class GitblitManager implements IGitblit { protected final IFederationManager federationManager; - protected final IPluginManager pluginManager; - public GitblitManager( IRuntimeManager runtimeManager, + IPluginManager pluginManager, INotificationManager notificationManager, IUserManager userManager, IAuthenticationManager authenticationManager, IPublicKeyManager publicKeyManager, IRepositoryManager repositoryManager, IProjectManager projectManager, - IFederationManager federationManager, - IPluginManager pluginManager) { + IFederationManager federationManager) { this.settings = runtimeManager.getSettings(); this.runtimeManager = runtimeManager; + this.pluginManager = pluginManager; this.notificationManager = notificationManager; this.userManager = userManager; this.authenticationManager = authenticationManager; @@ -140,7 +141,6 @@ public class GitblitManager implements IGitblit { this.repositoryManager = repositoryManager; this.projectManager = projectManager; this.federationManager = federationManager; - this.pluginManager = pluginManager; } @Override diff --git a/src/main/java/com/gitblit/manager/IGitblit.java b/src/main/java/com/gitblit/manager/IGitblit.java index 7961a06b..f3202c01 100644 --- a/src/main/java/com/gitblit/manager/IGitblit.java +++ b/src/main/java/com/gitblit/manager/IGitblit.java @@ -31,13 +31,13 @@ import com.gitblit.transport.ssh.IPublicKeyManager; public interface IGitblit extends IManager, IRuntimeManager, + IPluginManager, INotificationManager, IUserManager, IAuthenticationManager, IRepositoryManager, IProjectManager, - IFederationManager, - IPluginManager { + IFederationManager { /** * Returns a list of repository URLs and the user access permission. |