From 89c66df7b63bb6a6d5998482fdb922da2d00e7e0 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 9 Nov 2010 17:10:10 +0300
Subject: [PATCH] name disambiguation

---
 .../lang-impl/src/com/intellij/ui/DeferredIconImpl.java     | 6 +++---
 .../lang-impl/src/com/intellij/ui/IconDeferrerImpl.java     | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java
index ff47de5d1d0f..e05741cc339c 100644
--- a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java
+++ b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java
@@ -47,7 +47,7 @@ public class DeferredIconImpl<T> implements DeferredIcon {
   private boolean myNeedReadAction;
   private boolean myDone;
 
-  private Disposer<T> myDisposer;
+  private IconDisposer<T> myDisposer;
 
   public DeferredIconImpl(Icon baseIcon, T param, Function<T, Icon> evaluator) {
     this(baseIcon, param, true, evaluator);
@@ -276,12 +276,12 @@ public class DeferredIconImpl<T> implements DeferredIcon {
   }
 
 
-  public DeferredIconImpl setDisposer(Disposer<T> disposer) {
+  public DeferredIconImpl setDisposer(IconDisposer<T> disposer) {
     myDisposer = disposer;
     return this;
   }
 
-  public interface Disposer<T> {
+  public interface IconDisposer<T> {
 
     void dispose(T key);
 
diff --git a/platform/lang-impl/src/com/intellij/ui/IconDeferrerImpl.java b/platform/lang-impl/src/com/intellij/ui/IconDeferrerImpl.java
index 884c6e6506f2..f157d521aa9c 100644
--- a/platform/lang-impl/src/com/intellij/ui/IconDeferrerImpl.java
+++ b/platform/lang-impl/src/com/intellij/ui/IconDeferrerImpl.java
@@ -19,22 +19,18 @@
  */
 package com.intellij.ui;
 
-import com.intellij.ProjectTopics;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.impl.ProjectLifecycleListener;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.openapi.vfs.newvfs.BulkFileListener;
 import com.intellij.openapi.vfs.newvfs.events.VFileEvent;
-import com.intellij.psi.util.PsiModificationTracker;
 import com.intellij.util.Function;
 import com.intellij.util.messages.MessageBus;
 import com.intellij.util.messages.MessageBusConnection;
-import com.intellij.util.messages.MessageHandler;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -75,7 +71,7 @@ public class IconDeferrerImpl extends IconDeferrer {
     synchronized (LOCK) {
       Icon result = myIconsCache.get(param);
       if (result == null) {
-        result = new DeferredIconImpl<T>(base, param, f).setDisposer(new DeferredIconImpl.Disposer<T>() {
+        result = new DeferredIconImpl<T>(base, param, f).setDisposer(new DeferredIconImpl.IconDisposer<T>() {
           @Override
           public void dispose(T key) {
             synchronized (LOCK) {