Changeset 8473 in josm

Timestamp:

2015-06-07T13:58:40+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11533 - proper use of Storage class in NoteData

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/upload/UploadNotesTask.java (modified) (1 diff)
• data/osm/NoteData.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

@@ -89 +89 @@
                     }
                     newNote = api.createNote(note.getLatLon(), comment.getText(), monitor);
-                    note.setId(newNote.getId());
                     break;
                 case closed:

trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

@@ -291 +291 @@
             Note oldNote = entry.getKey();
             Note newNote = entry.getValue();
+            boolean reindex = oldNote.hashCode() != newNote.hashCode();
+            if (reindex) {
+                noteList.removeElem(oldNote);
+            }
             oldNote.updateWith(newNote);
+            if (reindex) {
+                noteList.add(oldNote);
+            }
         }
         dataUpdated();