Default icons for items with no typeicon given

4 files changed, 5 insertions, 1 deletions

diff --git a/src/main/java/com/c2kernel/gui/EntityDetails.java b/src/main/java/com/c2kernel/gui/EntityDetails.java
index 8af0f80..ed13035 100644
--- a/src/main/java/com/c2kernel/gui/EntityDetails.java
+++ b/src/main/java/com/c2kernel/gui/EntityDetails.java
@@ -9,6 +9,7 @@ import java.util.ArrayList;
 import java.util.HashMap;

 import java.util.Iterator;

 

+import javax.swing.ImageIcon;

 import javax.swing.JComponent;

 import javax.swing.JLabel;

 import javax.swing.JPanel;

@@ -134,7 +135,9 @@ public class EntityDetails extends JPanel implements ChangeListener, Runnable {
         c.anchor = GridBagConstraints.NORTH;

         c.ipadx = 5;

         c.ipady = 5;

-        current = new JLabel(ImageLoader.findImage("typeicons/"+myEntity.getIconName()+"_32.png"));

+        ImageIcon icon = ImageLoader.findImage("typeicons/"+myEntity.getIconName()+"_32.png");

+        if (icon==ImageLoader.nullImg) icon = ImageLoader.findImage("typeicons/item_32.png");

+        current = new JLabel(icon);

         gridbag.setConstraints(current, c);

         titlePanel.add(current);

         // Place Name/ID Label

diff --git a/src/main/java/com/c2kernel/gui/tree/Node.java b/src/main/java/com/c2kernel/gui/tree/Node.java
index 501c256..b192c4f 100644
--- a/src/main/java/com/c2kernel/gui/tree/Node.java
+++ b/src/main/java/com/c2kernel/gui/tree/Node.java
@@ -216,6 +216,7 @@ public abstract class Node implements Runnable {
     public void setIcon(String icon) {

         iconName = icon;

         this.icon = ImageLoader.findImage("typeicons/"+icon+"_16.png");

+        if (this.icon==ImageLoader.nullImg) this.icon = ImageLoader.findImage("typeicons/item_16.png");

     }

 

 	public JPopupMenu getPopupMenu() {

diff --git a/src/main/resources/images/typeicons/item_16.png b/src/main/resources/images/typeicons/item_16.png
new file mode 100644
index 0000000..8d01050
--- /dev/null
+++ b/src/main/resources/images/typeicons/item_16.png
diff --git a/src/main/resources/images/typeicons/item_32.png b/src/main/resources/images/typeicons/item_32.png
new file mode 100644
index 0000000..3e6d43c
--- /dev/null
+++ b/src/main/resources/images/typeicons/item_32.png