Changeset 3863 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
- Timestamp:
- 2011-02-07T09:35:27+01:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
r3858 r3863 51 51 52 52 protected void init() { 53 hasError = false;53 clearErrors(); 54 54 icons.clear(); 55 55 lines.clear(); … … 66 66 init(); 67 67 try { 68 MirroredInputStream in = new MirroredInputStream(url); 69 InputStream zip = in.getZipEntry("xml", "style"); 70 InputStreamReader reader = null; 71 if (zip != null) { 72 reader = new InputStreamReader(zip); 73 zipIcons = in.getFile(); 74 } else { 75 reader = new InputStreamReader(in); 76 zipIcons = null; 77 } 78 68 InputStreamReader reader = new InputStreamReader(getSourceInputStream()); 79 69 XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(this)); 80 70 parser.startWithValidation(reader, … … 87 77 System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString())); 88 78 e.printStackTrace(); 89 hasError = true;79 logError(e); 90 80 } catch(SAXParseException e) { 91 81 System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}", url, e.getLineNumber(), e.getColumnNumber(), e.getMessage())); 92 82 e.printStackTrace(); 93 hasError = true;83 logError(e); 94 84 } catch(SAXException e) { 95 85 System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage())); 96 86 e.printStackTrace(); 97 hasError = true; 87 logError(e); 88 } 89 } 90 91 public InputStream getSourceInputStream() throws IOException { 92 MirroredInputStream in = new MirroredInputStream(url); 93 InputStream zip = in.getZipEntry("xml", "style"); 94 if (zip != null) { 95 zipIcons = in.getFile(); 96 return zip; 97 } else { 98 zipIcons = null; 99 return in; 98 100 } 99 101 }
Note:
See TracChangeset
for help on using the changeset viewer.