Cleanup (warnings) clion/163.4770
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 19 Sep 2016 10:39:56 +0000 (13:39 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 19 Sep 2016 10:40:31 +0000 (13:40 +0300)
jps/jps-builders/src/org/jetbrains/jps/incremental/BuildOperations.java

index beb3df64c1d981674ad90051fd1bc435162227ef..b69140f8e4bdc4d83dcef37c0a99d032138f196e 100644 (file)
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.builders.*;
 import org.jetbrains.jps.builders.impl.BuildTargetChunk;
+import org.jetbrains.jps.builders.java.JavaBuilderUtil;
 import org.jetbrains.jps.builders.logging.ProjectBuilderLogger;
 import org.jetbrains.jps.builders.storage.SourceToOutputMapping;
 import org.jetbrains.jps.cmdline.ProjectDescriptor;
@@ -48,7 +49,7 @@ public class BuildOperations {
     final ProjectDescriptor pd = context.getProjectDescriptor();
     final Timestamps timestamps = pd.timestamps.getStorage();
     final BuildTargetConfiguration configuration = pd.getTargetsState().getTargetConfiguration(target);
-    if (context.isProjectRebuild()) {
+    if (JavaBuilderUtil.isForcedRecompilationAllJavaModules(context)) {
       FSOperations.markDirtyFiles(context, target, CompilationRound.CURRENT, timestamps, true, null, null);
       pd.fsState.markInitialScanPerformed(target);
       configuration.save(context);
@@ -180,7 +181,7 @@ public class BuildOperations {
 
       });
 
-      if (context.isMake()) {
+      if (JavaBuilderUtil.isCompileJavaIncrementally(context)) {
         final ProjectBuilderLogger logger = context.getLoggingManager().getProjectBuilderLogger();
         if (logger.isEnabled()) {
           logger.logDeletedFiles(deletedPaths);