From 1d78b8b372f15d89f10fd32cb0227a6a7966de3c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 17 Apr 2014 23:08:07 -0400 Subject: [PATCH] [findbugs] Clarify class used for resource loading --- src/main/java/com/gitblit/wicket/GitBlitWebApp.java | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java index ab5ae2a..58fc5b7 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java @@ -34,10 +34,13 @@ import com.gitblit.manager.IFederationManager; import com.gitblit.manager.IGitblit; 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.tickets.ITicketService; +import com.gitblit.transport.ssh.IPublicKeyManager; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.pages.ActivityPage; import com.gitblit.wicket.pages.BlamePage; @@ -49,6 +52,8 @@ import com.gitblit.wicket.pages.ComparePage; import com.gitblit.wicket.pages.DocPage; import com.gitblit.wicket.pages.DocsPage; +import com.gitblit.wicket.pages.EditTicketPage; +import com.gitblit.wicket.pages.ExportTicketPage; import com.gitblit.wicket.pages.FederationRegistrationPage; import com.gitblit.wicket.pages.ForkPage; import com.gitblit.wicket.pages.ForksPage; @@ -59,6 +64,7 @@ import com.gitblit.wicket.pages.LuceneSearchPage; import com.gitblit.wicket.pages.MetricsPage; import com.gitblit.wicket.pages.MyDashboardPage; +import com.gitblit.wicket.pages.NewTicketPage; import com.gitblit.wicket.pages.OverviewPage; import com.gitblit.wicket.pages.PatchPage; import com.gitblit.wicket.pages.ProjectPage; @@ -70,6 +76,7 @@ import com.gitblit.wicket.pages.SummaryPage; import com.gitblit.wicket.pages.TagPage; import com.gitblit.wicket.pages.TagsPage; +import com.gitblit.wicket.pages.TicketsPage; import com.gitblit.wicket.pages.TreePage; import com.gitblit.wicket.pages.UserPage; import com.gitblit.wicket.pages.UsersPage; @@ -84,11 +91,15 @@ private final IRuntimeManager runtimeManager; + private final IPluginManager pluginManager; + private final INotificationManager notificationManager; private final IUserManager userManager; private final IAuthenticationManager authenticationManager; + + private final IPublicKeyManager publicKeyManager; private final IRepositoryManager repositoryManager; @@ -100,9 +111,11 @@ public GitBlitWebApp( IRuntimeManager runtimeManager, + IPluginManager pluginManager, INotificationManager notificationManager, IUserManager userManager, IAuthenticationManager authenticationManager, + IPublicKeyManager publicKeyManager, IRepositoryManager repositoryManager, IProjectManager projectManager, IFederationManager federationManager, @@ -111,9 +124,11 @@ super(); this.settings = runtimeManager.getSettings(); this.runtimeManager = runtimeManager; + this.pluginManager = pluginManager; this.notificationManager = notificationManager; this.userManager = userManager; this.authenticationManager = authenticationManager; + this.publicKeyManager = publicKeyManager; this.repositoryManager = repositoryManager; this.projectManager = projectManager; this.federationManager = federationManager; @@ -167,6 +182,12 @@ mount("/blame", BlamePage.class, "r", "h", "f"); mount("/users", UsersPage.class); mount("/logout", LogoutPage.class); + + // setup ticket urls + mount("/tickets", TicketsPage.class, "r", "h"); + mount("/tickets/new", NewTicketPage.class, "r"); + mount("/tickets/edit", EditTicketPage.class, "r", "h"); + mount("/tickets/export", ExportTicketPage.class, "r", "h"); // setup the markup document urls mount("/docs", DocsPage.class, "r"); @@ -257,6 +278,10 @@ return runtimeManager; } + public IPluginManager plugins() { + return pluginManager; + } + public INotificationManager notifier() { return notificationManager; } @@ -267,6 +292,10 @@ public IAuthenticationManager authentication() { return authenticationManager; + } + + public IPublicKeyManager keys() { + return publicKeyManager; } public IRepositoryManager repositories() { @@ -285,6 +314,10 @@ return gitblit; } + public ITicketService tickets() { + return gitblit.getTicketService(); + } + public TimeZone getTimezone() { return runtimeManager.getTimezone(); } -- Gitblit v1.9.1