Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/io/OsmApi.java

Timestamp:

23.06.2009 22:03:37 (3 years ago)

Author:

Gubaer

Message:

new: MultiFetchServerObjectReader using APIs Multi Fetch method
update: now uses Multi Fetch to check for deleted primitives on the server
update: now uses Multi Fetch to update the selected primitives with the state from the server
fixed: cleaned up merging in MergeVisitor
new: conflict resolution dialog; now resolves conflicts due to different visibilities
new: replacement for realEqual() on OsmPrimitive and derived classes; realEqual now @deprecated
fixed: cleaning up OsmReader
fixed: progress indication in OsmApi

File:

• trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) (4 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.EventQueue;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -323 +324 @@
         }
         notifyStatusMessage(tr("Uploading..."));
+        setAutoProgressIndication(true);
 
         String diff = duv.getDocument();
@@ -330 +332 @@
         } catch(Exception e) {
             throw new OsmTransferException(e);
+        } finally {
+            setAutoProgressIndication(false);
         }
 
@@ -481 +485 @@
         Main.pleaseWaitDlg.progress.setValue(current + delta);
     }
+
+
+    protected void setAutoProgressIndication(final boolean enabled) {
+        EventQueue.invokeLater(
+                new Runnable() {
+                    public void run() {
+                        Main.pleaseWaitDlg.setIndeterminate(enabled);
+                    }
+                }
+        );
+    }
 }