diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java
index cd724db939e4..f3ba0bded81f 100644
--- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java
+++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java
@@ -96,7 +96,7 @@ public final class PackageElement implements Queryable, RootsProvider {
 
 
 
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     PsiPackage pkg = getPackage();
     if (pkg instanceof Queryable) {
       ((Queryable)pkg).putInfo(info);
diff --git a/java/java-impl/src/com/intellij/ide/todo/nodes/TodoPackageNode.java b/java/java-impl/src/com/intellij/ide/todo/nodes/TodoPackageNode.java
index 7adfab1b46c3..501552de4234 100644
--- a/java/java-impl/src/com/intellij/ide/todo/nodes/TodoPackageNode.java
+++ b/java/java-impl/src/com/intellij/ide/todo/nodes/TodoPackageNode.java
@@ -142,7 +142,7 @@ public final class TodoPackageNode extends PackageElementNode implements Highlig
   }
 
   @Override
-  public void apply(Map<String, String> info) {
+  public void apply(@NotNull Map<String, String> info) {
     info.put("toDoFileCount", String.valueOf(getFileCount(getValue())));
     info.put("toDoItemCount", String.valueOf(getTodoItemCount(getValue())));
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java
index 33375329898a..4f9a03907002 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java
@@ -603,7 +603,7 @@ public class ClsClassImpl extends ClsRepositoryPsiElement<PsiClassStub<?>> imple
   }
 
   @Override
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     PsiClassImpl.putInfo(this, info);
   }
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
index b3d3a7cf2173..de4067340f55 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
@@ -483,7 +483,7 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
   }
 
   @Override
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     PsiFileImpl.putInfo(this, info);
   }
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
index e6acdad103bc..186b3430cb39 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
@@ -655,11 +655,11 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
   }
 
   @Override
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     putInfo(this, info);
   }
 
-  public static void putInfo(PsiClass psiClass, Map<String, String> info) {
+  public static void putInfo(@NotNull PsiClass psiClass, @NotNull Map<String, String> info) {
     info.put("className", psiClass.getName());
     info.put("qualifiedClassName", psiClass.getQualifiedName());
     PsiFile file = psiClass.getContainingFile();
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
index feffcfa8b6d3..675b4d58efa0 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
@@ -458,7 +458,7 @@ public class PsiFieldImpl extends JavaStubPsiElement<PsiFieldStub> implements Ps
   }
 
   @Override
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     info.put("fieldName", getName());
   }
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java
index 20948f4e00f2..ba7bed204c82 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java
@@ -381,7 +381,7 @@ public class PsiMethodImpl extends JavaStubPsiElement<PsiMethodStub> implements
   }
 
   @Override
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     info.put("methodName", getName());
   }
 
diff --git a/platform/core-api/src/com/intellij/openapi/ui/Queryable.java b/platform/core-api/src/com/intellij/openapi/ui/Queryable.java
index f57b6e4dcb8e..263153ffc0e2 100644
--- a/platform/core-api/src/com/intellij/openapi/ui/Queryable.java
+++ b/platform/core-api/src/com/intellij/openapi/ui/Queryable.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 public interface Queryable {
 
-  void putInfo(Map<String, String> info);
+  void putInfo(@NotNull Map<String, String> info);
 
   class PrintInfo {
     String[] myIdKeys;
@@ -69,7 +69,7 @@ public interface Queryable {
         id = map.values().iterator().next();
       }
 
-      StringBuffer info = new StringBuffer();
+      StringBuilder info = new StringBuilder();
       if (print.myInfoKeys != null) {
         for (String eachKey : print.myInfoKeys) {
           String eachValue = map.get(eachKey);
@@ -92,7 +92,7 @@ public interface Queryable {
   }
 
   interface Contributor {
-    void apply(Map<String, String> info);
+    void apply(@NotNull Map<String, String> info);
   }
 
 }
\ No newline at end of file
diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/PsiBinaryFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/PsiBinaryFileImpl.java
index 3cac0a42fa82..63c635330433 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/file/PsiBinaryFileImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/PsiBinaryFileImpl.java
@@ -307,7 +307,7 @@ public class PsiBinaryFileImpl extends PsiElementBase implements PsiBinaryFile,
   }
 
   @Override
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     info.put("fileName", getName());
     info.put("fileType", getFileType().getName());
   }
diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/PsiDirectoryImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/PsiDirectoryImpl.java
index 051dd1d5990e..4a8e7f0a0e07 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/file/PsiDirectoryImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/PsiDirectoryImpl.java
@@ -612,7 +612,7 @@ public class PsiDirectoryImpl extends PsiElementBase implements PsiDirectory, Qu
   }
 
   @Override
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     info.put("fileName", getName());
   }
 }
diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java b/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java
index 276ef9cbef08..9daf93817a0e 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java
@@ -299,7 +299,7 @@ public abstract class PsiPackageBase extends PsiElementBase implements PsiDirect
   }
 
   @Override
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     info.put("packageName", getName());
     info.put("packageQualifiedName", getQualifiedName());
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
index c15259f45760..a6d8f607482a 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
@@ -815,7 +815,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
   }
 
   @Override
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     StringBuilder result = new StringBuilder();
     for (int i = 0; i < myList.size(); i++) {
       NavBarItem each = myList.get(i);
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPopup.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPopup.java
index 98fe6fdddcc2..f131e966b4fc 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPopup.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPopup.java
@@ -220,7 +220,7 @@ public class NavBarPopup extends LightweightHint implements Disposable{
     }
 
     @Override
-    public void putInfo(Map<String, String> info) {
+    public void putInfo(@NotNull Map<String, String> info) {
       myPanel.putInfo(info);
     }
 
diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java
index 18dd2a9ded50..d38c34d6e7a5 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeNode.java
@@ -153,7 +153,7 @@ public abstract class AbstractTreeNode<T> extends PresentableNodeDescriptor impl
     return getTestPresentation();
   }
 
-  public void apply(Map<String, String> info) {
+  public void apply(@NotNull Map<String, String> info) {
   }
 
   /**
diff --git a/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java b/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
index ec5e96c72169..3ffe498ed2e8 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.SimpleColoredText;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.ui.content.AlertIcon;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -350,7 +351,7 @@ public final class TabInfo implements Queryable {
     return this;
   }
 
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     if (myQueryable != null) {
       myQueryable.putInfo(info);
     }
diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
index d3bcf1b42a69..58fe30399f6d 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
@@ -3038,7 +3038,7 @@ public class JBTabsImpl extends JComponent
     return getTabsPosition() == JBTabsPosition.top || getTabsPosition() == JBTabsPosition.bottom;
   }
 
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     final TabInfo selected = getSelectedInfo();
     if (selected != null) {
       selected.putInfo(info);
diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java
index 2746d51ddb37..c3d613338de0 100644
--- a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java
+++ b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java
@@ -638,7 +638,7 @@ public class Tree extends JTree implements ComponentWithEmptyText, ComponentWith
     boolean accept(T node);
   }
 
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     final TreePath[] selection = getSelectionPaths();
     if (selection == null) return;
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.java
index 50a87000b721..5d650e62dacc 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.java
@@ -29,6 +29,7 @@ import com.intellij.openapi.ui.Queryable;
 import com.intellij.openapi.ui.TypingTarget;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.util.ui.UIUtil;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -206,7 +207,7 @@ public class EditorComponentImpl extends JComponent implements Scrollable, DataP
   }
 
   @Override
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     myEditor.putInfo(info);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
index f4cc2045a3ea..7e1a872618ee 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
@@ -331,7 +331,7 @@ final class EditorTabbedContainer implements Disposable, CloseAction.CloseTarget
       myTab = tab;
     }
 
-    public void putInfo(Map<String, String> info) {
+    public void putInfo(@NotNull Map<String, String> info) {
       info.put("editorTab", myTab.getText());
     }
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
index 8d203c82592b..d3e4871fe115 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
@@ -537,7 +537,7 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra
       return this;
     }
 
-    public void putInfo(Map<String, String> info) {
+    public void putInfo(@NotNull Map<String, String> info) {
       info.put("dialog", getTitle());
     }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
index 208870ddfb03..1a9bd32106cf 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
@@ -38,6 +38,7 @@ import com.intellij.ui.content.Content;
 import com.intellij.util.Producer;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -825,7 +826,7 @@ public final class InternalDecorator extends JPanel implements Queryable, TypeSa
     return myTitlePanel;
   }
 
-  public void putInfo(Map<String, String> info) {
+  public void putInfo(@NotNull Map<String, String> info) {
     info.put("toolWindowTitle", myToolWindow.getTitle());
 
     final Content selection = myToolWindow.getContentManager().getSelectedContent();