Eliminate nearly all direct GitBlit singleton references in Wicket

James Moger

2013-11-16 99d0d4fd66f3490b61c700065b7d16bc4e73f226

 src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java

@@ -25,7 +25,6 @@
import org.apache.wicket.model.Model;

import org.apache.wicket.protocol.http.WebResponse;



import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.UserModel;

@@ -45,16 +44,16 @@
         throw new RestartResponseException(getApplication().getHomePage());

      }



      if (!GitBlit.getBoolean(Keys.web.authenticateAdminPages, true)

            && !GitBlit.getBoolean(Keys.web.authenticateViewPages, false)) {

      if (!app().settings().getBoolean(Keys.web.authenticateAdminPages, true)

            && !app().settings().getBoolean(Keys.web.authenticateViewPages, false)) {

         // no authentication enabled

         throw new RestartResponseException(getApplication().getHomePage());

      }



      UserModel user = GitBlitWebSession.get().getUser();

      if (!GitBlit.self().supportsCredentialChanges(user)) {

      if (!app().users().supportsCredentialChanges(user)) {

         error(MessageFormat.format(getString("gb.userServiceDoesNotPermitPasswordChanges"),

               GitBlit.getString(Keys.realm.userService, "${baseFolder}/users.conf")), true);

               app().settings().getString(Keys.realm.userService, "${baseFolder}/users.conf")), true);

      }



      setupPage(getString("gb.changePassword"), user.username);

@@ -74,7 +73,7 @@
            }



            // ensure password satisfies minimum length requirement

            int minLength = GitBlit.getInteger(Keys.realm.minPasswordLength, 5);

            int minLength = app().settings().getInteger(Keys.realm.minPasswordLength, 5);

            if (minLength < 4) {

               minLength = 4;

            }

@@ -86,7 +85,7 @@
            UserModel user = GitBlitWebSession.get().getUser();



            // convert to MD5 digest, if appropriate

            String type = GitBlit.getString(Keys.realm.passwordStorage, "md5");

            String type = app().settings().getString(Keys.realm.passwordStorage, "md5");

            if (type.equalsIgnoreCase("md5")) {

               // store MD5 digest of password

               password = StringUtils.MD5_TYPE + StringUtils.getMD5(password);

@@ -98,10 +97,10 @@


            user.password = password;

            try {

               GitBlit.self().updateUserModel(user.username, user, false);

               if (GitBlit.getBoolean(Keys.web.allowCookieAuthentication, false)) {

               app().users().updateUserModel(user.username, user, false);

               if (app().settings().getBoolean(Keys.web.allowCookieAuthentication, false)) {

                  WebResponse response = (WebResponse) getRequestCycle().getResponse();

                  GitBlit.self().setCookie(response, user);

                  app().session().setCookie(response, user);

               }

            } catch (GitBlitException e) {

               error(e.getMessage());