Changeset 1811 in josm for trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.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/gui/layer/GeoImageLayer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java

@@ -270 +270 @@
 
     private static final class Loader extends PleaseWaitRunnable {
-        boolean cancelled = false;
         private GeoImageLayer layer;
         private final Collection<File> files;
@@ -280 +279 @@
         }
         @Override protected void realRun() throws IOException {
-            Main.pleaseWaitDlg.currentAction.setText(tr("Read GPX..."));
+            progressMonitor.subTask(tr("Read GPX..."));
             LinkedList<TimedPoint> gps = new LinkedList<TimedPoint>();
 
@@ -303 +302 @@
 
             if (gps.isEmpty()) {
-                errorMessage = tr("No images with readable timestamps found.");
+                progressMonitor.setErrorMessage(tr("No images with readable timestamps found."));
                 return;
             }
@@ -309 +308 @@
             // read the image files
             ArrayList<ImageEntry> data = new ArrayList<ImageEntry>(files.size());
-            int i = 0;
-            Main.pleaseWaitDlg.progress.setMaximum(files.size());
+            progressMonitor.setTicksCount(files.size());
             for (File f : files) {
-                if (cancelled)
+                if (progressMonitor.isCancelled())
                     break;
-                Main.pleaseWaitDlg.currentAction.setText(tr("Reading {0}...",f.getName()));
-                Main.pleaseWaitDlg.progress.setValue(i++);
+                progressMonitor.subTask(tr("Reading {0}...",f.getName()));
 
                 ImageEntry e = new ImageEntry(f);
@@ -327 +324 @@
 
                 data.add(e);
+                progressMonitor.worked(1);
             }
             layer = new GeoImageLayer(data, gps);
@@ -335 +333 @@
                 Main.main.addLayer(layer);
         }
-        @Override protected void cancel() {cancelled = true;}
+        @Override
+        protected void cancel() {
+
+        }
     }