Changeset 1811 in josm for trunk/src/org/openstreetmap/josm/io/OsmReader.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/OsmReader.java (modified) (5 diffs)

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

@@ -16 +16 @@
 import java.util.logging.Logger;
 
-import javax.swing.SwingUtilities;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
@@ -31 +30 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.AddVisitor;
-import org.openstreetmap.josm.gui.PleaseWaitDialog;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.DateUtils;
 import org.xml.sax.Attributes;
@@ -70 +69 @@
     /**
      * constructor (for private use only)
-     * 
-     * @see #parseDataSet(InputStream, DataSet, PleaseWaitDialog)
-     * @see #parseDataSetOsm(InputStream, DataSet, PleaseWaitDialog)
+     *
+     * @see #parseDataSet(InputStream, DataSet, ProgressMonitor)
+     * @see #parseDataSetOsm(InputStream, DataSet, ProgressMonitor)
      */
     private OsmReader() {
@@ -454 +453 @@
      *  element found there is returned.
      */
-    public static DataSet parseDataSet(InputStream source, PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
-        return parseDataSetOsm(source, pleaseWaitDlg).ds;
-    }
-
-    public static OsmReader parseDataSetOsm(InputStream source, final PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
+    public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws SAXException, IOException {
+        return parseDataSetOsm(source, progressMonitor).ds;
+    }
+
+    public static OsmReader parseDataSetOsm(InputStream source, ProgressMonitor progressMonitor) throws SAXException, IOException {
         OsmReader osm = new OsmReader();
 
@@ -470 +469 @@
         }
 
-        SwingUtilities.invokeLater(
-                new Runnable() {
-                    public void run() {
-                        pleaseWaitDlg.currentAction.setText(tr("Prepare OSM data..."));
-                        pleaseWaitDlg.setIndeterminate(true);
-                    }
+        progressMonitor.beginTask(tr("Prepare OSM data...", 2));
+        try {
+            for (Node n : osm.nodes.values()) {
+                osm.adder.visit(n);
+            }
+
+            progressMonitor.worked(1);
+
+            try {
+                osm.createWays();
+                osm.createRelations();
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+                throw new SAXException(tr("Ill-formed node id"));
+            }
+
+            // clear all negative ids (new to this file)
+            for (OsmPrimitive o : osm.ds.allPrimitives())
+                if (o.id < 0) {
+                    o.id = 0;
                 }
-        );
-
-        for (Node n : osm.nodes.values()) {
-            osm.adder.visit(n);
-        }
-
-        try {
-            osm.createWays();
-            osm.createRelations();
-        } catch (NumberFormatException e) {
-            e.printStackTrace();
-            throw new SAXException(tr("Ill-formed node id"));
-        }
-
-        // clear all negative ids (new to this file)
-        for (OsmPrimitive o : osm.ds.allPrimitives())
-            if (o.id < 0) {
-                o.id = 0;
-            }
-
-        SwingUtilities.invokeLater(
-                new Runnable() {
-                    public void run() {
-                        pleaseWaitDlg.setIndeterminate(false);
-                        pleaseWaitDlg.progress.setValue(0);
-                    }
-                }
-        );
-
-        return osm;
+
+            return osm;
+        } finally {
+            progressMonitor.finishTask();
+        }
     }
 }