Changeset 255 in josm

Timestamp:

2007-06-13T22:30:51+02:00 (17 years ago)

Author:

imi

Message:

• fixed AnnotationPreset image loading to load from .jar-ressources as well

Files:

• src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java (modified) (6 diffs)
• src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)
• test/org/openstreetmap/josm/gui/annotation/AnnotationPresetTest.java (modified) (4 diffs)

src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java

@@ -35 +35 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.XmlObjectParser;
 import org.xml.sax.SAXException;
@@ -54 +55 @@
                 boolean requestFocusInWindow() {return false;}
         }
-        
+
         public static class Text extends Item {
                 public String key;
@@ -81 +82 @@
                 public String text;
                 public boolean default_ = false;
-                
+
                 private JCheckBox check = new JCheckBox();
 
@@ -143 +144 @@
 
         /**
-     * The types as preparsed collection.
-     */
-    public Collection<Class<?>> types;
+         * The types as preparsed collection.
+         */
+        public Collection<Class<?>> types;
         private List<Item> data = new LinkedList<Item>();
 
@@ -166 +167 @@
          * Called from the XML parser to set the icon
          */
-        public void setIcon(String icon) {
-                putValue(Action.SMALL_ICON, new ImageIcon(new ImageIcon(icon).getImage().getScaledInstance(24, 24, Image.SCALE_SMOOTH)));
-        }
-        
+        public void setIcon(String iconName) {
+                ImageIcon icon = ImageProvider.getIfAvailable(null, iconName);
+                if (icon == null)
+                        icon = new ImageIcon(iconName);
+                if (Math.max(icon.getIconHeight(), icon.getIconWidth()) != 24)
+                        icon = new ImageIcon(icon.getImage().getScaledInstance(24, 24, Image.SCALE_SMOOTH));
+                putValue(Action.SMALL_ICON, icon);
+        }
+
         /**
          * Called from the XML parser to set the types, this preset affects
@@ -186 +192 @@
                 }
         }
-        
+
         public static List<AnnotationPreset> readAll(InputStream inStream) throws SAXException {
                 BufferedReader in = null;

src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -69 +69 @@
                 if (name == null)
                         return null;
-                if (subdir == null || subdir != "")
+                if (subdir == null)
+                        subdir = "";
+                else
                         subdir += "/";
                 String ext = name.indexOf('.') != -1 ? "" : ".png";

test/org/openstreetmap/josm/gui/annotation/AnnotationPresetTest.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.annotation;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.lang.reflect.Field;
@@ -6 +7 @@
 
 import javax.swing.Action;
+import javax.swing.Icon;
 
 import junit.framework.TestCase;
@@ -14 +16 @@
 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Label;
 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Text;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 public class AnnotationPresetTest extends TestCase {
@@ -55 +58 @@
                 assertEquals("highway", key.value);
         }
+        
+        public void testIconLoadsFromClasspath() throws Exception {
+                String xml = "<annotations><item icon='logo'></item></annotations>";
+                List<AnnotationPreset> all = AnnotationPreset.readAll(new ByteArrayInputStream(xml.getBytes()));
+
+                assertEquals(1, all.size());
+
+                Icon icon = (Icon)all.get(0).getValue(Action.SMALL_ICON);
+                assertNotNull(icon);
+                assertEquals("Icon loaded and of correct size", 
+                                24, Math.max(icon.getIconHeight(), icon.getIconWidth()));
+    }
 }