Changeset 397 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

Timestamp:

16.10.2007 23:18:46 (5 years ago)

Author:

framm

Message:

• added a built-in set of tagging presets. this can be disabled from preferences panel, or replaced with an own control file.

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -167 +167 @@
         /**
          * Called from the XML parser to set the icon
+         * 
+         * FIXME for Java 1.6 - use 24x24 icons for LARGE_ICON_KEY (button bar)
+         * and the 16x16 icons for SMALL_ICON.
          */
         public void setIcon(String iconName) {
@@ -172 +175 @@
                 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));
+                if (Math.max(icon.getIconHeight(), icon.getIconWidth()) != 16)
+                        icon = new ImageIcon(icon.getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH));
                 putValue(Action.SMALL_ICON, icon);
         }
@@ -225 +228 @@
                 LinkedList<TaggingPreset> allPresets = new LinkedList<TaggingPreset>();
                 String allTaggingPresets = Main.pref.get("taggingpreset.sources");
+                
+                if (Main.pref.getBoolean("taggingpreset.enable-defaults")) {
+                        InputStream in = Main.class.getResourceAsStream("/presets/presets.xml");
+                        try {
+                                allPresets.addAll(TaggingPreset.readAll(in));
+                        } catch (SAXException x) {
+                                JOptionPane.showMessageDialog(Main.parent, tr("Error parsing presets.xml: ")+x.getMessage());
+                        }
+                }
+                
                 StringTokenizer st = new StringTokenizer(allTaggingPresets, ";");
                 while (st.hasMoreTokens()) {
@@ -232 +245 @@
                                 if (source.startsWith("http") || source.startsWith("ftp") || source.startsWith("file"))
                                         in = new URL(source).openStream();
-                                else if (source.startsWith("resource://"))
+                                else if (source.startsWith("resource://")) 
                                         in = Main.class.getResourceAsStream(source.substring("resource:/".length()));
                                 else
@@ -248 +261 @@
                 return allPresets;
         }
-
 
         public JPanel createPanel() {