Changeset 28 in josm

Timestamp:

2005-11-30T21:40:09+01:00 (18 years ago)

Author:

imi

Message:

• fixed bug: second layer does not get the pending line segments of the first
• fixed bug: property page edit action "cancel" effect the display of the table
• data entries with same id now same data

Location:

src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (4 diffs)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• gui/dialogs/PropertiesDialog.java (modified) (1 diff)
• io/OsmReader.java (modified) (2 diffs)

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -218 +218 @@
         public void clearSelection() {
                 clearSelection(nodes);
+                clearSelection(pendingLineSegments);
                 clearSelection(tracks);
                 for (Track t : tracks)
@@ -242 +243 @@
          * to both datasets. So use mergeFrom only if you are about to abandon the
          * other dataset.
-         * 
+         *
          * Elements are tried to merged. 
          * Nodes are merged first, if their lat/lon are equal.
          * Line segments are merged, if they have the same nodes.
-         * Tracs are merged, if they consist of the same line segments.
-         * 
+         * Tracks are merged, if they consist of the same line segments.
+         *
          * Additional to that, every two objects with the same id are merged.
-         * 
+         *
          * @param ds    The DataSet to merge into this one.
          * @return A list of all primitives that were used in the conjunction. That
@@ -304 +305 @@
                                         lsMap.put(otherLS, myLS);
                 // add pendings (ls from track are added later
+                data.addAll(new HashSet<LineSegment>(lsMap.values()));
                 for (LineSegment ls : ds.pendingLineSegments) {
                         if (!lsMap.containsKey(ls)) {
@@ -318 +320 @@
                         }
                 }
-                
-                
+
+
                 // merge tracks
                 LinkedList<Track> trackToAdd = new LinkedList<Track>();

src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -84 +84 @@
                 return selected;
         }
+
+
+        /**
+         * Equal, if the id is equal. If both ids are 0, use the super classes equal
+         * instead.
+         */
+        @Override
+        public boolean equals(Object obj) {
+                if (!(obj instanceof OsmPrimitive))
+                        return false;
+                OsmPrimitive osm = (OsmPrimitive)obj;
+                if (id == 0 && osm.id == 0)
+                        return super.equals(obj);
+                return id == osm.id;
+        }
+
+        /**
+         * Return the id as hashcode or supers hashcode if 0.
+         */
+        @Override
+        public int hashCode() {
+                return id == 0 ? super.hashCode() : (int)id;
+        }
 }

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -108 +108 @@
                         }
                 });
+                String oldComboEntry = combo.getEditor().getItem().toString();
                 dlg.setVisible(true);
 
                 Object answer = optionPane.getValue();
                 if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE ||
-                                (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION))
+                                (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION)) {
+                        combo.getEditor().setItem(oldComboEntry);
                         return;
+                }
 
                 String value = combo.getEditor().getItem().toString();

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

@@ -96 +96 @@
                                         String token = t.nextToken();
                                         if (!" ".equals(token))
-                                                data.keys.put(Key.get(t.nextToken()), "yes");
+                                                data.keys.put(Key.get(token), "yes");
                                 }
                         }
@@ -114 +114 @@
                         if (child.getName().equals("node"))
                                 addNode(data, parseNode(child));
-                        else if (child.getName().equals("segment"))
-                                data.pendingLineSegments.add(parseLineSegment(child, data));
-                        else if (child.getName().equals("track"))
-                                data.tracks.add(parseTrack(child, data));
+                        else if (child.getName().equals("segment")) {
+                                LineSegment ls = parseLineSegment(child, data);
+                                if (data.pendingLineSegments.contains(ls))
+                                        throw new JDOMException("Double segment definition "+ls.id);
+                                for (Track t : data.tracks)
+                                        if (t.segments.contains(ls))
+                                                throw new JDOMException("Double segment definition "+ls.id);
+                                data.pendingLineSegments.add(ls);
+                        } else if (child.getName().equals("track")) {
+                                Track track = parseTrack(child, data);
+                                if (data.tracks.contains(track))
+                                        throw new JDOMException("Double track definition "+track.id);
+                                data.tracks.add(track);
+                        }
                 }