Changeset 1811 in josm for trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java

Timestamp:

2009-07-19T17:38:55+02:00 (15 years ago)

Author:

jttt

Message:

PleaseWait refactoring. Progress is now reported using ProgressMonitor interface, that is available through PleaseWaitRunnable.

File:

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

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

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.history.HistoryRelation;
 import org.openstreetmap.josm.data.osm.history.HistoryWay;
-import org.openstreetmap.josm.gui.PleaseWaitDialog;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.DateUtils;
 import org.xml.sax.Attributes;
@@ -32 +32 @@
  * {@see OsmPrimitive}s. We use objects derived from {@see HistoryOsmPrimitive} instead and we
  * keep the data in a dedicated {@see HistoryDataSet}.
- * 
+ *
  */
 public class OsmHistoryReader {
@@ -210 +210 @@
     }
 
-    public HistoryDataSet parse(PleaseWaitDialog dialog) throws SAXException, IOException {
+    public HistoryDataSet parse(ProgressMonitor progressMonitor) throws SAXException, IOException {
         InputSource inputSource = new InputSource(new InputStreamReader(in, "UTF-8"));
-        dialog.currentAction.setText("Parsing OSM history data ...");
+        progressMonitor.beginTask(tr("Parsing OSM history data ..."));
         try {
             SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new Parser());
@@ -218 +218 @@
             e1.printStackTrace(); // broken SAXException chaining
             throw new SAXException(e1);
+        } finally {
+            progressMonitor.finishTask();
         }
         return data;