diff --git a/platform/core-api/src/com/intellij/openapi/components/ComponentManager.java b/platform/core-api/src/com/intellij/openapi/components/ComponentManager.java
index 0462e953222e..da830b5e1961 100644
--- a/platform/core-api/src/com/intellij/openapi/components/ComponentManager.java
+++ b/platform/core-api/src/com/intellij/openapi/components/ComponentManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public interface ComponentManager extends UserDataHolder, Disposable {
    *
    * @param name the name of the component
    * @return component with given name or null if there is no such component
-   * @see com.intellij.openapi.components.NamedComponent#getComponentName()
+   * @see NamedComponent#getComponentName()
    */
   BaseComponent getComponent(@NotNull String name);
 
@@ -94,5 +94,5 @@ public interface ComponentManager extends UserDataHolder, Disposable {
    * see {@link com.intellij.openapi.application.Application#invokeLater(Runnable, Condition)} for the usage example.
    */
   @NotNull
-  Condition getDisposed();
-}
+  Condition<?> getDisposed();
+}
\ No newline at end of file
diff --git a/platform/core-impl/src/com/intellij/mock/MockComponentManager.java b/platform/core-impl/src/com/intellij/mock/MockComponentManager.java
index 3c60fd0f51a1..88febf62de5d 100644
--- a/platform/core-impl/src/com/intellij/mock/MockComponentManager.java
+++ b/platform/core-impl/src/com/intellij/mock/MockComponentManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -145,7 +145,7 @@ public class MockComponentManager extends UserDataHolderBase implements Componen
 
   @NotNull
   @Override
-  public Condition getDisposed() {
+  public Condition<?> getDisposed() {
     return Conditions.alwaysFalse();
   }
 }
diff --git a/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java b/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
index 80fa427a6dac..9421e80486de 100644
--- a/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
@@ -370,7 +370,7 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements
 
   @Override
   @NotNull
-  public final Condition getDisposed() {
+  public final Condition<?> getDisposed() {
     return myDisposedCondition;
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/DummyProject.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/DummyProject.java
index 928b8cc55784..a15c23f55d79 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/DummyProject.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/DummyProject.java
@@ -138,7 +138,7 @@ public class DummyProject extends UserDataHolderBase implements Project {
 
   @Override
   @NotNull
-  public Condition getDisposed() {
+  public Condition<?> getDisposed() {
     return o -> isDisposed();
   }
 
@@ -186,4 +186,4 @@ public class DummyProject extends UserDataHolderBase implements Project {
   public ComponentConfig getConfig(Class componentImplementation) {
     throw new UnsupportedOperationException("Method getConfig not implemented in " + getClass());
   }
-}
+}
\ No newline at end of file