Changeset 7699 in josm

Timestamp:

2014-11-03T09:48:03+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10700 - Add note upload functionality (patch by ToeBee)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UploadNotesAction.java (added)
• actions/upload/UploadNotesTask.java (added)
• data/osm/NoteData.java (modified) (13 diffs)
• gui/dialogs/NoteDialog.java (modified) (8 diffs)
• gui/layer/NoteLayer.java (modified) (1 diff)

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

@@ -5 +5 @@
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import org.openstreetmap.josm.Main;
@@ -59 +60 @@
     public void setSelectedNote(Note note) {
         selectedNote = note;
-        Main.map.noteDialog.selectionChanged();
-        Main.map.mapView.repaint();
+        if (Main.map != null) {
+            Main.map.noteDialog.selectionChanged();
+            Main.map.mapView.repaint();
+        }
+    }
+
+    /**
+     * Return whether or not there are any changes in the note data set.
+     * These changes may need to be either uploaded or saved.
+     * @return true if local modifications have been made to the note data set. False otherwise.
+     */
+    public synchronized boolean isModified() {
+        for (Note note : noteList) {
+            if (note.getId() < 0) { //notes with negative IDs are new
+                return true;
+            }
+            for (NoteComment comment : note.getComments()) {
+                if (comment.getIsNew()) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 
@@ -67 +89 @@
      * @param newNotes A list of notes to add
      */
-    public void addNotes(List<Note> newNotes) {
+    public synchronized void addNotes(List<Note> newNotes) {
         for (Note newNote : newNotes) {
             if (!noteList.contains(newNote)) {
@@ -77 +99 @@
         }
         dataUpdated();
-        Main.debug("notes in current set: " + noteList.size());
+        if (Main.isDebugEnabled()) {
+            Main.debug("notes in current set: " + noteList.size());
+        }
     }
 
@@ -85 +109 @@
      * @param text Required comment with which to open the note
      */
-    public void createNote(LatLon location, String text) {
+    public synchronized void createNote(LatLon location, String text) {
         if(text == null || text.isEmpty()) {
             throw new IllegalArgumentException("Comment can not be blank when creating a note");
@@ -95 +119 @@
         NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.opened, true);
         note.addComment(comment);
-        Main.debug("Created note {0} with comment: {1}", note.getId(), text);
+        if (Main.isDebugEnabled()) {
+            Main.debug("Created note {0} with comment: {1}", note.getId(), text);
+        }
         noteList.add(note);
         dataUpdated();
@@ -105 +131 @@
      * @param text Comment to add
      */
-    public void addCommentToNote(Note note, String text) {
+    public synchronized void addCommentToNote(Note note, String text) {
         if (!noteList.contains(note)) {
             throw new IllegalArgumentException("Note to modify must be in layer");
@@ -112 +138 @@
             throw new IllegalStateException("Cannot add a comment to a closed note");
         }
-        Main.debug("Adding comment to note {0}: {1}", note.getId(), text);
+        if (Main.isDebugEnabled()) {
+            Main.debug("Adding comment to note {0}: {1}", note.getId(), text);
+        }
         NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.commented, true);
         note.addComment(comment);
@@ -123 +151 @@
      * @param text Comment to attach to close action, if desired
      */
-    public void closeNote(Note note, String text) {
+    public synchronized void closeNote(Note note, String text) {
         if (!noteList.contains(note)) {
             throw new IllegalArgumentException("Note to close must be in layer");
@@ -130 +158 @@
             throw new IllegalStateException("Cannot close a note that isn't open");
         }
-        Main.debug("closing note {0} with comment: {1}", note.getId(), text);
+        if (Main.isDebugEnabled()) {
+            Main.debug("closing note {0} with comment: {1}", note.getId(), text);
+        }
         NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.closed, true);
         note.addComment(comment);
@@ -143 +173 @@
      * @param text Comment to attach to the reopen action, if desired
      */
-    public void reOpenNote(Note note, String text) {
+    public synchronized void reOpenNote(Note note, String text) {
         if (!noteList.contains(note)) {
             throw new IllegalArgumentException("Note to reopen must be in layer");
@@ -150 +180 @@
             throw new IllegalStateException("Cannot reopen a note that isn't closed");
         }
-        Main.debug("reopening note {0} with comment: {1}", note.getId(), text);
+        if (Main.isDebugEnabled()) {
+            Main.debug("reopening note {0} with comment: {1}", note.getId(), text);
+        }
         NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.reopened, true);
         note.addComment(comment);
@@ -166 +198 @@
         return User.createOsmUser(userMgr.getUserId(), userMgr.getUserName());
     }
+
+    /**
+     * Updates notes with new state. Primarily to be used when updating the
+     * note layer after uploading note changes to the server.
+     * @param updatedNotes Map containing the original note as the key and the updated note as the value
+     */
+    public synchronized void updateNotes(Map<Note, Note> updatedNotes) {
+        for (Map.Entry<Note, Note> entry : updatedNotes.entrySet()) {
+            Note oldNote = entry.getKey();
+            Note newNote = entry.getValue();
+            oldNote.updateWith(newNote);
+        }
+        dataUpdated();
+    }
 }

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

@@ -28 +28 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.UploadNotesAction;
 import org.openstreetmap.josm.actions.mapmode.AddNoteAction;
 import org.openstreetmap.josm.data.notes.Note;
@@ -73 +74 @@
     private final NewAction newAction;
     private final ReopenAction reopenAction;
+    private final UploadNotesAction uploadAction;
 
     private NoteData noteData;
@@ -79 +81 @@
     public NoteDialog() {
         super("Notes", "notes/note_open.png", "List of notes", null, 150);
-        Main.debug("constructed note dialog");
+        if (Main.isDebugEnabled()) {
+            Main.debug("constructed note dialog");
+        }
 
         addCommentAction = new AddCommentAction();
@@ -85 +89 @@
         newAction = new NewAction();
         reopenAction = new ReopenAction();
+        uploadAction = new UploadNotesAction();
         buildDialog();
     }
@@ -114 +119 @@
                 new SideButton(addCommentAction, false),
                 new SideButton(closeAction, false),
-                new SideButton(reopenAction, false)}));
+                new SideButton(reopenAction, false),
+                new SideButton(uploadAction, false)}));
         updateButtonStates();
     }
@@ -132 +138 @@
             reopenAction.setEnabled(true);
         }
+        if(noteData == null || !noteData.isModified()) {
+            uploadAction.setEnabled(false);
+        } else {
+            uploadAction.setEnabled(true);
+        }
     }
 
@@ -149 +160 @@
     @Override
     public void layerAdded(Layer newLayer) {
-        Main.debug("layer added: " + newLayer);
+        if (Main.isDebugEnabled()) {
+            Main.debug("layer added: " + newLayer);
+        }
         if (newLayer instanceof NoteLayer) {
-            Main.debug("note layer added");
+            if (Main.isDebugEnabled()) {
+                Main.debug("note layer added");
+            }
             noteData = ((NoteLayer)newLayer).getNoteData();
             model.setData(noteData.getNotes());
@@ -160 +175 @@
     public void layerRemoved(Layer oldLayer) {
         if (oldLayer instanceof NoteLayer) {
-            Main.debug("note layer removed. Clearing everything");
+            if (Main.isDebugEnabled()) {
+                Main.debug("note layer removed. Clearing everything");
+            }
             noteData = null;
             model.clearData();

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

@@ -73 +73 @@
     @Override
     public boolean isModified() {
-        for (Note note : noteData.getNotes()) {
-            if (note.getId() < 0) { //notes with negative IDs are new
-                return true;
-            }
-            for (NoteComment comment : note.getComments()) {
-                if (comment.getIsNew()) {
-                    return true;
-                }
-            }
-        }
-        return false;
+        return noteData.isModified();
     }