From 2a7cb53df952a2a2018a405524e266ec068555af Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Mon, 14 Mar 2011 15:20:36 +0300
Subject: [PATCH] dom icons provided via @Presentation: take 2

---
 .../intellij/util/xml/impl/DefaultDomTargetIconProvider.java   | 3 ++-
 .../src/com/intellij/util/xml/impl/DomInvocationHandler.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetIconProvider.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetIconProvider.java
index d93d41cb6e4c..e5540c1f25d5 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetIconProvider.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetIconProvider.java
@@ -28,6 +28,7 @@ import javax.swing.*;
  */
 public class DefaultDomTargetIconProvider extends DomIconProvider implements DumbAware {
   public Icon getIcon(@NotNull DomElement element, int flags) {
-    return ElementPresentationManager.getIconOld(element);
+    Icon icon = element.getPresentation().getIcon();
+    return icon == null ? ElementPresentationManager.getIconOld(element) : icon;
   }
 }
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java
index c338dff7f401..0bc99b62b4f7 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java
@@ -541,7 +541,7 @@ public abstract class DomInvocationHandler<T extends AbstractDomChildDescription
       }
 
       public Icon getIcon() {
-        return ElementPresentationManager.getIcon(getProxy());
+        return ElementPresentationManager.getIconOld(getProxy());
       }
     };
   }