From 703bb13bf6a5e8536e36ba8927e6697b2a353eda Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 21 Nov 2016 14:10:27 +0100 Subject: [PATCH] Cleanup (merges similar consecutive conditions) --- .../jetbrains/jps/incremental/java/JavaBuilder.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java index d0a37af7e73b..fe102bcf84a3 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java @@ -186,20 +186,16 @@ public class JavaBuilder extends ModuleLevelBuilder { } }); - if (!filesToCompile.isEmpty() || dirtyFilesHolder.hasRemovedFiles()) { + if (JavaBuilderUtil.isCompileJavaIncrementally(context)) { // at the moment, there is no incremental compilation for module-info files, so they should be rebuilt on every change JavaModuleIndex index = getJavaModuleIndex(context); for (JpsModule module : chunk.getModules()) { ContainerUtil.addIfNotNull(filesToCompile, index.getModuleInfoFile(module)); } - } - if (JavaBuilderUtil.isCompileJavaIncrementally(context)) { - final ProjectBuilderLogger logger = context.getLoggingManager().getProjectBuilderLogger(); - if (logger.isEnabled()) { - if (!filesToCompile.isEmpty()) { - logger.logCompiledFiles(filesToCompile, BUILDER_NAME, "Compiling files:"); - } + ProjectBuilderLogger logger = context.getLoggingManager().getProjectBuilderLogger(); + if (logger.isEnabled() && !filesToCompile.isEmpty()) { + logger.logCompiledFiles(filesToCompile, BUILDER_NAME, "Compiling files:"); } }