Changeset 8224 in josm for trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

Timestamp:

2015-04-18T22:37:12+02:00 (9 years ago)

Author:

simon04

Message:

see #10980 - Note download: update already downloaded non-modified notes; use Storage for internal storage

File:

• trunk/src/org/openstreetmap/josm/data/osm/NoteData.java (modified) (8 diffs)

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

@@ -3 +3 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
@@ -15 +15 @@
 import org.openstreetmap.josm.data.notes.NoteComment;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -23 +25 @@
     private long newNoteId = -1;
 
-    private final List<Note> noteList;
+    private final Storage<Note> noteList;
     private Note selectedNote = null;
     private Comparator<Note> comparator = DEFAULT_COMPARATOR;
@@ -85 +87 @@
 
     /**
-     * Construct a new note container with an empty note list
-     */
-    public NoteData() {
-        noteList = new ArrayList<>();
-    }
-
-    /**
      * Construct a new note container with a given list of notes
      * @param notes The list of notes to populate the container with
      */
-    public NoteData(List<Note> notes) {
-        noteList = notes;
-        Collections.sort(notes, comparator);
+    public NoteData(Collection<Note> notes) {
+        noteList = new Storage<>();
         for (Note note : notes) {
+            noteList.add(note);
             if (note.getId() <= newNoteId) {
                 newNoteId = note.getId() - 1;
@@ -107 +102 @@
     /**
      * Returns the notes stored in this layer
-     * @return List of Note objects
-     */
-    public List<Note> getNotes() {
-        return noteList;
+     * @return collection of notes
+     */
+    public Collection<Note> getNotes() {
+        return Collections.unmodifiableCollection(noteList);
+    }
+
+    /**
+     * Returns the notes stored in this layer sorted according to {@link #comparator}
+     * @return sorted collection of notes
+     */
+    public Collection<Note> getSortedNotes() {
+        final ArrayList<Note> list = new ArrayList<>(noteList);
+        Collections.sort(list, comparator);
+        return list;
     }
 
@@ -155 +160 @@
      * @param newNotes A list of notes to add
      */
-    public synchronized void addNotes(List<Note> newNotes) {
+    public synchronized void addNotes(Collection<Note> newNotes) {
         for (Note newNote : newNotes) {
             if (!noteList.contains(newNote)) {
                 noteList.add(newNote);
+            } else {
+                final Note existingNote = noteList.get(newNote);
+                final boolean isDirty = Utils.exists(existingNote.getComments(), new Predicate<NoteComment>() {
+                    @Override
+                    public boolean evaluate(NoteComment object) {
+                        return object.getIsNew();
+                    }
+                });
+                if (!isDirty) {
+                    noteList.put(newNote);
+                } else {
+                    // TODO merge comments?
+                    Main.info("Keeping existing note id={0} with uncommitted changes", String.valueOf(newNote.getId()));
+                }
             }
             if (newNote.getId() <= newNoteId) {
@@ -165 +184 @@
         }
         dataUpdated();
-        if (Main.isDebugEnabled()) {
-            Main.debug("notes in current set: " + noteList.size());
-        }
     }
 
@@ -256 +272 @@
 
     private void dataUpdated() {
-        Collections.sort(noteList, comparator);
-        Main.map.noteDialog.setNoteList(noteList);
+        Main.map.noteDialog.setNotes(getSortedNotes());
         Main.map.mapView.repaint();
     }