[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5608+dfsg1-2-7-g38ae847

[David Paleino]

The following commit has been merged in the master branch:
commit a824e7547aa5c4a9438331fe2cfa3e3d58f678f4
Author: David Paleino <dapal at debian.org>
Date:   Fri Apr 5 10:22:50 2013 +0200

    Patches refreshed

diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index d55d772..01f98a1 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -39,15 +39,15 @@ applications. This patch points josm to the shared directories.
  
 --- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
 +++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -65,6 +65,7 @@ import org.openstreetmap.josm.gui.QuadSt
+@@ -72,6 +72,7 @@ import org.openstreetmap.josm.gui.QuadSt
  import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
  import org.openstreetmap.josm.gui.layer.Layer;
  import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 +import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
  import org.openstreetmap.josm.gui.preferences.SourceEntry;
+ import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
  import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1284,12 +1285,22 @@ public class TaggingPreset extends Abstr
+@@ -1378,12 +1379,22 @@ public class TaggingPreset extends Abstr
      }
  
      protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
@@ -73,7 +73,7 @@ applications. This patch points josm to the shared directories.
      }
  
      /*
-@@ -1300,8 +1311,15 @@ public class TaggingPreset extends Abstr
+@@ -1394,8 +1405,15 @@ public class TaggingPreset extends Abstr
       * and the 16x16 icons for SMALL_ICON.
       */
      public void setIcon(final String iconName) {
@@ -91,7 +91,7 @@ applications. This patch points josm to the shared directories.
          imgProv.setDirs(s);
          imgProv.setId("presets");
          imgProv.setArchive(TaggingPreset.zipIcons);
-@@ -1318,7 +1336,7 @@ public class TaggingPreset extends Abstr
+@@ -1412,7 +1430,7 @@ public class TaggingPreset extends Abstr
                          }
                      });
                  } else {
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index 7489cf7..5ef77c8 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -33,7 +33,7 @@ Forwarded: not-needed
              <!-- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar"/>  -->
 --- josm.orig/src/org/openstreetmap/josm/data/Preferences.java
 +++ josm/src/org/openstreetmap/josm/data/Preferences.java
-@@ -1511,7 +1511,7 @@ public class Preferences {
+@@ -1519,7 +1519,7 @@ public class Preferences {
  
      public void validateXML(Reader in) throws Exception {
          SchemaFactory factory =  SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
@@ -44,7 +44,7 @@ Forwarded: not-needed
      }
 --- josm.orig/src/org/openstreetmap/josm/data/projection/Projections.java
 +++ josm/src/org/openstreetmap/josm/data/projection/Projections.java
-@@ -121,7 +121,7 @@ public class Projections {
+@@ -124,7 +124,7 @@ public class Projections {
      private static void loadInits() {
          Pattern epsgPattern = Pattern.compile("<(\\d+)>(.*)<>");
          try {
@@ -122,7 +122,7 @@ Forwarded: not-needed
  
 --- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
 +++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -1411,7 +1411,7 @@ public class TaggingPreset extends Abstr
+@@ -1505,7 +1505,7 @@ public class TaggingPreset extends Abstr
          List<PresetListEntry> listEntries = new LinkedList<PresetListEntry>();
  
          if (validate) {

-- 
Editor for OpenStreetMap