Changeset 2613 in josm for trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

Timestamp:

11.12.2009 23:07:59 (2 years ago)

Author:

Gubaer

Message:

new: global in-memory cache for downloaded changesets
new: toggle dialog for changesets
new: downloading of changesets (currently without changeset content, will follow later)

File:

• trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.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;
@@ -16 +16 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.ChangesetCache;
 import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
@@ -49 +50 @@
     }
 
-    protected void onPostDownloadOpenChangesets(DownloadOpenChangesetsTask task) {
-        if (task.isCancelled() || task.getLastException() != null) return;
-
-        List<Changeset> openChangesets = task.getChangesets();
+    protected void onPostDownloadOpenChangesets() {
+        List<Changeset> openChangesets = ChangesetCache.getInstance().getOpenChangesets();
         if (openChangesets.isEmpty()) {
             JOptionPane.showMessageDialog(
@@ -105 +104 @@
                                 ExceptionDialogUtil.explainException(lastException);
                             }
-                            onPostDownloadOpenChangesets(DownloadOpenChangesetsTask.this);
+                            ChangesetCache.getInstance().update(changesets);
+                            if (!cancelled && lastException == null) {
+                                onPostDownloadOpenChangesets();
+                            }
                         }
                     }
@@ -146 +148 @@
         }
 
-        public List<Changeset> getChangesets() {
-            return changesets;
-        }
-
         public Exception getLastException() {
             return lastException;