[josm] 05/06: 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 81fcbc811a1c4a5323d499f002f80b8649784bd6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Dec 10 20:59:37 2014 +0100

    Refresh patches.
---
 debian/changelog                   |  1 +
 debian/patches/02-elemstyles.patch | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25a8ff9..84557b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ josm (0.0.svn7778+dfsg1-1) UNRELEASED; urgency=medium
     Thanks to Marcus Lundblad for the patch.
     (closes: #770881)
   * Add upstream metadata.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 10 Dec 2014 20:36:30 +0100
 
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index 0208931..ce398b1 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -40,7 +40,7 @@ applications. This patch points josm to the shared directories.
  
 --- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
 +++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -42,6 +42,7 @@ import org.openstreetmap.josm.gui.Extend
+@@ -43,6 +43,7 @@ import org.openstreetmap.josm.gui.Extend
  import org.openstreetmap.josm.gui.MapView;
  import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
  import org.openstreetmap.josm.gui.layer.Layer;
@@ -49,11 +49,11 @@ applications. This patch points josm to the shared directories.
  import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Link;
  import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.PresetLink;
 @@ -147,8 +148,15 @@ public class TaggingPreset extends Abstr
-      * and the 16x16 icons for SMALL_ICON.
       */
      public void setIcon(final String iconName) {
--        ImageProvider imgProv = new ImageProvider(iconName);
+         File arch = TaggingPresetReader.getZipIcons();
 -        final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
+-        ImageProvider imgProv = new ImageProvider(iconName);
 +        LinkedList<String> s = new LinkedList<String>();
 +        MapPaintStyles.addDebianDirs(s);
 +        final String realIconName;
@@ -65,8 +65,8 @@ applications. This patch points josm to the shared directories.
 +        ImageProvider imgProv = new ImageProvider(realIconName);
          imgProv.setDirs(s);
          imgProv.setId("presets");
-         imgProv.setArchive(TaggingPresetReader.getZipIcons());
-@@ -165,7 +173,7 @@ public class TaggingPreset extends Abstr
+         imgProv.setArchive(arch);
+@@ -164,7 +172,7 @@ public class TaggingPreset extends Abstr
                          }
                      });
                  } else {
@@ -85,7 +85,7 @@ applications. This patch points josm to the shared directories.
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-@@ -1514,12 +1515,22 @@ public final class TaggingPresetItems {
+@@ -1516,12 +1517,22 @@ public final class TaggingPresetItems {
      }
  
      protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {

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