diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/core-impl/src/com/intellij/psi/impl/DocumentCommitProcessor.java | |
parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'platform/core-impl/src/com/intellij/psi/impl/DocumentCommitProcessor.java')
-rw-r--r-- | platform/core-impl/src/com/intellij/psi/impl/DocumentCommitProcessor.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/platform/core-impl/src/com/intellij/psi/impl/DocumentCommitProcessor.java b/platform/core-impl/src/com/intellij/psi/impl/DocumentCommitProcessor.java index a42d7a1944f0..670aaf1d8493 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/DocumentCommitProcessor.java +++ b/platform/core-impl/src/com/intellij/psi/impl/DocumentCommitProcessor.java @@ -51,20 +51,20 @@ public abstract class DocumentCommitProcessor { public abstract void commitAsynchronously(@NotNull final Project project, @NotNull final Document document, @NonNls @NotNull Object reason); protected static class CommitTask { - public final Document document; - public final Project project; + @NotNull public final Document document; + @NotNull public final Project project; // when queued it's not started // when dequeued it's started // when failed it's canceled - public final ProgressIndicator indicator; // progress to commit this doc under. - public final Object reason; + @NotNull public final ProgressIndicator indicator; // progress to commit this doc under. + @NotNull public final Object reason; public boolean removed; // task marked as removed, should be ignored. public CommitTask(@NotNull Document document, - @NotNull Project project, - @NotNull ProgressIndicator indicator, - @NotNull Object reason) { + @NotNull Project project, + @NotNull ProgressIndicator indicator, + @NotNull Object reason) { this.document = document; this.project = project; this.indicator = indicator; |