[josm] 04/05: Refresh patches.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit fcc1a02908387b1c4c026a30afbc6aaa1f07c16d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 1 19:29:29 2015 +0100

    Refresh patches.
---
 debian/changelog                   |  1 +
 debian/patches/02-elemstyles.patch | 66 +++++++++++++++++++-------------------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb55c41..e752246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn7995+dfsg1-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
   * Drop runtime dependency on ant, its bzip2 support is no longer used.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 01 Feb 2015 18:40:25 +0100
 
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index 80c41bf..306955b 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -78,36 +78,36 @@ applications. This patch points josm to the shared directories.
 --- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
 +++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
 @@ -50,6 +50,7 @@ import org.openstreetmap.josm.data.osm.O
- import org.openstreetmap.josm.data.osm.OsmUtils;
- import org.openstreetmap.josm.data.osm.Tag;
- import org.openstreetmap.josm.data.preferences.BooleanProperty;
-+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-@@ -1518,12 +1519,22 @@ public final class TaggingPresetItems {
-     }
- 
-     protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
--        final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
--        ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
-+        LinkedList<String> s = new LinkedList<String>();
-+        MapPaintStyles.addDebianDirs(s);
-+        String realIconName = iconName;
-+        if (iconName.startsWith("styles/standard/")) {
-+            realIconName = iconName.replace("styles/standard/", "");
-+        }
-+        ImageProvider imgProv = new ImageProvider(realIconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
-         if (maxSize != null) {
-             imgProv.setMaxSize(maxSize);
-         }
--        return imgProv.get();
-+        ImageIcon icon = imgProv.get();
-+        if (icon == null) {
-+            System.out.println("Could not get presets icon " + realIconName);
-+            icon = new ImageIcon(realIconName);
-+        }
-+        return icon;
-     }
- 
-     protected static Integer parseInteger(String str) {
+ import org.openstreetmap.josm.data.osm.OsmUtils;
+ import org.openstreetmap.josm.data.osm.Tag;
+ import org.openstreetmap.josm.data.preferences.BooleanProperty;
++import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
+ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
+ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+@@ -1521,12 +1522,22 @@ public final class TaggingPresetItems {
+     }
+ 
+     protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
+-        final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
+-        ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
++        LinkedList<String> s = new LinkedList<String>();
++        MapPaintStyles.addDebianDirs(s);
++        String realIconName = iconName;
++        if (iconName.startsWith("styles/standard/")) {
++            realIconName = iconName.replace("styles/standard/", "");
++        }
++        ImageProvider imgProv = new ImageProvider(realIconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
+         if (maxSize != null) {
+             imgProv.setMaxSize(maxSize);
+         }
+-        return imgProv.get();
++        ImageIcon icon = imgProv.get();
++        if (icon == null) {
++            System.out.println("Could not get presets icon " + realIconName);
++            icon = new ImageIcon(realIconName);
++        }
++        return icon;
+     }
+ 
+     protected static Integer parseInteger(String str) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git