[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5531+dfsg1-1-7-g452029b

[David Paleino]

The following commit has been merged in the master branch:
commit 3410deb8e88e0df672e1efc733f263219bde127d
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 13 22:30:12 2012 +0100

    Patches refreshed

diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index b826168..a94eb72 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -47,12 +47,12 @@ applications. This patch points josm to the shared directories.
  import org.openstreetmap.josm.gui.preferences.SourceEntry;
  import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1265,7 +1266,20 @@ public class TaggingPreset extends Abstr
- 
-     protected static ImageIcon loadImageIcon(String iconName, File zipIcons) {
-         final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
--        return new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true).get();
-+        ImageIcon icon = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true).get();
+@@ -1273,7 +1274,20 @@ public class TaggingPreset extends Abstr
+         if (maxSize != null) {
+             imgProv.setMaxSize(24);
+         }
+-        return imgProv.get();
++        ImageIcon icon = imgProv.get();
 +        if (icon == null) {
 +            if (iconName.startsWith("styles/standard/")) {
 +                String realIconName = iconName.replaceAll("styles/standard/", "");
diff --git a/debian/patches/04-fix_images.patch b/debian/patches/04-fix_images.patch
index ed5f2db..1bdb5bf 100644
--- a/debian/patches/04-fix_images.patch
+++ b/debian/patches/04-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
 
 --- josm.orig/data/defaultpresets.xml
 +++ josm/data/defaultpresets.xml
-@@ -3033,7 +3033,7 @@ Note that for a match, at least one posi
+@@ -3109,7 +3109,7 @@ Note that for a match, at least one posi
              <key key="amenity" value="theatre" />
              <text key="name" text="Name" />
          </item>
@@ -18,7 +18,7 @@ Forwarded: not-needed
              <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
                    de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library"
                    fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library"
-@@ -3337,7 +3337,7 @@ Note that for a match, at least one posi
+@@ -3428,7 +3428,7 @@ Note that for a match, at least one posi
              <space />
          </item>
          <separator/>

-- 
Editor for OpenStreetMap