Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12

1 files changed, 4 insertions, 3 deletions

diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java
index 7713734d07de..eaed20f2960d 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/PsiAwareFileEditorManagerImpl.java
@@ -102,8 +102,9 @@ public class PsiAwareFileEditorManagerImpl extends FileEditorManagerImpl {
     return myProblemSolver.isProblemFile(file);
   }
 
+  @NotNull
   @Override
-  public String getFileTooltipText(final VirtualFile file) {
+  public String getFileTooltipText(@NotNull final VirtualFile file) {
     final StringBuilder tooltipText = new StringBuilder();
     final Module module = ModuleUtilCore.findModuleForFile(file, getProject());
     if (module != null) {
@@ -116,7 +117,7 @@ public class PsiAwareFileEditorManagerImpl extends FileEditorManagerImpl {
   }
 
   @Override
-  protected Editor getOpenedEditor(final Editor editor, final boolean focusEditor) {
+  protected Editor getOpenedEditor(@NotNull final Editor editor, final boolean focusEditor) {
     PsiDocumentManager documentManager = PsiDocumentManager.getInstance(getProject());
     Document document = editor.getDocument();
     PsiFile psiFile = documentManager.getPsiFile(document);
@@ -200,7 +201,7 @@ public class PsiAwareFileEditorManagerImpl extends FileEditorManagerImpl {
       updateFile(file);
     }
 
-    private void updateFile(final VirtualFile file) {
+    private void updateFile(@NotNull VirtualFile file) {
       queueUpdateFile(file);
     }
   }