Changeset 2889 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.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/mappaint/MapPaintStyles.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.File;
+import java.io.InputStream;
 import java.io.IOException;
 import java.util.Collection;
@@ -23 +25 @@
     private static ElemStyles styles = new ElemStyles();
     private static Collection<String> iconDirs;
+    private static File zipIcons;
 
     public static ElemStyles getStyles()
@@ -46 +49 @@
             }
         }
-        ImageIcon i = ImageProvider.getIfAvailable(dirs, "mappaint."+styleName, null, name);
+        ImageIcon i = ImageProvider.getIfAvailable(dirs, "mappaint."+styleName, null, name, zipIcons);
         if(i == null)
         {
@@ -87 +90 @@
                 xmlReader.setErrorHandler(handler);
                 MirroredInputStream in = new MirroredInputStream(a[1]);
-                xmlReader.parse(new InputSource(in));
+                InputStream zip = in.getZipEntry("xml","style");
+                if(zip != null)
+                {
+                    zipIcons = in.getFile();
+                    xmlReader.parse(new InputSource(zip));
+                }
+                else
+                    xmlReader.parse(new InputSource(in));
             } catch(IOException e) {
                 System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", a[1], e.toString()));
@@ -97 +107 @@
         }
         iconDirs = null;
+        zipIcons = null;
     }
 }