Remove @Inject references because they confuse JEE containers

James Moger

2013-12-10 cc47aad618137ee6481c8bc164d8074bd30fde9e

 src/main/java/com/gitblit/wicket/GitblitWicketFilter.java

@@ -26,7 +26,6 @@
import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.GitBlit;

import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.manager.IProjectManager;

@@ -47,7 +46,24 @@
 */

public class GitblitWicketFilter extends WicketFilter {



   public GitblitWicketFilter() {

   private final IStoredSettings settings;



   private final IRuntimeManager runtimeManager;



   private final IRepositoryManager repositoryManager;



   private final IProjectManager projectManager;



   private final 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

@@ -55,7 +71,7 @@
      return new IWebApplicationFactory() {

         @Override

         public WebApplication createApplication(WicketFilter filter) {

            return new GitBlitWebApp();

            return webapp;

         }

      };

   }

@@ -96,11 +112,6 @@
      if (!StringUtils.isEmpty(servletRequest.getParameter("h"))) {

         commitId = servletRequest.getParameter("h");

      }



      IRuntimeManager runtimeManager = GitBlit.getManager(IRuntimeManager.class);

      IStoredSettings settings = runtimeManager.getSettings();

      IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

      IProjectManager projectManager = GitBlit.getManager(IProjectManager.class);



      repo = repo.replace("%2f", "/").replace("%2F", "/").replace(settings.getChar(Keys.web.forwardSlashCharacter, '/'), '/');