azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

done() method moved to where it is used

Browse Source
This commit is contained in:
Andrey Breslav
2013-05-13 16:00:11 +04:00
parent 42de8879fe
commit afe3ff9b6f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java
-2
View File
@@ -39,8 +39,6 @@ public class ClassPreloadingUtils {
public void beforeLoadJar(File jarFile) {} public void beforeLoadJar(File jarFile) {}
public void afterLoadJar(File jarFile) {} public void afterLoadJar(File jarFile) {}
public void done() {}
} }
/** /**
compiler/preloader/src/org/jetbrains/jet/preloading/Preloader.java
+8 -4
View File
@@ -43,7 +43,7 @@ public class Preloader {
ClassLoader withInstrumenter = instrumentersClasspath.length > 0 ? new URLClassLoader(instrumentersClasspath, parent) : parent; 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); ClassLoader preloaded = ClassPreloadingUtils.preloadClasses(files, classNumber, withInstrumenter, handler);
Class<?> mainClass = preloaded.loadClass(mainClassCanonicalName); Class<?> mainClass = preloaded.loadClass(mainClassCanonicalName);
@@ -96,8 +96,8 @@ public class Preloader {
return files; return files;
} }
private static ClassPreloadingUtils.ClassHandler getHandler(ProfilingMode profilingMode, ClassLoader withInstrumenter) { private static Handler getHandler(ProfilingMode profilingMode, ClassLoader withInstrumenter) {
if (profilingMode == ProfilingMode.NO_TIME) return new ClassPreloadingUtils.ClassHandler() {}; if (profilingMode == ProfilingMode.NO_TIME) return new Handler();
ServiceLoader<Instrumenter> loader = ServiceLoader.load(Instrumenter.class, withInstrumenter); ServiceLoader<Instrumenter> loader = ServiceLoader.load(Instrumenter.class, withInstrumenter);
Iterator<Instrumenter> instrumenters = loader.iterator(); Iterator<Instrumenter> instrumenters = loader.iterator();
@@ -105,7 +105,7 @@ public class Preloader {
final int[] counter = new int[1]; final int[] counter = new int[1];
final int[] size = new int[1]; final int[] size = new int[1];
return new ClassPreloadingUtils.ClassHandler() { return new Handler() {
@Override @Override
public void beforeDefineClass(String name, int sizeInBytes) { public void beforeDefineClass(String name, int sizeInBytes) {
counter[0]++; 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.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); System.exit(1);
} }
private static class Handler extends ClassPreloadingUtils.ClassHandler {
public void done() {}
}
} }