Changeset 8224 in josm for trunk/src/org/openstreetmap/josm/gui

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/NotesDialog.java (modified) (9 diffs)
• layer/NoteLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

@@ -13 +13 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
@@ -186 +187 @@
             noteData = ((NoteLayer)newLayer).getNoteData();
             model.setData(noteData.getNotes());
-            setNoteList(noteData.getNotes());
+            setNotes(noteData.getSortedNotes());
         }
     }
@@ -193 +194 @@
     public void layerRemoved(Layer oldLayer) {
         if (oldLayer instanceof NoteLayer) {
-            if (Main.isDebugEnabled()) {
-                Main.debug("note layer removed. Clearing everything");
-            }
             noteData = null;
             model.clearData();
@@ -209 +207 @@
      * @param noteList List of notes to display
      */
-    public void setNoteList(List<Note> noteList) {
+    public void setNotes(Collection<Note> noteList) {
         model.setData(noteList);
         updateButtonStates();
@@ -265 +263 @@
 
         public NoteTableModel() {
-            data = new ArrayList<Note>();
+            data = new ArrayList<>();
         }
 
@@ -281 +279 @@
         }
 
-        public void setData(List<Note> noteList) {
+        public void setData(Collection<Note> noteList) {
             data.clear();
             data.addAll(noteList);
@@ -315 +313 @@
             dialog.showNoteDialog(tr("Add comment to note:"), NotesDialog.ICON_COMMENT);
             if (dialog.getValue() != 1) {
-                Main.debug("User aborted note reopening");
                 return;
             }
@@ -337 +334 @@
             dialog.showNoteDialog(tr("Close note with message:"), NotesDialog.ICON_CLOSED);
             if (dialog.getValue() != 1) {
-                Main.debug("User aborted note closing");
                 return;
             }
@@ -377 +373 @@
             dialog.showNoteDialog(tr("Reopen note with message:"), NotesDialog.ICON_OPEN);
             if (dialog.getValue() != 1) {
-                Main.debug("User aborted note reopening");
                 return;
             }

trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -13 +13 @@
 import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
@@ -56 +58 @@
      * @param name The name of the layer. Typically "Notes"
      */
-    public NoteLayer(List<Note> notes, String name) {
+    public NoteLayer(Collection<Note> notes, String name) {
         super(name);
         noteData = new NoteData(notes);
@@ -63 +65 @@
     /** Convenience constructor that creates a layer with an empty note list */
     public NoteLayer() {
-        super(tr("Notes"));
-        noteData = new NoteData();
+        this(Collections.<Note>emptySet(), tr("Notes"));
     }
 
@@ -97 +98 @@
     @Override
     public boolean requiresSaveToFile() {
-        Main.debug("associated notes file: " + getAssociatedFile());
         return getAssociatedFile() != null && isModified();
     }