package com.codahale.metrics;

/**
 * An abstraction for how time passes. It is passed to {@link Timer} to track timing.
 */
public abstract class Clock {
    /**
     * Returns the current time tick.
     *
     * @return time tick in nanoseconds
     */
    public abstract long getTick();

    /**
     * Returns the current time in milliseconds.
     *
     * @return time in milliseconds
     */
    public long getTime() {
        return System.currentTimeMillis();
    }

    private static final Clock DEFAULT = new UserTimeClock();

    /**
     * The default clock to use.
     *
     * @return the default {@link Clock} instance
     * @see Clock.UserTimeClock
     */
    public static Clock defaultClock() {
        return DEFAULT;
    }

    /**
     * A clock implementation which returns the current time in epoch nanoseconds.
     */
    public static class UserTimeClock extends Clock {
        @Override
        public long getTick() {
            return System.nanoTime();
        }
    }
}

@@ -476,79 +476,16 @@
  %7D%0A%0A
-    private static final Clock DEFAULT = new UserTimeClock();%0A%0A
     /**%0A
     
@@ -476,24 +476,24 @@
  %7D%0A%0A    /**%0A
+
      * The d
@@ -666,16 +666,36 @@
  return 
+UserTimeClockHolder.
 DEFAULT;
@@ -939,24 +939,24 @@
 nanoTime();%0A
-
         %7D%0A  
@@ -958,11 +958,131 @@
  %7D%0A    %7D
+%0A%0A    private static class UserTimeClockHolder %7B%0A        private static final Clock DEFAULT = new UserTimeClock();%0A    %7D
 %0A%7D%0A

Move the default UserTimeClock to a holder class