From afe3ff9b6f06940b077e323c25257eb6ceb86939 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Mon, 13 May 2013 16:00:11 +0400
Subject: [PATCH] done() method moved to where it is used

---
 .../jet/preloading/ClassPreloadingUtils.java         |  2 --
 .../src/org/jetbrains/jet/preloading/Preloader.java  | 12 ++++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java b/compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java
index 97adf0965b5..a9cf32480a8 100644
--- a/compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java
+++ b/compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java
@@ -39,8 +39,6 @@ public class ClassPreloadingUtils {
 
         public void beforeLoadJar(File jarFile) {}
         public void afterLoadJar(File jarFile) {}
-
-        public void done() {}
     }
 
     /**
diff --git a/compiler/preloader/src/org/jetbrains/jet/preloading/Preloader.java b/compiler/preloader/src/org/jetbrains/jet/preloading/Preloader.java
index 640e9a41374..07d9b6e644d 100644
--- a/compiler/preloader/src/org/jetbrains/jet/preloading/Preloader.java
+++ b/compiler/preloader/src/org/jetbrains/jet/preloading/Preloader.java
@@ -43,7 +43,7 @@ public class Preloader {
 
         ClassLoader withInstrumenter = instrumentersClasspath.length > 0 ? new URLClassLoader(instrumentersClasspath, parent) : parent;
 
-        ClassPreloadingUtils.ClassHandler handler = getHandler(profilingMode, withInstrumenter);
+        Handler handler = getHandler(profilingMode, withInstrumenter);
         ClassLoader preloaded = ClassPreloadingUtils.preloadClasses(files, classNumber, withInstrumenter, handler);
 
         Class<?> mainClass = preloaded.loadClass(mainClassCanonicalName);
@@ -96,8 +96,8 @@ public class Preloader {
         return files;
     }
 
-    private static ClassPreloadingUtils.ClassHandler getHandler(ProfilingMode profilingMode, ClassLoader withInstrumenter) {
-        if (profilingMode == ProfilingMode.NO_TIME) return new ClassPreloadingUtils.ClassHandler() {};
+    private static Handler getHandler(ProfilingMode profilingMode, ClassLoader withInstrumenter) {
+        if (profilingMode == ProfilingMode.NO_TIME) return new Handler();
 
         ServiceLoader<Instrumenter> loader = ServiceLoader.load(Instrumenter.class, withInstrumenter);
         Iterator<Instrumenter> instrumenters = loader.iterator();
@@ -105,7 +105,7 @@ public class Preloader {
 
         final int[] counter = new int[1];
         final int[] size = new int[1];
-        return new ClassPreloadingUtils.ClassHandler() {
+        return new Handler() {
             @Override
             public void beforeDefineClass(String name, int sizeInBytes) {
                 counter[0]++;
@@ -147,4 +147,8 @@ public class Preloader {
         System.out.println("Usage: Preloader <paths to jars> <main class> <class number estimate> <time|notime|profile=<profiling class path>> <parameters to pass to the main class>");
         System.exit(1);
     }
+
+    private static class Handler extends ClassPreloadingUtils.ClassHandler {
+        public void done() {}
+    }
 }