Changeset 2832 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2010-01-12T20:02:54+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed NPE with new location for elemstyles.xml, see r2827

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.mappaint;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
@@ -12 +15 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
@@ -31 +35 @@
         {
             String[] a;
-            if(fileset.indexOf("=") >= 0)
+            if(fileset.indexOf("=") >= 0) {
                 a = fileset.split("=", 2);
-            else
+            } else {
                 a = new String[] {"", fileset};
+            }
 
             /* non-prefixed path is generic path, always take it */
-            if(a[0].length() == 0 || styleName.equals(a[0]))
+            if(a[0].length() == 0 || styleName.equals(a[0])) {
                 dirs.add(a[1]);
+            }
         }
         ImageIcon i = ImageProvider.getIfAvailable(dirs, "mappaint."+styleName, null, name);
@@ -61 +67 @@
 
         Collection<String> files = Main.pref.getCollection("mappaint.style.sources", Collections.<String>emptySet());
-        if(Main.pref.getBoolean("mappaint.style.enable-defaults", true))
-        {
+        if (Main.pref.getBoolean("mappaint.style.enable-defaults", true)) {
             LinkedList<String> f = new LinkedList<String>();
             f.add("resource://data/elemstyles.xml");
@@ -69 +74 @@
         }
 
-        for(String fileset : files)
-        {
+        for (String file : files) {
             String[] a = null;
-            try
-            {
-                if(fileset.indexOf("=") >= 0)
-                    a = fileset.split("=", 2);
-                else
-                    a = new String[] {null, fileset};
+            try {
+                if (file.indexOf("=") >= 0) {
+                    a = file.split("=", 2);
+                } else {
+                    a = new String[] { null, file };
+                }
                 XMLReader xmlReader = XMLReaderFactory.createXMLReader();
                 ElemStyleHandler handler = new ElemStyleHandler(a[0]);
                 xmlReader.setContentHandler(handler);
                 xmlReader.setErrorHandler(handler);
-                xmlReader.parse(new InputSource(new MirroredInputStream(a[1])));
-            }
-            catch (Exception e)
-            {
-                System.out.println("Mappaint-Style \"" + a[0] + "\" file \"" + a[1] + "\"");
-                System.out.println("Mappaint-Style problems: " + e);
+                MirroredInputStream in = new MirroredInputStream(a[1]);
+                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()));
+                e.printStackTrace();
+            } catch(SAXException e) {
+                System.err.println(tr("Warning: failed to parse Mappaint-Styles from ''{0}''. Exception was: {1}", a[1], e.toString()));
                 e.printStackTrace();
             }
@@ -93 +98 @@
         iconDirs = null;
     }
-
 }