Rather than keep a reference to an instance of a custom anonymous class

for an error icon, just whip one up on the fly when needed (almost never).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3389 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2005-03-09 23:20:37 +00:00
parent b07d3821fd
commit bb83bacdab
+6 -16
View File
@@ -1,5 +1,5 @@
// //
// $Id: IconManager.java,v 1.8 2004/10/28 17:49:02 mdb Exp $ // $Id$
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -29,11 +29,14 @@ import java.awt.Component;
import java.awt.Graphics; import java.awt.Graphics;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.ImageIcon;
import com.samskivert.util.ConfigUtil; import com.samskivert.util.ConfigUtil;
import com.samskivert.util.LRUHashMap; import com.samskivert.util.LRUHashMap;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.tile.TileIcon; import com.threerings.media.tile.TileIcon;
import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileManager;
import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileSet;
@@ -150,7 +153,8 @@ public class IconManager
", index=" + index + ", error=" + e + "]."); ", index=" + index + ", error=" + e + "].");
} }
return _errorIcon; // return an error icon
return new ImageIcon(ImageUtil.createErrorImage(32, 32));
} }
/** The tile manager we use to load tilesets. */ /** The tile manager we use to load tilesets. */
@@ -166,20 +170,6 @@ public class IconManager
/** A cache of our icon tilesets. */ /** A cache of our icon tilesets. */
protected LRUHashMap _icons = new LRUHashMap(ICON_CACHE_SIZE); protected LRUHashMap _icons = new LRUHashMap(ICON_CACHE_SIZE);
/** The icon we return when we are unable to load a requested icon. */
protected Icon _errorIcon = new Icon() {
public void paintIcon (Component c, Graphics g, int x, int y) {
g.setColor(Color.black);
g.fillRect(x, y, 16, 16);
}
public int getIconWidth () {
return 16;
}
public int getIconHeight () {
return 16;
}
};
/** The suffix we append to an icon set name to obtain the tileset /** The suffix we append to an icon set name to obtain the tileset
* image path configuration parameter. */ * image path configuration parameter. */
protected static final String PATH_SUFFIX = ".path"; protected static final String PATH_SUFFIX = ".path";