[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5267+dfsg1-2-11-gcc30cb5

[David Paleino]

The following commit has been merged in the master branch:
commit e2be51d0fa2c0cdc20fa6e3d54839f03dddfc41e
Author: David Paleino <dapal at debian.org>
Date:   Wed Oct 10 11:17:40 2012 +0200

    Fix patch

diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index 4e01d43..b826168 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -9,8 +9,8 @@ applications. This patch points josm to the shared directories.
 
 ---
  src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java |   11 ++++++--
- src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java   |   15 +++++++++++-
- 2 files changed, 22 insertions(+), 4 deletions(-)
+ src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java   |   16 +++++++++++-
+ 2 files changed, 23 insertions(+), 4 deletions(-)
 
 --- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 +++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
@@ -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,19 @@ public class TaggingPreset extends Abstr
+@@ -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 = 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();
 +        if (icon == null) {
 +            if (iconName.startsWith("styles/standard/")) {
 +                String realIconName = iconName.replaceAll("styles/standard/", "");
@@ -65,6 +65,7 @@ applications. This patch points josm to the shared directories.
 +                icon = new ImageIcon(iconName);
 +            }
 +        }
++        return icon;
      }
  
      /*

-- 
Editor for OpenStreetMap