Merge remote-tracking branch 'origin/master'

diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java b/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java
index b28161e0e1b35d32947e82e7f9cecd62950e33ab..f726049f7b7b7ff25e47afb9d14e2e89ea10d284 100644 (file)
--- a/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/beans/ConvertUsagesUtil.java
@@ -15,12 +15,13 @@
  */
 package com.intellij.internal.statistic.beans;
 
-
-import com.intellij.util.containers.hash.HashMap;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.*;
 
+/**
+ * ATTENTION! DO NOT IMPORT @NotNull AND @Nullable ANNOTATIONS
+ * This class is also used on jetbrains web site
+ */
+
 public class ConvertUsagesUtil {
   private static final char GROUP_SEPARATOR = ':';
   private static final char GROUPS_SEPARATOR = ';';
@@ -173,8 +174,8 @@ public class ConvertUsagesUtil {
     assert !key.contains("\"") : key + " contains invalid chars";
   }
 
-  @NotNull
-  public static String ensureProperKey(@NotNull String input) {
+  //@NotNull
+  public static String ensureProperKey(/*@NotNull*/ String input) {
     final StringBuilder escaped = new StringBuilder();
     for (int i = 0; i < input.length(); i++) {
       final char ch = input.charAt(i);