Changeset 16603 in osm for applications/editors/josm/plugins/agpifoj/src

Timestamp:

2009-07-21T07:42:53+02:00 (15 years ago)

Author:

jttt

Message:

Made plug-in work with JOSM new ProgressMonitor API

Location:

applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj

Files:

• AgpifojLayer.java (modified) (8 diffs)
• CorrelateGpxWithImages.java (modified) (5 diffs)

applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java

@@ -30 +30 @@
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.coor.CachedLatLon;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -103 +102 @@
         private final File[] selection;
         private HashSet<String> loadedDirectories = new HashSet<String>();
+        private String errorMessage = "";
 
         public Loader(File[] selection) {
@@ -111 +111 @@
         @Override protected void realRun() throws IOException {
 
-            Main.pleaseWaitDlg.currentAction.setText(tr("Starting directory scan"));
+            progressMonitor.subTask(tr("Starting directory scan"));
             List<File> files = new ArrayList<File>();
             try {
@@ -123 +123 @@
             }
 
-            Main.pleaseWaitDlg.currentAction.setText(tr("Read photos..."));
+            progressMonitor.subTask(tr("Read photos..."));
+            progressMonitor.setTicksCount(files.size());
 
             // read the image files
             ArrayList<ImageEntry> data = new ArrayList<ImageEntry>(files.size());
 
-            int progress = 0;
-            Main.pleaseWaitDlg.progress.setMaximum(files.size());
-            Main.pleaseWaitDlg.progress.setValue(progress);
-
             for (File f : files) {
 
@@ -138 +135 @@
                 }
 
-                Main.pleaseWaitDlg.currentAction.setText(tr("Reading {0}...", f.getName()));
-                Main.pleaseWaitDlg.progress.setValue(progress++);
+                progressMonitor.subTask(tr("Reading {0}...", f.getName()));
+                progressMonitor.worked(1);
 
                 ImageEntry e = new ImageEntry();
@@ -157 +154 @@
             layer = new AgpifojLayer(data);
             files.clear();
+            progressMonitor.setErrorMessage(errorMessage);
         }
 
@@ -189 +187 @@
                     File[] children = f.listFiles(AgpifojPlugin.JPEG_FILE_FILTER);
                     if (children != null) {
-                        Main.pleaseWaitDlg.currentAction.setText(tr("Scanning directory {0}", f.getPath()));
+                        progressMonitor.subTask(tr("Scanning directory {0}", f.getPath()));
                         try {
                             addRecursiveFiles(files, children);
@@ -197 +195 @@
                         }
                     } else {
-                        errorMessage += tr("Error while getting files from directory {0}\n", f.getPath());
+                        errorMessage += tr("Error while getting files from directory {0}\n", f.getPath());
                     }
 

applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java

@@ -10 +10 @@
 import java.awt.Cursor;
 import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.FlowLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -35 +35 @@
 import javax.swing.AbstractListModel;
 import javax.swing.ButtonGroup;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.filechooser.FileFilter;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -52 +47 @@
 import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
-
-import org.openstreetmap.josm.data.coor.EastNorth;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.filechooser.FileFilter;
+
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
@@ -62 +62 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.io.GpxReader;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.agpifoj.AgpifojLayer.ImageEntry;
 import org.openstreetmap.josm.tools.ExifReader;
@@ -678 +677 @@
         }
 
-        // Free the user's vision
-        Main.pleaseWaitDlg.setVisible(false);
         AgpifojDialog dialog = AgpifojDialog.getInstance();
         dialog.action.button.setSelected(true);