From 99c2cc3420f0d40eac4ac502dc5d8d2336df5d4e Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Fri, 23 Mar 2012 21:15:35 +0400
Subject: [PATCH] android-ui-designer: load icons with a correct classloader

---
 .../src/com/intellij/designer/model/MetaModel.java             | 2 +-
 .../src/com/intellij/designer/palette/Item.java                | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java
index add10d839504..399439f46fc9 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java
@@ -84,7 +84,7 @@ public class MetaModel {
       if (myIconPath == null) {
         return myPaletteItem.getIcon();
       }
-      myIcon = IconLoader.getIcon(myIconPath);
+      myIcon = IconLoader.findIcon(myIconPath, myModel);
     }
     return myIcon;
   }
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/Item.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/Item.java
index 5da043ce8e45..3794bb28fb49 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/Item.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/palette/Item.java
@@ -19,7 +19,6 @@ import com.intellij.designer.model.MetaModel;
 import com.intellij.ide.dnd.DnDDragStartBean;
 import com.intellij.ide.palette.PaletteItem;
 import com.intellij.openapi.actionSystem.ActionGroup;
-import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.ColoredListCellRenderer;
@@ -50,7 +49,7 @@ public final class Item implements PaletteItem {
 
   public Icon getIcon() {
     if (myIcon == null) {
-      myIcon = IconLoader.getIcon(myIconPath);
+      myIcon = IconLoader.findIcon(myIconPath, myMetaModel.getModel());
     }
     return myIcon;
   }