From a7f8dbdb25696c5f30011f9fef7feaea0dab7cc9 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Tue, 10 Jul 2012 15:25:01 +0200 Subject: [PATCH] move java in-proc compiler to internal mode --- .../compiler/CompilerConfigurationImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java index d719e245f094..5c8f45a1459f 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java @@ -24,6 +24,7 @@ package com.intellij.compiler; import com.intellij.CommonBundle; import com.intellij.ProjectTopics; import com.intellij.compiler.impl.javaCompiler.BackendCompiler; +import com.intellij.compiler.impl.javaCompiler.api.CompilerAPICompiler; import com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompiler; import com.intellij.compiler.impl.javaCompiler.eclipse.EclipseEmbeddedCompiler; import com.intellij.compiler.impl.javaCompiler.javac.JavacCompiler; @@ -285,15 +286,14 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements catch (NoClassDefFoundError e) { // eclipse jar must be not in the classpath } + try { + CompilerAPICompiler inProcessJavaCompiler = new CompilerAPICompiler(myProject); + myRegisteredCompilers.add(inProcessJavaCompiler); + } + catch (NoClassDefFoundError e) { + // wrong JDK + } } - - //try { - // CompilerAPICompiler inProcessJavaCompiler = new CompilerAPICompiler(myProject); - // myRegisteredCompilers.add(inProcessJavaCompiler); - //} - //catch (NoClassDefFoundError e) { - // // wrong JDK - //} } final BackendCompiler[] compilers = Extensions.getExtensions(BackendCompiler.EP_NAME, myProject);