diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
| commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
| download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java')
| -rw-r--r-- | java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java index 03ff006eea40..01da3bc62541 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java @@ -128,8 +128,6 @@ public class BuildManager implements ApplicationComponent{ private static final String COMPILER_PROCESS_JDK_PROPERTY = "compiler.process.jdk"; public static final String SYSTEM_ROOT = "compile-server"; public static final String TEMP_DIR_NAME = "_temp_"; - private static final int MAKE_TRIGGER_DELAY = 300 /*300 ms*/; - private static final int DOCUMENT_SAVE_TRIGGER_DELAY = 1500 /*1.5 sec*/; private final boolean IS_UNIT_TEST_MODE; private static final String IWS_EXTENSION = ".iws"; private static final String IPR_EXTENSION = ".ipr"; @@ -161,7 +159,7 @@ public class BuildManager implements ApplicationComponent{ private final BuildManagerPeriodicTask myAutoMakeTask = new BuildManagerPeriodicTask() { @Override protected int getDelay() { - return Registry.intValue("compiler.automake.trigger.delay", MAKE_TRIGGER_DELAY); + return Registry.intValue("compiler.automake.trigger.delay"); } @Override @@ -173,7 +171,7 @@ public class BuildManager implements ApplicationComponent{ private final BuildManagerPeriodicTask myDocumentSaveTask = new BuildManagerPeriodicTask() { @Override protected int getDelay() { - return Registry.intValue("compiler.document.save.trigger.delay", DOCUMENT_SAVE_TRIGGER_DELAY); + return Registry.intValue("compiler.document.save.trigger.delay"); } private final Semaphore mySemaphore = new Semaphore(); @@ -624,7 +622,7 @@ public class BuildManager implements ApplicationComponent{ data = new ProjectData(new SequentialTaskExecutor(PooledThreadExecutor.INSTANCE)); myProjectDataMap.put(projectPath, data); } - if (isRebuild || (isAutomake && Registry.is("compiler.automake.force.fs.rescan", false))) { + if (isRebuild || (isAutomake && Registry.is("compiler.automake.force.fs.rescan"))) { data.dropChanges(); } if (IS_UNIT_TEST_MODE) { |