diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
index df78629e3bda..b341e25e66d2 100644
--- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
+++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
@@ -551,7 +551,7 @@ public class FileReference implements PsiFileReference, FileReferenceOwner, PsiP
   @Override
   public String getUnresolvedMessagePattern() {
     return LangBundle.message("error.cannot.resolve")
-           + " " + (LangBundle.message(isLast() ? "terms.file" : "terms.directory"))
+           + " " + LangBundle.message(isLast() ? "terms.file" : "terms.directory")
            + " '" + StringUtil.escapePattern(decode(getCanonicalText())) + "'";
   }
 
@@ -578,7 +578,7 @@ public class FileReference implements PsiFileReference, FileReferenceOwner, PsiP
     return myFileReferenceSet.getLastReference();
   }
 
-  static class MyResolver implements ResolveCache.PolyVariantContextResolver<FileReference> {
+  private static class MyResolver implements ResolveCache.PolyVariantContextResolver<FileReference> {
     static final MyResolver INSTANCE = new MyResolver();
 
     @NotNull
diff --git a/platform/core-api/src/com/intellij/openapi/util/KeyedExtensionCollector.java b/platform/core-api/src/com/intellij/openapi/util/KeyedExtensionCollector.java
index 58d3d34de69a..11e283bc140f 100644
--- a/platform/core-api/src/com/intellij/openapi/util/KeyedExtensionCollector.java
+++ b/platform/core-api/src/com/intellij/openapi/util/KeyedExtensionCollector.java
@@ -94,7 +94,7 @@ public class KeyedExtensionCollector<T, KeyT> {
     Extensions.getRootArea().addAvailabilityListener(epName, myExtensionPointAvailabilityListener);
   }
 
-  public KeyedExtensionCollector(@NonNls @NotNull String epName, Disposable parentDisposable) {
+  public KeyedExtensionCollector(@NonNls @NotNull String epName, @NotNull Disposable parentDisposable) {
     this(epName);
     Disposer.register(parentDisposable, new Disposable() {
       @Override
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.java
index 41f26d417305..8b373a893f0e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.java
@@ -95,10 +95,12 @@ public class AsyncEditorLoader {
      * to be (optionally) called on EDT
      * @see AsyncEditorLoader#scheduleLoading()
      */
+    @NotNull
     final Future<Runnable> continuationFuture;
+    @NotNull
     final Future<?> totalProgressFuture;
 
-    private LoadingProgress(Future<Runnable> future, Future<?> progressFuture) {
+    private LoadingProgress(@NotNull Future<Runnable> future, @NotNull Future<?> progressFuture) {
       continuationFuture = future;
       totalProgressFuture = progressFuture;
     }
@@ -185,11 +187,12 @@ public class AsyncEditorLoader {
            !ApplicationManager.getApplication().isWriteAccessAllowed();
   }
 
-  private static <T> T resultInTimeOrNull(Future<T> future, long timeMs) {
+  private static <T> T resultInTimeOrNull(@NotNull Future<T> future, long timeMs) {
     try {
       return future.get(timeMs, TimeUnit.MILLISECONDS);
     }
-    catch (InterruptedException | TimeoutException ignored) {}
+    catch (InterruptedException | TimeoutException ignored) {
+    }
     catch (ExecutionException e) {
       throw new RuntimeException(e);
     }