Changeset 7732 in josm

Timestamp:

2014-11-19T09:49:45+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #10766 - Save notes to file (patch by ToeBee)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExtensionFileFilter.java (modified) (1 diff)
• data/osm/NoteData.java (modified) (1 diff)
• gui/layer/NoteLayer.java (modified) (7 diffs)
• io/NoteExporter.java (added)
• io/NoteReader.java (modified) (2 diffs)
• io/NoteWriter.java (added)

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -97 +97 @@
                 "org.openstreetmap.josm.io.OsmBzip2Exporter",
                 "org.openstreetmap.josm.io.GeoJSONExporter",
-                "org.openstreetmap.josm.io.WMSLayerExporter"
+                "org.openstreetmap.josm.io.WMSLayerExporter",
+                "org.openstreetmap.josm.io.NoteExporter"
         };
 

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

@@ -37 +37 @@
     public NoteData(List<Note> notes) {
         noteList = notes;
+        for (Note note : notes) {
+            if (note.getId() <= newNoteId) {
+                newNoteId = note.getId() - 1;
+            }
+        }
     }
 

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

@@ -9 +9 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -19 +20 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.SaveActionBase;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.notes.Note;
@@ -29 +31 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.dialogs.NoteDialog;
+import org.openstreetmap.josm.io.NoteExporter;
 import org.openstreetmap.josm.io.XmlWriter;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -79 +82 @@
     public boolean requiresUploadToServer() {
         return isModified();
+    }
+
+    @Override
+    public boolean isSavable() {
+        return true;
+    }
+
+    @Override
+    public boolean requiresSaveToFile() {
+        Main.debug("associated notes file: " + getAssociatedFile());
+        return getAssociatedFile() != null && isModified();
     }
 
@@ -108 +122 @@
                 if (commentText != null && commentText.trim().length() > 0) {
                     sb.append(sep);
-                    String userName = comment.getUser().getName();
+                    String userName = XmlWriter.encode(comment.getUser().getName());
                     if (userName == null || userName.trim().length() == 0) {
                         userName = "<Anonymous>";
@@ -191 +205 @@
         actions.add(LayerListDialog.getInstance().createDeleteLayerAction());
         actions.add(new LayerListPopup.InfoAction(this));
+        actions.add(new LayerSaveAction(this));
+        actions.add(new LayerSaveAsAction(this));
         return actions.toArray(new Action[actions.size()]);
     }
@@ -217 +233 @@
 
     @Override
+    public File createAndOpenSaveFileChooser() {
+        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save GPX file"), NoteExporter.FILE_FILTER);
+    }
+
+    @Override
     public void mousePressed(MouseEvent e) { }
 

trunk/src/org/openstreetmap/josm/io/NoteReader.java

@@ -137 +137 @@
             if("comment".equals(qName)) {
                 User commentUser = User.createOsmUser(commentUid, commentUsername);
+                if (commentUid == 0) {
+                    commentUser = User.getAnonymous();
+                }
                 if(parseMode == NoteParseMode.API) {
                     commentIsNew = false;
@@ -164 +167 @@
             case "date_created":
                 thisNote.setCreatedAt(parseDate(NOTE_DATE_FORMAT, buffer.toString()));
+                break;
+            case "date_closed":
+                thisNote.setClosedAt(parseDate(NOTE_DATE_FORMAT, buffer.toString()));
                 break;
             case "date":