Changeset 1677 in josm for trunk/src/org/openstreetmap/josm/io/OsmReader.java
- Timestamp:
- 17.06.2009 10:04:22 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/OsmReader.java
r1604 r1677 158 158 throw new SAXException(tr("Unknown version")); 159 159 String v = atts.getValue("version"); 160 if (v == null) 160 if (v == null) 161 161 throw new SAXException(tr("Version number missing from OSM data")); 162 if (!(v.equals("0.5") || v.equals("0.6"))) 162 if (!(v.equals("0.5") || v.equals("0.6"))) 163 163 throw new SAXException(tr("Unknown version: {0}", v)); 164 164 // save generator attribute for later use when creating DataSource objects 165 165 generator = atts.getValue("generator"); 166 166 ds.version = v; 167 167 168 168 } else if (qName.equals("bounds")) { 169 169 // new style bounds. … … 234 234 value = atts.getValue("role"); 235 235 emd.relationMember.role = value; 236 236 237 237 if (emd.id == 0) 238 238 throw new SAXException(tr("Incomplete <member> specification with ref=0")); … … 285 285 current.user = User.get(user); 286 286 } 287 288 // uid attribute added in 0.6 API 287 288 // uid attribute added in 0.6 API 289 289 String uid = atts.getValue("uid"); 290 290 if (uid != null) { … … 484 484 485 485 Main.pleaseWaitDlg.currentAction.setText(tr("Prepare OSM data...")); 486 Main.pleaseWaitDlg.setIndeterminate(true); 486 Main.pleaseWaitDlg.setIndeterminate(true); 487 487 488 488 // System.out.println("Parser finished: Tags " + tagsN + " Nodes " + nodesN + " Ways " + waysN + … … 506 506 507 507 // System.out.println("Data loaded!"); 508 Main.pleaseWaitDlg.setIndeterminate(false); 509 Main.pleaseWaitDlg.progress.setValue(0); 508 Main.pleaseWaitDlg.setIndeterminate(false); 509 Main.pleaseWaitDlg.progress.setValue(0); 510 510 511 511 return osm;
Note: See TracChangeset
for help on using the changeset viewer.
