diff options
| author | James Moger <james.moger@gitblit.com> | 2013-11-25 01:31:53 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-11-29 11:05:51 -0500 |
| commit | 3a9e76b63f09a32e0b6812e18ffff00fab8e58e6 (patch) | |
| tree | fe5a3f320845d1610500bbc28e7228868b8ce0ab /src/main/java/com/gitblit/wicket/GitBlitWebApp.java | |
| parent | c5069a16da0a78d349b9c86b9d66dd4799257476 (diff) | |
| download | gitblit-3a9e76b63f09a32e0b6812e18ffff00fab8e58e6.tar.gz gitblit-3a9e76b63f09a32e0b6812e18ffff00fab8e58e6.zip | |
Flattened IGitblitManager, GitblitManager, and GitBlit classes
Change-Id: Id6deb27306e0034898673bf5d5d76a4ed012ced6
Diffstat (limited to 'src/main/java/com/gitblit/wicket/GitBlitWebApp.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/GitBlitWebApp.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index 1409e474..35a0823b 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -30,13 +30,13 @@ import org.apache.wicket.protocol.http.WebApplication; import com.gitblit.IStoredSettings; import com.gitblit.Keys; +import com.gitblit.manager.IAuthenticationManager; import com.gitblit.manager.IFederationManager; -import com.gitblit.manager.IGitblitManager; +import com.gitblit.manager.IGitblit; import com.gitblit.manager.INotificationManager; import com.gitblit.manager.IProjectManager; import com.gitblit.manager.IRepositoryManager; import com.gitblit.manager.IRuntimeManager; -import com.gitblit.manager.IAuthenticationManager; import com.gitblit.manager.IUserManager; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.pages.ActivityPage; @@ -95,10 +95,10 @@ public class GitBlitWebApp extends WebApplication { private final IProjectManager projectManager; - private final IGitblitManager gitblitManager; - private final IFederationManager federationManager; + private final IGitblit gitblit; + public GitBlitWebApp( IRuntimeManager runtimeManager, INotificationManager notificationManager, @@ -106,8 +106,8 @@ public class GitBlitWebApp extends WebApplication { IAuthenticationManager authenticationManager, IRepositoryManager repositoryManager, IProjectManager projectManager, - IGitblitManager gitblitManager, - IFederationManager federationManager) { + IFederationManager federationManager, + IGitblit gitblit) { super(); this.settings = runtimeManager.getSettings(); @@ -117,8 +117,8 @@ public class GitBlitWebApp extends WebApplication { this.authenticationManager = authenticationManager; this.repositoryManager = repositoryManager; this.projectManager = projectManager; - this.gitblitManager = gitblitManager; this.federationManager = federationManager; + this.gitblit = gitblit; } @Override @@ -185,7 +185,7 @@ public class GitBlitWebApp extends WebApplication { mount("/user", UserPage.class, "user"); mount("/forks", ForksPage.class, "r"); mount("/fork", ForkPage.class, "r"); - + getMarkupSettings().setDefaultMarkupEncoding("UTF-8"); super.init(); } @@ -283,8 +283,8 @@ public class GitBlitWebApp extends WebApplication { return federationManager; } - public IGitblitManager gitblit() { - return gitblitManager; + public IGitblit gitblit() { + return gitblit; } public TimeZone getTimezone() { |