[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171

[David Paleino]

The following commit has been merged in the master branch:
commit 662c4251b07b2d0dce54fb28db0a828299f5bef7
Author: David Paleino <dapal at debian.org>
Date:   Wed Dec 19 23:25:59 2012 +0100

    Refreshed patch

diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index 8005110..fbea55d 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -10,7 +10,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   |   16 +++++++++++-
- 2 files changed, 23 insertions(+), 4 deletions(-)
+ src/org/openstreetmap/josm/tools/ImageProvider.java         |    4 +--
+ 3 files changed, 25 insertions(+), 6 deletions(-)
 
 --- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 +++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
@@ -69,3 +70,23 @@ applications. This patch points josm to the shared directories.
      }
  
      /*
+--- josm.orig/src/org/openstreetmap/josm/tools/ImageProvider.java
++++ josm/src/org/openstreetmap/josm/tools/ImageProvider.java
+@@ -424,7 +424,7 @@ public class ImageProvider {
+                     String full_name = subdir + name + ext;
+                     String cache_name = full_name;
+                     /* cache separately */
+-                    if (dirs != null && dirs.size() > 0) {
++                    if (this.dirs != null && this.dirs.size() > 0) {
+                         cache_name = "id:" + id + ":" + full_name;
+                         if(archive != null) {
+                             cache_name += ":" + archive.getName();
+@@ -450,7 +450,7 @@ public class ImageProvider {
+                         // index the cache by the name of the icon we're looking for
+                         // and don't bother to create a URL unless we're actually
+                         // creating the image.
+-                        URL path = getImageUrl(full_name, dirs, additionalClassLoaders);
++                        URL path = getImageUrl(full_name, this.dirs, additionalClassLoaders);
+                         if (path == null) {
+                             continue;
+                         }

-- 
Editor for OpenStreetMap