Changeset 54 in josm for src

Timestamp:

2006-02-15T20:05:05+01:00 (19 years ago)

Author:

imi

Message:

• fixed: Saving of new objects with properties in OSM format did not work
• Open/Save dialogs now remember the "current" directory for the session
• added a warning before overwriting files

Location:

src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/OpenAction.java (modified) (2 diffs)
• actions/SaveAction.java (modified) (2 diffs)
• io/OsmWriter.java (modified) (2 diffs)

src/org/openstreetmap/josm/Main.java

@@ -9 +9 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;
@@ -73 +74 @@
         public final UndoAction undoAction;
         public final RedoAction redoAction;
+
+        /**
+         * This directory is used for all disc IO access as starting directory. Should
+         * be set accordingly after the IO action.
+         */
+        public File currentDirectory = new File(".");
         
         /**

src/org/openstreetmap/josm/actions/OpenAction.java

@@ -43 +43 @@
 
         public void actionPerformed(ActionEvent e) {
-                JFileChooser fc = new JFileChooser("data");
+                JFileChooser fc = new JFileChooser(Main.main.currentDirectory);
                 for (int i = 0; i < ExtensionFileFilter.filters.length; ++i)
                         fc.addChoosableFileFilter(ExtensionFileFilter.filters[i]);
@@ -50 +50 @@
                 if (fc.showOpenDialog(Main.main) != JFileChooser.APPROVE_OPTION)
                         return;
+                
+                Main.main.currentDirectory = fc.getCurrentDirectory();
 
                 File filename = fc.getSelectedFile();

src/org/openstreetmap/josm/actions/SaveAction.java

@@ -42 +42 @@
                         return;
 
-                JFileChooser fc = new JFileChooser("data");
+                JFileChooser fc = new JFileChooser(Main.main.currentDirectory);
                 for (int i = 0; i < ExtensionFileFilter.filters.length; ++i)
                         fc.addChoosableFileFilter(ExtensionFileFilter.filters[i]);
@@ -49 +49 @@
                 File file = fc.getSelectedFile();
                 if (file == null)
+                        return;
+                Main.main.currentDirectory = fc.getCurrentDirectory();
+                if (file.exists() && JOptionPane.YES_OPTION != 
+                                JOptionPane.showConfirmDialog(Main.main, "File exists. Overwrite?", "Overwrite", JOptionPane.YES_NO_OPTION))
                         return;
 

src/org/openstreetmap/josm/io/OsmWriter.java

@@ -83 +83 @@
          * Create a properties element.
          */
-        private Element parseProperty(OsmPrimitive osm, Entry<Key, String> entry) {
+        private Element parseProperty(OsmPrimitive osm, long id, Entry<Key, String> entry) {
                 Element e = new Element("property");
                 Key key = entry.getKey();
-                e.setAttribute("uid", ""+osm.id);
+                e.setAttribute("uid", ""+id);
                 e.setAttribute("key", key.name);
                 e.setAttribute("value", entry.getValue());
@@ -104 +104 @@
                 if (osm.keys != null)
                         for (Entry<Key, String> entry : osm.keys.entrySet())
-                                properties.add(parseProperty(osm, entry));
+                                properties.add(parseProperty(osm, id, entry));
                 if (osm.isDeleted())
                         e.setAttribute("action", "delete");