Changeset 2889 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

Timestamp:

24.01.2010 14:20:12 (2 years ago)

Author:

stoecker

Message:

close #4418 - support zip files for styles and presets

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -12 +12 @@
 import java.awt.event.ActionEvent;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -18 +20 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -72 +75 @@
     public String locale_name;
     public final static String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text";
+    private static File zipIcons = null;
 
     public static abstract class Item {
@@ -550 +554 @@
     public void setIcon(String iconName) {
         Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
-        ImageIcon icon = ImageProvider.getIfAvailable(s, "presets", null, iconName);
+        ImageIcon icon = ImageProvider.getIfAvailable(s, "presets", null, iconName, zipIcons);
         if (icon == null)
         {
@@ -636 +640 @@
             try {
                 MirroredInputStream s = new MirroredInputStream(source);
+                InputStream zip = s.getZipEntry("xml","preset");
+                if(zip != null)
+                    zipIcons = s.getFile();
                 InputStreamReader r;
                 try
                 {
-                    r = new InputStreamReader(s, "UTF-8");
+                    r = new InputStreamReader(zip == null ? s : zip, "UTF-8");
                 }
                 catch (UnsupportedEncodingException e)
                 {
-                    r = new InputStreamReader(s);
+                    r = new InputStreamReader(zip == null ? s: zip);
                 }
                 allPresets.addAll(TaggingPreset.readAll(new BufferedReader(r)));
@@ -663 +670 @@
                 );
             }
+            zipIcons = null;
         }
         return allPresets;