Changeset 2115 in josm for trunk/src/org/openstreetmap/josm/io/OsmReader.java

Timestamp:

2009-09-13T19:30:36+02:00 (17 years ago)

Author:

Gubaer

Message:

new: reading open changesets from the server
new: reading user info from the server
new: any open changeset can be used when uploading
new: generic dialog for closing changesets
fixed #3427: JOSM can't keep many changesets open at once
fixed #3408: Allow continuing opened changeset even after restarting JOSM
fixed #3476: Default selection in upload dialog should be different for unclosed changesets. (Upload dialog now looks different)

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (5 diffs)

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

@@ -36 +36 @@
 
 /**
- * Parser for the Osm Api. Read from an input stream and constructs a dataset out of it.
+ * Parser for the Osm Api. Read from an input stream and construct a dataset out of it.
  *
  */
@@ -80 +80 @@
     }
 
+    private static class OsmPrimitiveData {
+        public long id = 0;
+        public boolean modified = false;
+        public boolean deleted = false;
+        public Date timestamp = new Date();
+        public User user = null;
+        public boolean visible = true;
+        public int version = 0;
+        public LatLon latlon = new LatLon(0,0);
+        private OsmPrimitive primitive;
+
+        public void copyTo(OsmPrimitive osm) {
+            osm.setModified(modified);
+            osm.setDeleted(deleted);
+            //  id < 0 possible if read from a file
+            if (id <= 0) {
+                osm.clearOsmId();
+            } else {
+                osm.setOsmId(id, version);
+            }
+            osm.setTimestamp(timestamp);
+            osm.user = user;
+            osm.setVisible(visible);
+            osm.mappaintStyle = null;
+        }
+
+        public Node createNode() {
+            Node node = new Node();
+            node.setCoor(latlon);
+            copyTo(node);
+            primitive = node;
+            return node;
+        }
+
+        public Way createWay() {
+            Way way = new Way();
+            copyTo(way);
+            primitive = way;
+            return way;
+        }
+        public Relation createRelation() {
+            Relation relation= new Relation();
+            copyTo(relation);
+            primitive = relation;
+            return relation;
+        }
+
+        public void rememberTag(String key, String value) {
+            primitive.put(key, value);
+        }
+    }
 
     /**
@@ -100 +151 @@
      */
     private Map<Long, Collection<RelationMemberData>> relations = new HashMap<Long, Collection<RelationMemberData>>();
-
 
     private class Parser extends DefaultHandler {
@@ -241 +291 @@
                 current.rememberTag(key, value);
             } else {
-                System.out.println(tr("Warning: Undefined element ''{0}'' found in input stream. Skipping.", qName));
+                throwException(tr("Undefined element ''{0}'' found in input stream. Aborting.", qName));
             }
         }
@@ -503 +553 @@
         }
     }
-
-    /**
-     * Temporarily holds data for a parsed {@see OsmPrimitive} and provides
-     * methods for creating an {@see OsmPrimitive} based on this data.
-     */
-    private static class OsmPrimitiveData {
-        public long id = 0;
-        public boolean modified = false;
-        public boolean deleted = false;
-        public Date timestamp = new Date();
-        public User user = null;
-        public boolean visible = true;
-        public int version = 0;
-        public LatLon latlon = new LatLon(0,0);
-        private OsmPrimitive primitive;
-
-        public void copyTo(OsmPrimitive osm) {
-            //  id < 0 possible if read from a file
-            if (id <= 0) {
-                osm.clearOsmId();
-            } else {
-                osm.setOsmId(id, version);
-            }
-            osm.setDeleted(deleted);
-            osm.setModified(modified);
-            osm.setTimestamp(timestamp);
-            osm.user = user;
-            osm.setVisible(visible);
-            osm.mappaintStyle = null;
-        }
-
-        public Node createNode() {
-            Node node = new Node();
-            node.setCoor(latlon);
-            copyTo(node);
-            primitive = node;
-            return node;
-        }
-
-        public Way createWay() {
-            Way way = new Way();
-            copyTo(way);
-            primitive = way;
-            return way;
-        }
-        public Relation createRelation() {
-            Relation relation= new Relation();
-            copyTo(relation);
-            primitive = relation;
-            return relation;
-        }
-
-        public void rememberTag(String key, String value) {
-            primitive.put(key, value);
-        }
-    }
 }