Changeset 3378 in josm for trunk

Timestamp:

2010-07-20T08:54:22+02:00 (14 years ago)

Author:

jttt

Message:

Fix #2662 Auto-save

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/ExitAction.java (modified) (2 diffs)
• data/AutosaveTask.java (added)
• data/osm/DataSet.java (modified) (4 diffs)
• gui/MainApplication.java (modified) (3 diffs)
• io/OsmExporter.java (modified) (1 diff)
• tools/PlatformHookOsx.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -362 +362 @@
 
         I18n.fixJFileChooser();
-        
+
         // init default coordinate format
         //
@@ -508 +508 @@
     }
 
+    public static boolean exitJosm(boolean exit) {
+        if (Main.saveUnsavedModifications()) {
+            Main.saveGuiGeometry();
+            // Remove all layers because somebody may rely on layerRemoved events (like AutosaveTask)
+            if (Main.isDisplayingMapView()) {
+                Collection<Layer> layers = new ArrayList<Layer>(Main.map.mapView.getAllLayers());
+                for (Layer l: layers) {
+                    Main.map.mapView.removeLayer(l);
+                }
+            }
+            if (exit) {
+                System.exit(0);
+                return true;
+            } else
+                return true;
+        } else
+            return false;
+    }
+
     /**
      * The type of a command line parameter, to be used in switch statements.

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
@@ -27 +27 @@
 
     public void actionPerformed(ActionEvent e) {
-        if (Main.saveUnsavedModifications()) {
-            Main.saveGuiGeometry();
-            System.exit(0);
-        }
+        Main.exitJosm(true);
     }
 }

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

@@ -15 +15 @@
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -69 +70 @@
     private Storage<OsmPrimitive> allPrimitives = new Storage<OsmPrimitive>(new IdHash(), 16, true);
     private Map<PrimitiveId, OsmPrimitive> primitivesMap = allPrimitives.foreignKey(new IdHash());
-    private List<DataSetListener> listeners = new ArrayList<DataSetListener>();
+    private CopyOnWriteArrayList<DataSetListener> listeners = new CopyOnWriteArrayList<DataSetListener>();
 
     // Number of open calls to beginUpdate
@@ -839 +840 @@
 
     public void addDataSetListener(DataSetListener dsl) {
-        listeners.add(dsl);
+        listeners.addIfAbsent(dsl);
     }
 
@@ -1001 +1002 @@
      * Marks all "invisible" objects as deleted. These objects should be always marked as
      * deleted when downloaded from the server. They can be undeleted later if necessary.
-     * 
+     *
      */
     public void deleteInvisible() {

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -25 +25 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.AutosaveTask;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -59 +61 @@
         mainFrame.addWindowListener(new WindowAdapter(){
             @Override public void windowClosing(final WindowEvent arg0) {
-                if (!Main.saveUnsavedModifications())
-                    return;
-                Main.saveGuiGeometry();
-                System.exit(0);
+                Main.exitJosm(true);
             }
         });
@@ -240 +239 @@
         }
 
+        AutosaveTask autosaveTask = new AutosaveTask();
+        List<OsmDataLayer> unsavedLayers = autosaveTask.getUnsavedLayers();
+        if (!unsavedLayers.isEmpty()) {
+            ExtendedDialog dialog = new ExtendedDialog(
+                    Main.parent,
+                    tr("Unsaved osm data"),
+                    new String[] {tr("Restore"), tr("Cancel")}
+            );
+            dialog.setContent(tr("JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last time. Do you want to restore data?",
+                    unsavedLayers.size()));
+            dialog.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+            dialog.showDialog();
+            if (dialog.getValue() == 1) {
+                for (OsmDataLayer layer: unsavedLayers) {
+                    Main.main.addLayer(layer);
+                }
+            }
+
+
+        }
+        autosaveTask.schedule();
+
+
         EventQueue.invokeLater(new Runnable() {
             public void run() {

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

@@ -68 +68 @@
 
             OsmWriter w = new OsmWriter(new PrintWriter(writer), false, layer.data.getVersion());
-            w.header();
-            w.writeDataSources(layer.data);
-            w.writeContent(layer.data);
-            w.footer();
-            w.close();
+            layer.data.getReadLock().lock();
+            try {
+                w.header();
+                w.writeDataSources(layer.data);
+                w.writeContent(layer.data);
+                w.footer();
+                w.close();
+            } finally {
+                layer.data.getReadLock().unlock();
+            }
             // FIXME - how to close?
             if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null)) {

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -48 +48 @@
         //System.out.println("Going to handle method "+method+" (short: "+method.getName()+") with event "+args[0]);
         if (method.getName().equals("handleQuit")) {
-            handled = Main.saveUnsavedModifications();
+            handled = Main.exitJosm(false);
         } else if (method.getName().equals("handleAbout")) {
             Main.main.menu.about.actionPerformed(null);