Changeset 7748 in josm for trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

Timestamp:

2014-11-25T23:51:45+01:00 (9 years ago)

Author:

Don-vip

Message:

fix some Sonar issues recently introduced

File:

• trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java (modified) (2 diffs)

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

@@ -45 +45 @@
         Map<Note, Exception> failedNotes = new HashMap<>();
 
+        /**
+         * Constructs a new {@code UploadTask}.
+         * @param title message for the user
+         * @param monitor progress monitor
+         */
         public UploadTask(String title, ProgressMonitor monitor) {
             super(title, monitor, false);
@@ -71 +76 @@
                             Main.debug("found note change to upload");
                         }
-                        try {
-                            Note newNote;
-                            switch (comment.getNoteAction()) {
-                            case opened:
-                                if (Main.isDebugEnabled()) {
-                                    Main.debug("opening new note");
-                                }
-                                newNote = api.createNote(note.getLatLon(), comment.getText(), monitor);
-                                note.setId(newNote.getId());
-                                break;
-                            case closed:
-                                if (Main.isDebugEnabled()) {
-                                    Main.debug("closing note " + note.getId());
-                                }
-                                newNote = api.closeNote(note, comment.getText(), monitor);
-                                break;
-                            case commented:
-                                if (Main.isDebugEnabled()) {
-                                    Main.debug("adding comment to note " + note.getId());
-                                }
-                                newNote = api.addCommentToNote(note, comment.getText(), monitor);
-                                break;
-                            case reopened:
-                                if (Main.isDebugEnabled()) {
-                                    Main.debug("reopening note " + note.getId());
-                                }
-                                newNote = api.reopenNote(note, comment.getText(), monitor);
-                                break;
-                            default:
-                                newNote = null;
-                            }
-                            updatedNotes.put(note, newNote);
-                        } catch (Exception e) {
-                            Main.error("Failed to upload note to server: " + note.getId());
-                            failedNotes.put(note, e);
-                        }
+                        processNoteComment(monitor, api, note, comment);
                     }
                 }
+            }
+        }
+
+        private void processNoteComment(ProgressMonitor monitor, OsmApi api, Note note, NoteComment comment) {
+            try {
+                Note newNote;
+                switch (comment.getNoteAction()) {
+                case opened:
+                    if (Main.isDebugEnabled()) {
+                        Main.debug("opening new note");
+                    }
+                    newNote = api.createNote(note.getLatLon(), comment.getText(), monitor);
+                    note.setId(newNote.getId());
+                    break;
+                case closed:
+                    if (Main.isDebugEnabled()) {
+                        Main.debug("closing note " + note.getId());
+                    }
+                    newNote = api.closeNote(note, comment.getText(), monitor);
+                    break;
+                case commented:
+                    if (Main.isDebugEnabled()) {
+                        Main.debug("adding comment to note " + note.getId());
+                    }
+                    newNote = api.addCommentToNote(note, comment.getText(), monitor);
+                    break;
+                case reopened:
+                    if (Main.isDebugEnabled()) {
+                        Main.debug("reopening note " + note.getId());
+                    }
+                    newNote = api.reopenNote(note, comment.getText(), monitor);
+                    break;
+                default:
+                    newNote = null;
+                }
+                updatedNotes.put(note, newNote);
+            } catch (Exception e) {
+                Main.error("Failed to upload note to server: " + note.getId());
+                failedNotes.put(note, e);
             }
         }