Changeset 1444 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-02-25T14:21:24+01:00 (15 years ago)

Author:

stoecker

Message:

close #2233 and some minor fixes. patch by xeen

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmReader.java (modified) (2 diffs)
• OsmServerObjectReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -75 +75 @@
       */
      private String parseNotes = new String();
+     private int parseNotesCount = 0;
      public String getParseNotes() {
          return parseNotes;
@@ -373 +374 @@
                     Node n = findNode(id);
                     if (n == null) {
-                         parseNotes += tr("Skipping a way because it includes a node that doesn''t exist: {0}\n", id);
+                         /* don't report ALL of them, just a few */
+                         if (parseNotesCount++ < 6) {
+                             parseNotes += tr("Skipping a way because it includes a node that doesn''t exist: {0}\n", id);
+                         } else if (parseNotesCount == 6) {
+                             parseNotes += "...\n";
+                         }
                          failed = true;
                          break;

trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.xml.sax.SAXException;
+
+import javax.swing.JOptionPane;
 
 public class OsmServerObjectReader extends OsmServerReader {
@@ -47 +49 @@
                 return null;
             Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
-            final DataSet data = OsmReader.parseDataSet(in, null, Main.pleaseWaitDlg);
+            final OsmReader osm = OsmReader.parseDataSetOsm(in, null, Main.pleaseWaitDlg);
+            final DataSet data = osm.getDs();
+
 //          String origin = Main.pref.get("osm-server.url")+"/"+Main.pref.get("osm-server.version", "0.5");
 //          Bounds bounds = new Bounds(new LatLon(lat1, lon1), new LatLon(lat2, lon2));
 //          DataSource src = new DataSource(bounds, origin);
 //          data.dataSources.add(src);
+            if (osm.getParseNotes().length() != 0) {
+                JOptionPane.showMessageDialog(Main.parent, osm.getParseNotes());
+            }
             in.close();
             activeConnection = null;