From 9038a86a72396e44b6f2d493b19cea63626f9c9c Mon Sep 17 00:00:00 2001 From: Raul Bache Date: Sun, 24 Aug 2014 21:26:06 +0200 Subject: [PATCH] Main cleaned up, --- .../retrolambda/maven/ProcessClassesMojoTest.java | 4 ++-- .../main/java/net/orfjackal/retrolambda/Main.java | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/retrolambda-maven-plugin/src/test/java/net/orfjackal/retrolambda/maven/ProcessClassesMojoTest.java b/retrolambda-maven-plugin/src/test/java/net/orfjackal/retrolambda/maven/ProcessClassesMojoTest.java index cda1ecd5..cfdbbcb7 100644 --- a/retrolambda-maven-plugin/src/test/java/net/orfjackal/retrolambda/maven/ProcessClassesMojoTest.java +++ b/retrolambda-maven-plugin/src/test/java/net/orfjackal/retrolambda/maven/ProcessClassesMojoTest.java @@ -49,7 +49,7 @@ public void java_command_defaults_to_current_jvm() { assertThat(mojo.getJavaCommand(), is(new File(System.getProperty("java.home"), "bin/java").getAbsolutePath())); } -/* @Test + @Test public void java_command_from_toolchain_overrides_the_current_jvm() { toolchainManager.setJdkToolChain(new FakeJavaToolChain("jdk-from-toolchain")); @@ -66,7 +66,7 @@ public void java_command_from_local_configuration_overrides_the_toolchain() { verify(log).warn("Toolchains are ignored, 'java8home' parameter is set to jdk-from-local-configuration"); } -*/ + private static class FakeToolchainManager implements ToolchainManager { private final Map toolChainsByType = new HashMap(); diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/Main.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/Main.java index 3b1ae884..feba36e5 100644 --- a/retrolambda/src/main/java/net/orfjackal/retrolambda/Main.java +++ b/retrolambda/src/main/java/net/orfjackal/retrolambda/Main.java @@ -39,19 +39,6 @@ public static void main(String[] args) { try { Thread.currentThread().setContextClassLoader(new URLClassLoader(asUrls(classpath))); - /** - * { - @Override - public Class loadClass(String name) throws ClassNotFoundException { - Class loadedClass = findLoadedClass(name); - if(loadedClass != null) { - return loadedClass; - } else { - return super.loadClass(name); - } - } - } - */ visitFiles(inputDir, includedFiles, new BytecodeTransformingFileVisitor(inputDir, outputDir) { @Override