android-ui-designer: load icons with a correct classloader

This commit is contained in:
Eugene Kudelevsky
2012-03-23 21:18:20 +04:00
parent 82eebf04ac
commit 99c2cc3420
2 changed files with 2 additions and 3 deletions
@@ -84,7 +84,7 @@ public class MetaModel {
if (myIconPath == null) {
return myPaletteItem.getIcon();
}
myIcon = IconLoader.getIcon(myIconPath);
myIcon = IconLoader.findIcon(myIconPath, myModel);
}
return myIcon;
}
@@ -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;
}