Eliminate nearly all direct GitBlit singleton references in Wicket

James Moger

2013-11-16 99d0d4fd66f3490b61c700065b7d16bc4e73f226

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

@@ -29,7 +29,6 @@
import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.panel.Fragment;



import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.Activity;

import com.gitblit.models.Metric;

@@ -66,7 +65,7 @@
      // parameters

      int daysBack = WicketUtils.getDaysBack(params);

      if (daysBack < 1) {

         daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7);

         daysBack = app().settings().getInteger(Keys.web.activityDuration, 7);

      }

      String objectId = WicketUtils.getObject(params);



@@ -113,7 +112,7 @@
               daysBack, totalCommits, totalAuthors)));



         // create the activity charts

         if (GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) {

         if (app().settings().getBoolean(Keys.web.generateActivityGraph, true)) {

            GoogleCharts charts = createCharts(recentActivity);

            add(new HeaderContributor(charts));

            add(new Fragment("chartsPanel", "chartsFragment", this));

@@ -137,7 +136,7 @@
            ActivityPage.class);



      PageParameters currentParameters = getPageParameters();

      int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7);

      int daysBack = app().settings().getInteger(Keys.web.activityDuration, 7);

      if (currentParameters != null && !currentParameters.containsKey("db")) {

         currentParameters.put("db", daysBack);

      }